fixed fields List mandatory (#1555)

* fixed fields List mandatory * minimla changes Co-authored-by: elsiosanchez <elsiossanches@gmail.com>
adempiere · Feb 11, 2022 · 5e97655 · 5e97655
1 parent a88184c
commit 5e97655
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 5 deletions.
diff --git 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
@@ -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
@@ -83,6 +84,7 @@ export default [
       isCustomField: true,
       isUpdateable: true,
       size: 24,
+      isMandatory: false,
       sequenceFields: 'A2',
       index: 6
     }
@@ -95,6 +97,7 @@ export default [
       isCustomField: true,
       isUpdateable: true,
       size: 24,
+      isMandatory: false,
       sequenceFields: 'A3',
       index: 7
     }
@@ -107,6 +110,7 @@ export default [
       isCustomField: true,
       isUpdateable: true,
       size: 24,
+      isMandatory: false,
       sequenceFields: 'A4',
       index: 8
     }

diff --git a/...omponents/ADempiere/Form/VPOS/BusinessPartner/AddNewFieldLocation/locationAddressForm.vue b/...omponents/ADempiere/Form/VPOS/BusinessPartner/AddNewFieldLocation/locationAddressForm.vue
@@ -31,7 +31,11 @@
             <field-definition
               :parent-uuid="parentUuid"
               :container-uuid="containerUuid"
-              :container-manager="containerManagerLocation"
+              :container-manager="{
+                ...containerManager,
+                isMandatoryField({ isMandatory, isMandatoryFromLogic }) {return field.isMandatory || field.isMandatoryFromLogic},
+                isDisplayedField({ isDisplayed, isDisplayedFromLogic }) {return field.isDisplayed || field.isDisplayedFromLogic}
+              }"
               :metadata-field="field"
             />
           </el-col>

diff --git 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
@@ -82,6 +83,7 @@ export default [
     overwriteDefinition: {
       isCustomField: true,
       size: 24,
+      isMandatory: false,
       sequenceFields: 'A2',
       index: 6
     }
@@ -93,6 +95,7 @@ export default [
     overwriteDefinition: {
       isCustomField: true,
       size: 24,
+      isMandatory: false,
       sequenceFields: 'A3',
       index: 7
     }
@@ -104,6 +107,7 @@ export default [
     overwriteDefinition: {
       isCustomField: true,
       size: 24,
+      isMandatory: false,
       sequenceFields: 'A4',
       index: 8
     }

diff --git a/...mponents/ADempiere/Form/VPOS/BusinessPartner/BillingFieldLocation/locationAddressForm.vue b/...mponents/ADempiere/Form/VPOS/BusinessPartner/BillingFieldLocation/locationAddressForm.vue
@@ -31,7 +31,11 @@
             <field-definition
               :parent-uuid="parentUuid"
               :container-uuid="containerUuid"
-              :container-manager="containerManagerLocation"
+              :container-manager="{
+                ...containerManager,
+                isMandatoryField({ isMandatory, isMandatoryFromLogic }) {return field.isMandatory || field.isMandatoryFromLogic},
+                isDisplayedField({ isDisplayed, isDisplayedFromLogic }) {return field.isDisplayed || field.isDisplayedFromLogic}
+              }"
               :metadata-field="field"
             />
           </el-col>

diff --git 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}
+            }"
           />
         </el-row>
       </div>

diff --git 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
@@ -72,6 +72,7 @@ export default [
       isCustomField: true,
       size: 24,
       sequenceFields: 'A1',
+      isMandatory: true,
       index: 5
     }
   },
@@ -82,6 +83,7 @@ export default [
     overwriteDefinition: {
       isCustomField: true,
       size: 24,
+      isMandatory: false,
       sequenceFields: 'A2',
       index: 6
     }
@@ -93,6 +95,7 @@ export default [
     overwriteDefinition: {
       isCustomField: true,
       size: 24,
+      isMandatory: false,
       sequenceFields: 'A3',
       index: 7
     }
@@ -104,6 +107,7 @@ export default [
     overwriteDefinition: {
       isCustomField: true,
       size: 24,
+      isMandatory: false,
       sequenceFields: 'A4',
       index: 8
     }

diff --git a/...ponents/ADempiere/Form/VPOS/BusinessPartner/shippingFieldLocation/locationAddressForm.vue b/...ponents/ADempiere/Form/VPOS/BusinessPartner/shippingFieldLocation/locationAddressForm.vue
@@ -31,7 +31,11 @@
             <field-definition
               :parent-uuid="parentUuid"
               :container-uuid="containerUuid"
-              :container-manager="containerManagerLocation"
+              :container-manager="{
+                ...containerManager,
+                isMandatoryField({ isMandatory, isMandatoryFromLogic }) {return field.isMandatory || field.isMandatoryFromLogic},
+                isDisplayedField({ isDisplayed, isDisplayedFromLogic }) {return field.isDisplayed || field.isDisplayedFromLogic}
+              }"
               :metadata-field="field"
             />
           </el-col>