From 2b7dfd99bb8e28d23a898d25302c3938b28f1f7b Mon Sep 17 00:00:00 2001 From: elsiosanchez Date: Fri, 11 Feb 2022 11:58:29 -0400 Subject: [PATCH 1/2] fixed fields List mandatory --- src/components/ADempiere/Field/FieldLocation/fieldsList.js | 3 +++ .../VPOS/BusinessPartner/AddNewFieldLocation/fieldsList.js | 3 +++ .../VPOS/BusinessPartner/BillingFieldLocation/fieldsList.js | 3 +++ .../BusinessPartner/billingAddressFieldLocation/fieldsList.js | 3 +++ .../VPOS/BusinessPartner/shippingFieldLocation/fieldsList.js | 3 +++ 5 files changed, 15 insertions(+) diff --git a/src/components/ADempiere/Field/FieldLocation/fieldsList.js b/src/components/ADempiere/Field/FieldLocation/fieldsList.js index 5d8fff1017d..7d0f0250888 100644 --- a/src/components/ADempiere/Field/FieldLocation/fieldsList.js +++ b/src/components/ADempiere/Field/FieldLocation/fieldsList.js @@ -95,6 +95,7 @@ export default [ isUpdateable: true, size: 24, sequenceFields: 'A2', + isMandatory: false, index: 6 } }, @@ -107,6 +108,7 @@ export default [ isUpdateable: true, size: 24, sequenceFields: 'A3', + isMandatory: false, index: 7 } }, @@ -119,6 +121,7 @@ export default [ isUpdateable: true, size: 24, sequenceFields: 'A4', + isMandatory: false, index: 8 } }, diff --git a/src/components/ADempiere/Form/VPOS/BusinessPartner/AddNewFieldLocation/fieldsList.js b/src/components/ADempiere/Form/VPOS/BusinessPartner/AddNewFieldLocation/fieldsList.js index 02769516017..ce5f99bee94 100644 --- a/src/components/ADempiere/Form/VPOS/BusinessPartner/AddNewFieldLocation/fieldsList.js +++ b/src/components/ADempiere/Form/VPOS/BusinessPartner/AddNewFieldLocation/fieldsList.js @@ -83,6 +83,7 @@ export default [ isCustomField: true, isUpdateable: true, size: 24, + isMandatory: false, sequenceFields: 'A2', index: 6 } @@ -95,6 +96,7 @@ export default [ isCustomField: true, isUpdateable: true, size: 24, + isMandatory: false, sequenceFields: 'A3', index: 7 } @@ -107,6 +109,7 @@ export default [ isCustomField: true, isUpdateable: true, size: 24, + isMandatory: false, sequenceFields: 'A4', index: 8 } diff --git a/src/components/ADempiere/Form/VPOS/BusinessPartner/BillingFieldLocation/fieldsList.js b/src/components/ADempiere/Form/VPOS/BusinessPartner/BillingFieldLocation/fieldsList.js index 5b8fdb5f2c9..fbf97c7acba 100644 --- a/src/components/ADempiere/Form/VPOS/BusinessPartner/BillingFieldLocation/fieldsList.js +++ b/src/components/ADempiere/Form/VPOS/BusinessPartner/BillingFieldLocation/fieldsList.js @@ -82,6 +82,7 @@ export default [ overwriteDefinition: { isCustomField: true, size: 24, + isMandatory: false, sequenceFields: 'A2', index: 6 } @@ -93,6 +94,7 @@ export default [ overwriteDefinition: { isCustomField: true, size: 24, + isMandatory: false, sequenceFields: 'A3', index: 7 } @@ -104,6 +106,7 @@ export default [ overwriteDefinition: { isCustomField: true, size: 24, + isMandatory: false, sequenceFields: 'A4', index: 8 } diff --git a/src/components/ADempiere/Form/VPOS/BusinessPartner/billingAddressFieldLocation/fieldsList.js b/src/components/ADempiere/Form/VPOS/BusinessPartner/billingAddressFieldLocation/fieldsList.js index f4d3bbe6c0f..0579604781c 100644 --- a/src/components/ADempiere/Form/VPOS/BusinessPartner/billingAddressFieldLocation/fieldsList.js +++ b/src/components/ADempiere/Form/VPOS/BusinessPartner/billingAddressFieldLocation/fieldsList.js @@ -93,6 +93,7 @@ export default [ overwriteDefinition: { isCustomField: true, size: 24, + isMandatory: false, sequenceFields: 'A2', index: 6 } @@ -104,6 +105,7 @@ export default [ overwriteDefinition: { isCustomField: true, size: 24, + isMandatory: false, sequenceFields: 'A3', index: 7 } @@ -115,6 +117,7 @@ export default [ overwriteDefinition: { isCustomField: true, size: 24, + isMandatory: false, sequenceFields: 'A4', index: 8 } diff --git a/src/components/ADempiere/Form/VPOS/BusinessPartner/shippingFieldLocation/fieldsList.js b/src/components/ADempiere/Form/VPOS/BusinessPartner/shippingFieldLocation/fieldsList.js index 4fc50f8c6dd..88a2ff4cddf 100644 --- a/src/components/ADempiere/Form/VPOS/BusinessPartner/shippingFieldLocation/fieldsList.js +++ b/src/components/ADempiere/Form/VPOS/BusinessPartner/shippingFieldLocation/fieldsList.js @@ -82,6 +82,7 @@ export default [ overwriteDefinition: { isCustomField: true, size: 24, + isMandatory: false, sequenceFields: 'A2', index: 6 } @@ -93,6 +94,7 @@ export default [ overwriteDefinition: { isCustomField: true, size: 24, + isMandatory: false, sequenceFields: 'A3', index: 7 } @@ -104,6 +106,7 @@ export default [ overwriteDefinition: { isCustomField: true, size: 24, + isMandatory: false, sequenceFields: 'A4', index: 8 } From ea2fc35da8e8f111e105a9e81db645fc5199a6f3 Mon Sep 17 00:00:00 2001 From: elsiosanchez Date: Fri, 11 Feb 2022 14:39:45 -0400 Subject: [PATCH 2/2] minimla changes --- .../VPOS/BusinessPartner/AddNewFieldLocation/fieldsList.js | 3 ++- .../AddNewFieldLocation/locationAddressForm.vue | 6 +++++- .../VPOS/BusinessPartner/BillingFieldLocation/fieldsList.js | 1 + .../BillingFieldLocation/locationAddressForm.vue | 6 +++++- .../ADempiere/Form/VPOS/BusinessPartner/addAddress.vue | 6 +++++- .../BusinessPartner/shippingFieldLocation/fieldsList.js | 1 + .../shippingFieldLocation/locationAddressForm.vue | 6 +++++- 7 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/components/ADempiere/Form/VPOS/BusinessPartner/AddNewFieldLocation/fieldsList.js b/src/components/ADempiere/Form/VPOS/BusinessPartner/AddNewFieldLocation/fieldsList.js index ce5f99bee94..e16394af7eb 100644 --- a/src/components/ADempiere/Form/VPOS/BusinessPartner/AddNewFieldLocation/fieldsList.js +++ b/src/components/ADempiere/Form/VPOS/BusinessPartner/AddNewFieldLocation/fieldsList.js @@ -47,7 +47,7 @@ export default [ size: 24, sequenceFields: 'R', index: 3, - isMandatory: false + isMandatory: true } }, { @@ -70,6 +70,7 @@ export default [ overwriteDefinition: { isCustomField: true, isUpdateable: true, + isMandatory: true, size: 24, sequenceFields: 'A1', index: 5 diff --git a/src/components/ADempiere/Form/VPOS/BusinessPartner/AddNewFieldLocation/locationAddressForm.vue b/src/components/ADempiere/Form/VPOS/BusinessPartner/AddNewFieldLocation/locationAddressForm.vue index cab31181b3a..f03e01d159d 100644 --- a/src/components/ADempiere/Form/VPOS/BusinessPartner/AddNewFieldLocation/locationAddressForm.vue +++ b/src/components/ADempiere/Form/VPOS/BusinessPartner/AddNewFieldLocation/locationAddressForm.vue @@ -31,7 +31,11 @@ diff --git a/src/components/ADempiere/Form/VPOS/BusinessPartner/BillingFieldLocation/fieldsList.js b/src/components/ADempiere/Form/VPOS/BusinessPartner/BillingFieldLocation/fieldsList.js index fbf97c7acba..09cd100c0c8 100644 --- a/src/components/ADempiere/Form/VPOS/BusinessPartner/BillingFieldLocation/fieldsList.js +++ b/src/components/ADempiere/Form/VPOS/BusinessPartner/BillingFieldLocation/fieldsList.js @@ -70,6 +70,7 @@ export default [ columnName: 'Address1', overwriteDefinition: { isCustomField: true, + isMandatory: true, size: 24, sequenceFields: 'A1', index: 5 diff --git a/src/components/ADempiere/Form/VPOS/BusinessPartner/BillingFieldLocation/locationAddressForm.vue b/src/components/ADempiere/Form/VPOS/BusinessPartner/BillingFieldLocation/locationAddressForm.vue index 17c0a3e88e1..f4010b97b86 100644 --- a/src/components/ADempiere/Form/VPOS/BusinessPartner/BillingFieldLocation/locationAddressForm.vue +++ b/src/components/ADempiere/Form/VPOS/BusinessPartner/BillingFieldLocation/locationAddressForm.vue @@ -31,7 +31,11 @@ diff --git a/src/components/ADempiere/Form/VPOS/BusinessPartner/addAddress.vue b/src/components/ADempiere/Form/VPOS/BusinessPartner/addAddress.vue index 2e1098fb8d2..35685b67988 100644 --- a/src/components/ADempiere/Form/VPOS/BusinessPartner/addAddress.vue +++ b/src/components/ADempiere/Form/VPOS/BusinessPartner/addAddress.vue @@ -31,7 +31,11 @@ :metadata="fieldsList[0]" :value-model="fieldsList[0].value" :container-uuid="'New-Address'" - :container-manager="containerManager" + :container-manager="{ + ...containerManager, + isMandatoryField({ isMandatory, isMandatoryFromLogic }) {return field.isMandatory || field.isMandatoryFromLogic}, + isDisplayedField({ isDisplayed, isDisplayedFromLogic }) {return field.isDisplayed || field.isDisplayedFromLogic} + }" /> diff --git a/src/components/ADempiere/Form/VPOS/BusinessPartner/shippingFieldLocation/fieldsList.js b/src/components/ADempiere/Form/VPOS/BusinessPartner/shippingFieldLocation/fieldsList.js index 88a2ff4cddf..6204d326285 100644 --- a/src/components/ADempiere/Form/VPOS/BusinessPartner/shippingFieldLocation/fieldsList.js +++ b/src/components/ADempiere/Form/VPOS/BusinessPartner/shippingFieldLocation/fieldsList.js @@ -72,6 +72,7 @@ export default [ isCustomField: true, size: 24, sequenceFields: 'A1', + isMandatory: true, index: 5 } }, diff --git a/src/components/ADempiere/Form/VPOS/BusinessPartner/shippingFieldLocation/locationAddressForm.vue b/src/components/ADempiere/Form/VPOS/BusinessPartner/shippingFieldLocation/locationAddressForm.vue index 94a5039a569..d8dd3f50d04 100644 --- a/src/components/ADempiere/Form/VPOS/BusinessPartner/shippingFieldLocation/locationAddressForm.vue +++ b/src/components/ADempiere/Form/VPOS/BusinessPartner/shippingFieldLocation/locationAddressForm.vue @@ -31,7 +31,11 @@