Merge pull request #877 from bcgov/defect-EHIS-1307

Defect-ehis-1307
bcgov · Jun 20, 2024 · 4dbb925 · 4dbb925
2 parents 02cd757 + 67fcaf3
commit 4dbb925
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/ehis-source/core/main/default/objects/Account/fields/ParentId.field-meta.xml b/ehis-source/core/main/default/objects/Account/fields/ParentId.field-meta.xml
@@ -6,34 +6,34 @@
         <booleanFilter>(1 AND 2) OR (3 AND 4) OR (5 AND 6)</booleanFilter>
         <errorMessage>Sorry, that is an invalid selection. Please use the lookup to select a valid Account.</errorMessage>
         <filterItems>
-            <field>Account.RecordType.Name</field>
+            <field>$Source.RecordTypeId</field>
             <operation>equals</operation>
-            <value>Registrant</value>
+            <value>HA Hierarchy</value>
         </filterItems>
         <filterItems>
             <field>$Source.RecordTypeId</field>
             <operation>equals</operation>
-            <value>Residence</value>
+            <valueField>Account.RecordTypeId</valueField>
         </filterItems>
         <filterItems>
             <field>$Source.RecordTypeId</field>
             <operation>equals</operation>
-            <value>HA Hierarchy</value>
+            <value>Water Source Intake</value>
         </filterItems>
         <filterItems>
-            <field>$Source.RecordTypeId</field>
+            <field>Account.RecordTypeId</field>
             <operation>equals</operation>
-            <valueField>Account.RecordTypeId</valueField>
+            <value>Business Entity</value>
         </filterItems>
         <filterItems>
             <field>$Source.RecordTypeId</field>
             <operation>equals</operation>
-            <value>Water System</value>
+            <value>Residence</value>
         </filterItems>
         <filterItems>
             <field>Account.RecordTypeId</field>
             <operation>equals</operation>
-            <value>Business Entity</value>
+            <value>Registrant</value>
         </filterItems>
         <isOptional>false</isOptional>
     </lookupFilter>

diff --git a/...rce/core/main/default/objects/Account/recordTypes/Water_Source_Intake.recordType-meta.xml b/...rce/core/main/default/objects/Account/recordTypes/Water_Source_Intake.recordType-meta.xml
@@ -234,14 +234,6 @@
             <fullName>Water</fullName>
             <default>true</default>
         </values>
-        <values>
-            <fullName>ALR</fullName>
-            <default>false</default>
-        </values>
-        <values>
-            <fullName>Food</fullName>
-            <default>false</default>
-        </values>
     </picklistValues>
     <picklistValues>
         <picklist>Type</picklist>

diff --git a/ehis-source/ehis-ui/main/default/layouts/Account-Water System Page Layout.layout-meta.xml b/ehis-source/ehis-ui/main/default/layouts/Account-Water System Page Layout.layout-meta.xml
@@ -86,12 +86,12 @@
                 <behavior>Edit</behavior>
                 <field>NoofConnections__c</field>
             </layoutItems>
-        </layoutColumns>
-        <layoutColumns>
             <layoutItems>
                 <behavior>Edit</behavior>
                 <field>Description</field>
             </layoutItems>
+        </layoutColumns>
+        <layoutColumns>
             <layoutItems>
                 <behavior>Edit</behavior>
                 <field>Construction_Date__c</field>