From 59123b0e5d14a278179e7ffbf3d9abdb03c4c0d0 Mon Sep 17 00:00:00 2001 From: Elsio Sanchez <45974454+elsiosanchez@users.noreply.github.com> Date: Fri, 15 Jan 2021 01:28:09 -0400 Subject: [PATCH] correcting field title errors (#567) --- .../Field/FieldLocation/fieldsList.js | 9 +++++ .../VPOS/BusinessPartner/fieldsListCreate.js | 13 ++++--- .../VPOS/BusinessPartner/fieldsListSearch.js | 38 +++++++++---------- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/src/components/ADempiere/Field/FieldLocation/fieldsList.js b/src/components/ADempiere/Field/FieldLocation/fieldsList.js index c123f20f..9540a436 100644 --- a/src/components/ADempiere/Field/FieldLocation/fieldsList.js +++ b/src/components/ADempiere/Field/FieldLocation/fieldsList.js @@ -10,6 +10,7 @@ const fieldBase = { export default [ { ...fieldBase, + elementColumnName: 'C_Location_ID', columnName: 'C_Location_ID', overwriteDefinition: { isCustomField: true, @@ -20,6 +21,7 @@ export default [ }, { ...fieldBase, + elementColumnName: 'C_Country_ID', columnName: 'C_Country_ID', overwriteDefinition: { isCustomField: true, @@ -32,6 +34,7 @@ export default [ }, { ...fieldBase, + elementColumnName: 'C_Region_ID', columnName: 'C_Region_ID', overwriteDefinition: { isCustomField: true, @@ -42,6 +45,7 @@ export default [ }, { ...fieldBase, + elementColumnName: 'C_City_ID', columnName: 'C_City_ID', overwriteDefinition: { isCustomField: true, @@ -52,6 +56,7 @@ export default [ }, { ...fieldBase, + elementColumnName: 'Address1', columnName: 'Address1', overwriteDefinition: { isCustomField: true, @@ -62,6 +67,7 @@ export default [ }, { ...fieldBase, + elementColumnName: 'Address2', columnName: 'Address2', overwriteDefinition: { isCustomField: true, @@ -72,6 +78,7 @@ export default [ }, { ...fieldBase, + elementColumnName: 'Address3', columnName: 'Address3', overwriteDefinition: { isCustomField: true, @@ -82,6 +89,7 @@ export default [ }, { ...fieldBase, + elementColumnName: 'Address4', columnName: 'Address4', overwriteDefinition: { isCustomField: true, @@ -92,6 +100,7 @@ export default [ }, { ...fieldBase, + elementColumnName: 'Postal', columnName: 'Postal', overwriteDefinition: { isCustomField: true, diff --git a/src/components/ADempiere/Form/VPOS/BusinessPartner/fieldsListCreate.js b/src/components/ADempiere/Form/VPOS/BusinessPartner/fieldsListCreate.js index db3d9793..d0b81458 100644 --- a/src/components/ADempiere/Form/VPOS/BusinessPartner/fieldsListCreate.js +++ b/src/components/ADempiere/Form/VPOS/BusinessPartner/fieldsListCreate.js @@ -2,61 +2,62 @@ const tableName = 'C_BPartner' export default [ { + elementColumnName: 'Value', columnName: 'Value', - tableName, isFromDictionary: true, overwriteDefinition: { - // name: 'Search Key', isCustomField: true, size: 24 } }, { + elementColumnName: 'Name', columnName: 'Name', tableName, isFromDictionary: true, overwriteDefinition: { - // name: 'Name', isCustomField: true, size: 24 } }, { + elementColumnName: 'Name2', columnName: 'Name2', tableName, isFromDictionary: true, overwriteDefinition: { - // name: 'Contact Name', isCustomField: true, size: 24 } }, { + elementColumnName: 'EMail', columnName: 'EMail', tableName: 'AD_user', isFromDictionary: true, overwriteDefinition: { - // name: 'E-Mail Address', isCustomField: true, size: 24 } }, { + elementColumnName: 'Phone', columnName: 'Phone', tableName: 'AD_user', isFromDictionary: true, overwriteDefinition: { - name: 'Phone', isCustomField: true, size: 24 } }, { + elementColumnName: 'C_Location_ID', columnName: 'C_Location_ID', tableName: 'C_BPartner_Location', isFromDictionary: true, overwriteDefinition: { size: 24, + componentPath: 'FieldLocation', handleActionPerformed: false, isSendParentValues: true, popoverPlacement: 'top' diff --git a/src/components/ADempiere/Form/VPOS/BusinessPartner/fieldsListSearch.js b/src/components/ADempiere/Form/VPOS/BusinessPartner/fieldsListSearch.js index c178c22f..f84ef98f 100644 --- a/src/components/ADempiere/Form/VPOS/BusinessPartner/fieldsListSearch.js +++ b/src/components/ADempiere/Form/VPOS/BusinessPartner/fieldsListSearch.js @@ -1,58 +1,54 @@ // List of fields to send in search export default [ { - columnName: 'Code', - // displayType: CHAR.id, - definition: { - name: 'Search Value', - isCustomField: true - } - }, - { + elementColumnName: 'Value', columnName: 'Value', - // displayType: CHAR.id, + tableName: 'C_BPartner', + isFromDictionary: true, definition: { - name: 'Search Key', isCustomField: true } }, { + elementColumnName: 'Name', columnName: 'Name', - // displayType: CHAR.id, + tableName: 'C_BPartner', + isFromDictionary: true, definition: { - name: 'Name', isCustomField: true } }, { - columnName: 'Contact', - // displayType: CHAR.id, + elementColumnName: 'Name2', + columnName: 'Name2', + tableName: 'C_BPartner', + isFromDictionary: true, definition: { - name: 'Contact Name', isCustomField: true } }, { + elementColumnName: 'EMail', columnName: 'EMail', - // displayType: CHAR.id, + tableName: 'AD_user', + isFromDictionary: true, definition: { - name: 'E-Mail Address', isCustomField: true } }, { + elementColumnName: 'Postal', columnName: 'Postal', - // displayType: CHAR.id, + isFromDictionary: true, definition: { - name: 'Postal Code', isCustomField: true } }, { + elementColumnName: 'Phone', columnName: 'Phone', - // displayType: CHAR.id, + isFromDictionary: true, definition: { - name: 'Phone', isCustomField: true } }