Upgraded projects to Java 11 (#1)

* Release 2.2.0 changes (moqui#91) * Update XML files to use new XSD references for the 3.0.0 release series * In component.xml bump versions for upcoming release * Add more release notes from review of commits since last release, update year in AUTHORS * In README.md update last release version, add forum badge and make badges more consistent * Add URL Slug ProductIdentificationType based on discussion a while back on forum.moqui.org * Add ProductCategoryIdent, ProductStoreDataDocument, and ProductIdentificationType URL Slug (moqui#92) * Add ProductOtherIdentification relationship to Product, Add ProductIdentificationType URL Slug, Add ProductStoreDataDocument and relationships, Add ProductCategoryIdent and relationships * Rename typeEnumIds from Slug to UrlSlug for clarity, Add deprecation warning to ProductStore's dataDocumentId field descriptions, rename storeDataDocumentTypeEnumId to storeDocumentTypeEnumId, Rename ProductStoreDataDocument Enum descriptions, rename productCategoryIdentTypeEnumId to identTypeEnumId * Rename storeDocumentTypeEnumId to typeEnumId * In HumanResourceEntities move PartySkill out of commented section and add 3 entities for configuring which PartyClassifications, PartyDimension types, and PartySkill types are applicable for a EmplPosition * In WorkEffortEntities add WorkEffortParty.emplPositionId field to tracking which position that party fills on the work effort * In PartyEntities add two commented entities, might be useful but not currently used or needed for current requirements * Add WorkEffortEmplPosition join entity instead of a EmplPosition.workEffortId field that does not allow reuse of EmplPosition * Remove EmplPositionClassPartyCls entity, what was needed was really a join entity to a PartyClassificationType enum record and not the individual PartyClassification record, so replace it with a new entity EmplPositionClassPtyClsTp * Add EnumerationType for PartySkill.skillTypeEnumId and spell Reason right * Change index on Container.serialNumber from unique to a non-unique index to handle more scenarios such as the same serial number for different container types, facilities, etc * Pandor4u partycontenttype bio (moqui#94) * Adding pandor4u to Authors * Added Bio to Party Content Type seed data * Small Party seed data additions: Technical Contact role and add Owner and TechContact to the RgpAccountContact group for use as a sales account contact role * Small changes in DefaultSettings PartyAcctgPreference, more sensible/common defaults * Add PartyContentType records for invoice messages when from or to party * In GL Accounts install data add PiWireTransfer default gl account mapping, to the general checking account like most other payment methods Co-authored-by: David E. Jones <[email protected]> Co-authored-by: acetousk <[email protected]> Co-authored-by: acetousk <[email protected]> Co-authored-by: pandor4u <[email protected]>
mkdecisiondev · Jan 26, 2023 · d387b08 · d387b08
1 parent 1e6e9bf
commit d387b08
Show file tree

Hide file tree

Showing 21 changed files with 209 additions and 50 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -34,7 +34,7 @@ that are otherwise encumbered.
 
 Signed by git commit adding my legal name and git username:
 
-Written in 2010-2020 by David E. Jones - jonesde
+Written in 2010-2022 by David E. Jones - jonesde
 Written in 2014-2015 by Solomon Bessire - sbessire
 Written in 2012-2015 by Sam Hamilton - samhamilton
 Written in 2014-2015 by Yao Chunlin - chunlinyao
@@ -48,6 +48,7 @@ written in 2019 by Deepak Dixit - dixitdeepak
 Written in 2020 by John Watson - jotson
 Written in 2021 by Do Nhu Vy - donhuvy
 Written in 2020-2021 by Amir Anjomshoaa - amiranjom
+Written in 2022 by Guru Dharam Singh Khalsa - pandor4u
 
 ===========================================================================
 
@@ -69,7 +70,7 @@ litigation is filed.
 
 Signed by git commit adding my legal name and git username:
 
-Written in 2010-2020 by David E. Jones - jonesde
+Written in 2010-2022 by David E. Jones - jonesde
 Written in 2014-2015 by Solomon Bessire - sbessire
 Written in 2014-2015 by Yao Chunlin - chunlinyao
 Written in 2015-2016 by Jens Hardings - jenshp
@@ -82,5 +83,6 @@ written in 2019 by Deepak Dixit - dixitdeepak
 Written in 2020 by John Watson - jotson
 Written in 2021 by Do Nhu Vy - donhuvy
 Written in 2020-2021 by Amir Anjomshoaa - amiranjom
+Written in 2022 by Guru Dharam Singh Khalsa - pandor4u
 
 ===========================================================================
diff --git a/MoquiConf.xml b/MoquiConf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- No copyright or license for configuration file, details here are not considered a creative work. -->
-<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd">
+<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd">
     <default-property name="mantle_content_root" value=""/>
     <default-property name="mantle_content_large_root" value=""/>
 </moqui-conf>
diff --git a/README.md b/README.md
@@ -2,11 +2,11 @@
 
 [![license](http://img.shields.io/badge/license-CC0%201.0%20Universal-blue.svg)](https://github.com/moqui/mantle-udm/blob/master/LICENSE.md)
 [![release](http://img.shields.io/github/release/moqui/mantle-udm.svg)](https://github.com/moqui/mantle-udm/releases)
-[![commits since release](http://img.shields.io/github/commits-since/moqui/mantle-udm/v2.1.1.svg)](https://github.com/moqui/mantle-udm/commits/master)
+[![commits since release](http://img.shields.io/github/commits-since/moqui/mantle-udm/v2.2.0.svg)](https://github.com/moqui/mantle-udm/commits/master)
 
+[![Discourse Forum](https://img.shields.io/badge/moqui%20forum-discourse-blue.svg)](https://forum.moqui.org)
+[![Google Group](https://img.shields.io/badge/google%20group-moqui-blue.svg)](https://groups.google.com/d/forum/moqui)
 [![LinkedIn Group](https://img.shields.io/badge/linked%20in%20group-moqui-blue.svg)](https://www.linkedin.com/groups/4640689)
-[![Google Group](https://img.shields.io/badge/google%20group-mantleba-blue.svg)](https://groups.google.com/d/forum/mantleba)
-[![Join the chat at https://gitter.im/moqui/mantle-usl](https://badges.gitter.im/moqui/mantle-usl.svg)](https://gitter.im/moqui/mantle-usl?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Stack Overflow](https://img.shields.io/badge/stack%20overflow-moqui-blue.svg)](http://stackoverflow.com/questions/tagged/moqui)
 
 For details about Mantle see its page on moqui.org:

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
@@ -1,6 +1,42 @@
 
 Mantle Business Artifacts - Universal Data Model Release Notes
 
+===========================================================================
+Release 2.2.0 - 31 May 2022
+===========================================================================
+
+Mantle Universal Data Model 2.2.0 is a minor new feature and bug fix
+release. This release is based on Moqui Framework 3.0.0.
+
+This release includes a number of new entities, additional fields for
+service and screen level options, and seed data improvements.
+
+- new entities using UomDimensionType in moqui-framework:
+  ProductUomDimension, PartyDimension, MarketSegmentDimension
+- new ProductParameter and related entities to configure parameters
+  applicable to products with optional options, generally additional
+  information to collect from the customer when the product is purchase,
+  including: ProductParameterOption, ProductParameterProduct,
+  ProductParameterSet, and ProductParameterValue; parameter values on
+  orders with OrderItem.productParameterSetId, uses single ID to represent
+  value set for easier future association with shipment items, assets, etc
+- new ProductWorkEffort entity for tasks related to product purchase, and
+  OrderItemWorkEffort.forStatusId to track when should be considered done
+- new ShipmentParty and OrderItemParty entities
+- new OrderServiceJobRun entity to track job runs for orders
+- new ProductDbForm and OrderItemFormResponse entities to have forms
+  associated with products that are filled out by customer on purchase
+- new PartySystemMessage entity, like other *SystemMessage join entities
+
+DEPRECATION NOTES: ProductDimension (use ProductUomDimension instead)
+and ProductDimensionType (use UomDimensionType instead); these will be
+removed in a future release, recommend updating code and migrating data
+before the next major release (non backward compatible).
+
+For a complete list of changes see:
+
+https://github.com/moqui/mantle-udm/compare/v2.1.2...v2.2.0
+
 ===========================================================================
 Release 2.1.2 - 07 Dec 2019
 ===========================================================================

diff --git a/component.xml b/component.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd"
-        name="mantle-udm" version="2.1.2">
+<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd"
+        name="mantle-udm" version="2.2.0">
     <!-- no dependencies -->
 </component>
diff --git a/data/ZaaGlAccountsInstallData.xml b/data/ZaaGlAccountsInstallData.xml
@@ -1438,9 +1438,10 @@ along with this software (see the LICENSE.md file). If not, see
     <mantle.ledger.config.PartyAcctgPreference organizationPartyId="DefaultSettings" baseCurrencyUomId="USD"
             cogsMethodEnumId="CogsActualCost" errorGlJournalId="DefaultSettingsError"
             invoiceIdPrefix="" invoiceSequenceEnumId="InvSqStandard" orderIdPrefix="" orderSequenceEnumId="OrdSqStandard"
-            fiscalYearStartMonth="1" fiscalYearStartDay="1" hourlyTimePeriodTypeId="PayrollWeek" salaryTimePeriodTypeId="PayrollBiWeek"
+            fiscalYearStartMonth="1" fiscalYearStartDay="1"
+            hourlyTimePeriodTypeId="PayrollBiWeek" salaryTimePeriodTypeId="PayrollSemiMonth"
             taxClassificationEnumId="TxcCCorp" taxFormEnumId="TxfUsIrs1120"
-            employerClassEnumId="EmclsUsIrsRegularOther" payrollTaxFormEnumId="PtxfUsIrs941" settlementTermId="NetLastNext"/>
+            employerClassEnumId="EmclsUsIrsRegularOther" payrollTaxFormEnumId="PtxfUsIrs941" settlementTermId="Net30"/>
 
     <mantle.ledger.account.GlAccountOrganization glAccountId="110000000" organizationPartyId="DefaultSettings"/>
     <mantle.ledger.account.GlAccountOrganization glAccountId="111100000" organizationPartyId="DefaultSettings"/>
@@ -1977,6 +1978,8 @@ along with this software (see the LICENSE.md file). If not, see
             paymentInstrumentEnumId="PiBillingAccount" isPayable="E"/>
     <mantle.ledger.config.PaymentInstrumentGlAccount glAccountId="111100000" organizationPartyId="DefaultSettings"
             paymentInstrumentEnumId="PiCod" isPayable="E"/>
+    <mantle.ledger.config.PaymentInstrumentGlAccount glAccountId="111100000" organizationPartyId="DefaultSettings"
+            paymentInstrumentEnumId="PiWireTransfer" isPayable="E"/>
 
     <!-- Using Payment for these is messy, use adjust#Invoice with appropriate item type instead:
     <mantle.ledger.config.PaymentInstrumentGlAccount glAccountId="782100000" organizationPartyId="DefaultSettings"

diff --git a/entity/AccountingAccountEntities.xml b/entity/AccountingAccountEntities.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-2.1.xsd">
+          xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
     <!-- ========================================================= -->
     <!--  - mantle.account.billing -->
     <!--  - mantle.account.financial -->

diff --git a/entity/AccountingLedgerEntities.xml b/entity/AccountingLedgerEntities.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-2.1.xsd">
+          xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
     <!-- ========================================================= -->
     <!--  - mantle.ledger.account -->
     <!--  - mantle.ledger.config -->

diff --git a/entity/AccountingOtherEntities.xml b/entity/AccountingOtherEntities.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-2.1.xsd">
+          xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
     <!-- ========================================================= -->
     <!--  - mantle.other.budget -->
     <!--  - mantle.other.tax -->

diff --git a/entity/FacilityEntities.xml b/entity/FacilityEntities.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-2.1.xsd">
+          xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
 
     <!-- ========================================================= -->
     <!-- mantle.facility -->

diff --git a/entity/HumanResourcesEntities.xml b/entity/HumanResourcesEntities.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-This software is in the public domain under CC0 1.0 Universal plus a 
+This software is in the public domain under CC0 1.0 Universal plus a
 Grant of Patent License.
 
 To the extent possible under law, the author(s) have dedicated all
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-2.1.xsd">
+          xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
     <!-- ========================================================= -->
     <!--  - mantle.humanres.ability -->
     <!--  - mantle.humanres.employment -->
@@ -25,6 +25,24 @@ along with this software (see the LICENSE.md file). If not, see
     <!-- ========================================================= -->
     <!-- mantle.humanres.ability -->
     <!-- ========================================================= -->
+
+    <entity entity-name="PartySkill" package="mantle.humanres.ability" use="nontransactional">
+        <field name="partyId" type="id" is-pk="true"/>
+        <field name="skillTypeEnumId" type="id" is-pk="true"/>
+        <field name="rating" type="number-integer"/>
+        <field name="skillLevel" type="number-integer"/>
+        <field name="startedUsingDate" type="date-time"/>
+        <field name="yearsExperience" type="number-integer"/>
+        <relationship type="one" related="mantle.party.Party" short-alias="party"/>
+        <relationship type="one" title="SkillType" related="moqui.basic.Enumeration" short-alias="skillTypeEnum">
+            <key-map field-name="skillTypeEnumId"/></relationship>
+
+        <seed-data>
+            <!-- Skill Type -->
+            <moqui.basic.EnumerationType description="Skill Type" enumTypeId="SkillType"/>
+        </seed-data>
+    </entity>
+
     <!-- not yet used so commented for now:
     <entity entity-name="PartyQualification" package="mantle.humanres.ability" use="nontransactional">
         <field name="partyId" type="id" is-pk="true"/>
@@ -72,17 +90,6 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="resumeText" type="text-very-long"/>
         <relationship type="one" related="mantle.party.Party"/>
     </entity>
-    <entity entity-name="PartySkill" package="mantle.humanres.ability" use="nontransactional">
-        <field name="partyId" type="id" is-pk="true"/>
-        <field name="skillTypeEnumId" type="id" is-pk="true"/>
-        <field name="yearsExperience" type="number-integer"/>
-        <field name="rating" type="number-integer"/>
-        <field name="skillLevel" type="number-integer"/>
-        <field name="startedUsingDate" type="date-time"/>
-        <relationship type="one" related="mantle.party.Party"/>
-        <relationship type="one" title="SkillType" related="moqui.basic.Enumeration">
-            <key-map field-name="skillTypeEnumId"/></relationship>
-    </entity>
     <entity entity-name="PerformanceReview" package="mantle.humanres.ability" use="nontransactional">
         <field name="performanceReviewId" type="id" is-pk="true"/>
         <field name="employeePartyId" type="id"/>
@@ -304,7 +311,7 @@ along with this software (see the LICENSE.md file). If not, see
             <moqui.basic.Enumeration description="Layoff" enumId="TtLayoff" enumTypeId="TerminationType"/>
             <moqui.basic.Enumeration description="Retired" enumId="TtRetired" enumTypeId="TerminationType"/>
 
-            <!-- Termination Rason -->
+            <!-- Termination Reason -->
             <moqui.basic.EnumerationType description="Termination Reason" enumTypeId="TerminationReason"/>
 
             <!-- Identity Type -->
@@ -481,7 +488,7 @@ along with this software (see the LICENSE.md file). If not, see
             <key-map field-name="currencyUomId"/></relationship>
         <relationship type="one" related="mantle.party.time.TimePeriodType"/>
     </entity>
-    
+
     <entity entity-name="PayrollAdjustment" package="mantle.humanres.employment" use="configuration">
         <field name="payrollAdjustmentId" type="id" is-pk="true"/>
         <field name="description" type="text-medium"/>
@@ -795,6 +802,26 @@ along with this software (see the LICENSE.md file). If not, see
             <mantle.humanres.position.EmplPositionClassWorkType emplPositionClassId="GeneralManager" workTypeEnumId="WktpManagement"/>
         </seed-data>
     </entity>
+    <entity entity-name="EmplPositionClassPtyClsTp" package="mantle.party">
+        <field name="emplPositionClassId" type="id" is-pk="true"/>
+        <field name="classificationTypeEnumId" type="id" is-pk="true"/>
+        <relationship type="one" related="mantle.humanres.position.EmplPositionClass" short-alias="emplPositionClass"/>
+        <relationship type="one" title="PartyClassificationType" related="moqui.basic.Enumeration" short-alias="type">
+            <key-map field-name="classificationTypeEnumId"/></relationship>
+    </entity>
+    <entity entity-name="EmplPositionClassDimension" package="mantle.humanres.position" use="configuration">
+        <field name="emplPositionClassId" type="id" is-pk="true"/>
+        <field name="uomDimensionTypeId" type="id" is-pk="true"/>
+        <relationship type="one" related="mantle.humanres.position.EmplPositionClass"/>
+        <relationship type="one" related="moqui.basic.UomDimensionType" short-alias="type"/>
+    </entity>
+    <entity entity-name="EmplPositionClassSkill" package="mantle.humanres.position" use="configuration">
+        <field name="emplPositionClassId" type="id" is-pk="true"/>
+        <field name="skillTypeEnumId" type="id" is-pk="true"/>
+        <relationship type="one" related="mantle.humanres.position.EmplPositionClass"/>
+        <relationship type="one" title="SkillType" related="moqui.basic.Enumeration" short-alias="skillTypeEnum">
+            <key-map field-name="skillTypeEnumId"/></relationship>
+    </entity>
     <entity entity-name="EmplPositionClassParty" package="mantle.humanres.position" use="nontransactional">
         <description>An alternative to EmplPosition and Employment to represent an employee in a position class for
             billing purposes, etc. Can be used in addition to EmplPosition or instead of.</description>
@@ -823,9 +850,9 @@ 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="comments" type="text-medium"/>
-        <relationship type="one" related="mantle.humanres.position.EmplPosition"/>
-        <relationship type="one" related="mantle.party.Party"/>
-        <relationship type="one" related="mantle.party.RoleType"/>
+        <relationship type="one" related="mantle.humanres.position.EmplPosition" short-alias="position"/>
+        <relationship type="one" related="mantle.party.Party" short-alias="party"/>
+        <relationship type="one" related="mantle.party.RoleType" short-alias="roleType"/>
     </entity>
     <entity entity-name="EmplPositionResponsibility" package="mantle.humanres.position" use="configuration">
         <field name="emplPositionId" type="id" is-pk="true"/>

diff --git a/entity/MarketingEntities.xml b/entity/MarketingEntities.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-2.1.xsd">
+          xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
     <!-- ========================================================= -->
     <!--  - mantle.marketing.campaign -->
     <!--  - mantle.marketing.contact -->

diff --git a/entity/OrderEntities.xml b/entity/OrderEntities.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-2.1.xsd">
+          xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
     <!-- ========================================================= -->
     <!--  - mantle.order -->
     <!--  - mantle.order.return -->