Merge branch 'moqui:master' into master

mkdecisiondev · Aug 6, 2024 · 96b1723 · 96b1723
2 parents a0cbf6d + 6cf614c
commit 96b1723
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/data/GeoIndData.xml b/data/GeoIndData.xml
@@ -20,7 +20,7 @@ along with this software (see the LICENSE.md file). If not, see
     <Geo geoId="IND_AS" geoCodeAlpha2="AS" geoName="Assam" geoTypeEnumId="GEOT_STATE"/>
     <Geo geoId="IND_BR" geoCodeAlpha2="BR" geoName="Bihār" geoTypeEnumId="GEOT_STATE"/>
     <Geo geoId="IND_CH" geoCodeAlpha2="CH" geoName="Chandigarh" geoTypeEnumId="GEOT_TERRITORY"/>
-    <Geo geoId="IND_CT" geoCodeAlpha2="CT" geoName="Chhattīsgarh" geoTypeEnumId="GEOT_STATE"/>
+    <Geo geoId="IND_CT" geoCodeAlpha2="CG" geoName="Chhattīsgarh" geoTypeEnumId="GEOT_STATE"/>
     <Geo geoId="IND_DH" geoCodeAlpha2="DH" geoName="Dādra and Nagar Haveli and Damān and Diu" geoTypeEnumId="GEOT_TERRITORY"/>
     <Geo geoId="IND_DL" geoCodeAlpha2="DL" geoName="Delhi" geoTypeEnumId="GEOT_TERRITORY"/>
     <Geo geoId="IND_GA" geoCodeAlpha2="GA" geoName="Goa" geoTypeEnumId="GEOT_STATE"/>
@@ -39,16 +39,16 @@ along with this software (see the LICENSE.md file). If not, see
     <Geo geoId="IND_ML" geoCodeAlpha2="ML" geoName="Meghālaya" geoTypeEnumId="GEOT_STATE"/>
     <Geo geoId="IND_MZ" geoCodeAlpha2="MZ" geoName="Mizoram" geoTypeEnumId="GEOT_STATE"/>
     <Geo geoId="IND_NL" geoCodeAlpha2="NL" geoName="Nāgāland" geoTypeEnumId="GEOT_STATE"/>
-    <Geo geoId="IND_OR" geoCodeAlpha2="OR" geoName="Odisha" geoTypeEnumId="GEOT_STATE"/>
+    <Geo geoId="IND_OR" geoCodeAlpha2="OD" geoName="Odisha" geoTypeEnumId="GEOT_STATE"/>
     <Geo geoId="IND_PY" geoCodeAlpha2="PY" geoName="Puducherry" geoNameLocal="Pondicherry" geoTypeEnumId="GEOT_TERRITORY"/>
     <Geo geoId="IND_PB" geoCodeAlpha2="PB" geoName="Punjab" geoTypeEnumId="GEOT_STATE"/>
     <Geo geoId="IND_RJ" geoCodeAlpha2="RJ" geoName="Rājasthān" geoTypeEnumId="GEOT_STATE"/>
     <Geo geoId="IND_SK" geoCodeAlpha2="SK" geoName="Sikkim" geoTypeEnumId="GEOT_STATE"/>
     <Geo geoId="IND_TN" geoCodeAlpha2="TN" geoName="Tamil Nādu" geoTypeEnumId="GEOT_STATE"/>
-    <Geo geoId="IND_TG" geoCodeAlpha2="TG" geoName="Telangāna" geoTypeEnumId="GEOT_STATE"/>
+    <Geo geoId="IND_TG" geoCodeAlpha2="TS" geoName="Telangāna" geoTypeEnumId="GEOT_STATE"/>
     <Geo geoId="IND_TR" geoCodeAlpha2="TR" geoName="Tripura" geoTypeEnumId="GEOT_STATE"/>
     <Geo geoId="IND_UP" geoCodeAlpha2="UP" geoName="Uttar Pradesh" geoTypeEnumId="GEOT_STATE"/>
-    <Geo geoId="IND_UT" geoCodeAlpha2="UT" geoName="Uttarākhand" geoTypeEnumId="GEOT_STATE"/>
+    <Geo geoId="IND_UT" geoCodeAlpha2="UK" geoName="Uttarākhand" geoTypeEnumId="GEOT_STATE"/>
     <Geo geoId="IND_WB" geoCodeAlpha2="WB" geoName="West Bengal" geoTypeEnumId="GEOT_STATE"/>
 
     <GeoAssoc geoId="IND" toGeoId="IND_AN" geoAssocTypeEnumId="GAT_REGIONS"/>

diff --git a/entity/AccountingAccountEntities.xml b/entity/AccountingAccountEntities.xml
@@ -1303,8 +1303,11 @@ along with this software (see the LICENSE.md file). If not, see
             <description>Service implementing the mantle.account.PaymentServices.refund#Payment interface</description></field>
         <field name="detailsServiceName" type="text-medium">
             <description>Service implementing the mantle.account.PaymentServices.get#PaymentGatewayDetails interface</description></field>
+        <field name="systemMessageRemoteId" type="id"/>
         <relationship type="one" title="PaymentGatewayType" related="moqui.basic.Enumeration">
             <key-map field-name="paymentGatewayTypeEnumId"/></relationship>
+        <relationship type="one" title="SystemMessageRemote" related="moqui.service.message.SystemMessageRemote" short-alias="remote">
+            <key-map field-name="systemMessageRemoteId"/></relationship>
         <seed-data>
             <moqui.basic.EnumerationType description="Payment Gateway Type" enumTypeId="PaymentGatewayType"/>
             <moqui.basic.Enumeration description="Test" enumId="PgtTest" enumTypeId="PaymentGatewayType"/>

diff --git a/entity/MarketingEntities.xml b/entity/MarketingEntities.xml
@@ -125,10 +125,13 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="fromDate" type="date-time" is-pk="true"/>
         <field name="thruDate" type="date-time"/>
         <field name="emailTemplateId" type="id"/>
+        <field name="wikiPageCategoryId" type="id"/>
         <relationship type="one" related="mantle.marketing.contact.ContactList"/>
         <relationship type="one" title="ContactListEmailType" related="moqui.basic.Enumeration">
             <key-map field-name="emailTypeEnumId"/></relationship>
         <relationship type="one" related="moqui.basic.email.EmailTemplate"/>
+        <relationship type="one" related="moqui.resource.wiki.WikiPageCategory" short-alias="wikiPageCategory"/>
+        <relationship type="many" related="moqui.resource.wiki.WikiBlogCategory" short-alias="wikiBlogs"/>
         <seed-data>
             <!-- Contact List Email Type -->
             <moqui.basic.EnumerationType description="Contact List Email Type" enumTypeId="ContactListEmailType"/>

diff --git a/entity/ProductDefinitionEntities.xml b/entity/ProductDefinitionEntities.xml
@@ -715,10 +715,15 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="thruDate" type="date-time"/>
         <field name="requiredWork" type="text-indicator">
             <description>If Y require WorkEffort Status of Complete, Closed, or Cancelled to consider OrderItem fulfilled</description></field>
+        <field name="cloneOnStatusId" type="id">
+            <description>OrderPart or OrderHeader status when the WorkEffort should be cloned and associated with the
+                corresponding OrderItem with an OrderItemWorkEffort record</description></field>
         <field name="forStatusId" type="id">
-            <description>Task must be Complete or Closed before change to this status (soft rule, depending on code in place)</description></field>
+            <description>Task must be Complete or Closed before change to this order status (soft rule, depending on code in place)</description></field>
         <relationship type="one" related="mantle.product.Product" short-alias="product"/>
         <relationship type="one" related="mantle.work.effort.WorkEffort" short-alias="workEffort"/>
+        <relationship type="one" title="CloneOnOrderHeader" related="moqui.basic.StatusItem" short-alias="cloneOnStatus">
+            <key-map field-name="forStatusId"/></relationship>
         <relationship type="one" title="OrderHeader" related="moqui.basic.StatusItem" short-alias="forStatus">
             <key-map field-name="forStatusId"/></relationship>
     </entity>