Merge pull request #27 from sssonline/master

2016-11-04
moqui · Nov 4, 2016 · 214d090 · 214d090
2 parents a925f77 + f884c5c
commit 214d090
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 41 deletions.
diff --git a/entity/AccountingOtherEntities.xml b/entity/AccountingOtherEntities.xml
@@ -29,12 +29,15 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="timePeriodId" type="id"/>
         <field name="subTimePeriodTypeId" type="id"/>
         <field name="statusId" type="id" enable-audit-log="true"/>
+        <field name="currencyUomId" type="id"/>
         <field name="description" type="text-medium"/>
         <field name="comments" type="text-long"/>
-        <relationship type="one" title="BudgetType" related="moqui.basic.Enumeration">
+        <relationship type="one" title="BudgetType" related="moqui.basic.Enumeration" short-alias="type">
             <key-map field-name="budgetTypeEnumId"/></relationship>
-        <relationship type="one" related="mantle.party.time.TimePeriod"/>
-        <relationship type="one" title="Budget" related="moqui.basic.StatusItem"/>
+        <relationship type="one" related="mantle.party.time.TimePeriod" short-alias="timePeriod"/>
+        <relationship type="one" title="Budget" related="moqui.basic.StatusItem" short-alias="status"/>
+        <relationship type="one" title="Currency" related="moqui.basic.Uom" short-alias="currencyUom">
+            <key-map field-name="currencyUomId"/></relationship>
         <seed-data>
             <!-- Budget Type -->
             <moqui.basic.EnumerationType description="Budget Type" enumTypeId="BudgetType"/>
@@ -58,17 +61,21 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="purpose" type="text-medium"/>
         <field name="justification" type="text-medium"/>
         <field name="subTimePeriodId" type="id"><description>A TimePeriod for the item within the TimePeriod for the entire budget</description></field>
-        <relationship type="one" related="Budget"/>
-        <relationship type="one" title="BudgetItemType" related="moqui.basic.Enumeration">
+        <relationship type="one" related="mantle.other.budget.Budget" short-alias="budget"/>
+        <relationship type="one" title="BudgetItemType" related="moqui.basic.Enumeration" short-alias="budgetItemType">
             <key-map field-name="budgetItemTypeEnumId"/></relationship>
-        <relationship type="one" title="ItemType" related="moqui.basic.Enumeration" short-alias="type">
+        <relationship type="one" title="ItemType" related="moqui.basic.Enumeration" short-alias="itemType">
             <key-map field-name="itemTypeEnumId"/></relationship>
         <relationship type="one" related="mantle.ledger.account.GlAccount" short-alias="glAccount"/>
         <relationship type="one" related="mantle.product.Product" short-alias="product"/>
         <relationship type="one" title="Quantity" related="moqui.basic.Uom" short-alias="quantityUom">
             <key-map field-name="quantityUomId"/></relationship>
         <relationship type="one" title="Sub" related="mantle.party.time.TimePeriod" short-alias="subTimePeriod">
             <key-map field-name="subTimePeriodId"/></relationship>
+
+        <relationship type="many" related="mantle.other.budget.BudgetItemDetail" short-alias="details">
+            <key-map field-name="budgetId"/><key-map field-name="budgetItemSeqId"/></relationship>
+
         <seed-data>
             <!-- Budget Item Type -->
             <moqui.basic.EnumerationType description="Budget Item Type" enumTypeId="BudgetItemType"/>
@@ -83,12 +90,14 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="facilityId" type="id"/>
         <field name="assetId" type="id"/>
         <field name="amount" type="currency-precise"/>
+        <field name="productId" type="id"/>
         <field name="quantity" type="number-decimal"/>
 
-        <relationship type="one-nofk" related="mantle.other.budget.Budget"/>
-        <relationship type="one" related="mantle.other.budget.BudgetItem"/>
-        <relationship type="one" related="mantle.facility.Facility"/>
-        <relationship type="one" related="mantle.product.asset.Asset"/>
+        <relationship type="one-nofk" related="mantle.other.budget.Budget" short-alias="budget"/>
+        <relationship type="one" related="mantle.other.budget.BudgetItem" short-alias="budgetItem"/>
+        <relationship type="one" related="mantle.facility.Facility" short-alias="facility"/>
+        <relationship type="one" related="mantle.product.asset.Asset" short-alias="asset"/>
+        <relationship type="one" related="mantle.product.Product" short-alias="product"/>
     </entity>
     <entity entity-name="BudgetReview" package="mantle.other.budget">
         <field name="budgetReviewId" type="id" is-pk="true"/>

diff --git a/entity/PartyEntities.xml b/entity/PartyEntities.xml
@@ -1305,9 +1305,9 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="partyId" type="id"><description>The Party that owns the TimePeriod, generally an Internal Organization.</description></field>
         <field name="periodNum" type="number-integer"/>
         <field name="periodName" type="text-medium"/>
-        <field name="fromDate" type="date"><description>The first day of the period.</description></field>
-        <field name="thruDate" type="date"><description>The last day of the period.</description></field>
-        <field name="isClosed" type="text-indicator"/>
+        <field name="fromDate" type="date" not-null="true"><description>The first day of the period.</description></field>
+        <field name="thruDate" type="date" not-null="true"><description>The last day of the period.</description></field>
+        <field name="isClosed" type="text-indicator" default="'N'"/>
         <relationship type="one" title="Parent" related="mantle.party.time.TimePeriod" short-alias="parent">
             <key-map field-name="parentPeriodId" related="timePeriodId"/></relationship>
         <relationship type="one" title="Previous" related="mantle.party.time.TimePeriod" short-alias="previous">
@@ -1317,12 +1317,15 @@ along with this software (see the LICENSE.md file). If not, see
     <entity entity-name="TimePeriodType" package="mantle.party.time">
         <field name="timePeriodTypeId" type="id" is-pk="true"/>
         <field name="periodPurposeEnumId" type="id"/>
+        <field name="parentPeriodTypeId" type="id"/>
         <field name="description" type="text-medium"/>
         <field name="periodLength" type="number-decimal"/>
         <field name="lengthUomId" type="id"/>
         <relationship type="one" title="TimePeriodPurpose" related="moqui.basic.Enumeration" short-alias="purpose">
             <key-map field-name="periodPurposeEnumId"/></relationship>
-        <relationship type="one" title="Length" related="moqui.basic.Uom" short-alias="">
+        <relationship type="one" title="Parent" related="mantle.party.time.TimePeriodType" short-alias="parentPeriodType">
+            <key-map field-name="parentPeriodTypeId"/></relationship>
+        <relationship type="one" title="Length" related="moqui.basic.Uom" short-alias="lengthUom">
             <key-map field-name="lengthUomId" related="uomId"/></relationship>
         <seed-data>
             <moqui.basic.EnumerationType description="Time Period Purpose" enumTypeId="TimePeriodPurpose"/>
@@ -1334,42 +1337,42 @@ along with this software (see the LICENSE.md file). If not, see
             <mantle.party.time.TimePeriodType description="Fiscal Year" timePeriodTypeId="FiscalYear"
                     periodPurposeEnumId="Fiscal" periodLength="1" lengthUomId="TF_yr"/>
             <mantle.party.time.TimePeriodType description="Fiscal Quarter" timePeriodTypeId="FiscalQuarter"
-                    periodPurposeEnumId="Fiscal" periodLength="3" lengthUomId="TF_mon"/>
+                    parentPeriodTypeId="FiscalYear" periodPurposeEnumId="Fiscal" periodLength="3" lengthUomId="TF_mon"/>
             <mantle.party.time.TimePeriodType description="Fiscal Month" timePeriodTypeId="FiscalMonth"
-                    periodPurposeEnumId="Fiscal" periodLength="1" lengthUomId="TF_mon"/>
+                    parentPeriodTypeId="FiscalQuarter" periodPurposeEnumId="Fiscal" periodLength="1" lengthUomId="TF_mon"/>
             <mantle.party.time.TimePeriodType description="Fiscal Bi-Week" timePeriodTypeId="FiscalBiWeek"
-                    periodPurposeEnumId="Fiscal" periodLength="2" lengthUomId="TF_wk"/>
+                    parentPeriodTypeId="FiscalMonth" periodPurposeEnumId="Fiscal" periodLength="2" lengthUomId="TF_wk"/>
             <mantle.party.time.TimePeriodType description="Fiscal Week" timePeriodTypeId="FiscalWeek"
-                    periodPurposeEnumId="Fiscal" periodLength="1" lengthUomId="TF_wk"/>
+                    parentPeriodTypeId="FiscalMonth" periodPurposeEnumId="Fiscal" periodLength="1" lengthUomId="TF_wk"/>
 
             <mantle.party.time.TimePeriodType description="Payroll Year" timePeriodTypeId="PayrollYear"
                     periodPurposeEnumId="Payroll" periodLength="1" lengthUomId="TF_yr"/>
             <mantle.party.time.TimePeriodType description="Payroll Semi-Year" timePeriodTypeId="PayrollSemiYear"
-                    periodPurposeEnumId="Payroll" periodLength="6" lengthUomId="TF_mon"/>
+                    parentPeriodTypeId="PayrollYear" periodPurposeEnumId="Payroll" periodLength="6" lengthUomId="TF_mon"/>
             <mantle.party.time.TimePeriodType description="Payroll Quarter" timePeriodTypeId="PayrollQuarter"
-                    periodPurposeEnumId="Payroll" periodLength="3" lengthUomId="TF_mon"/>
+                    parentPeriodTypeId="PayrollYear" periodPurposeEnumId="Payroll" periodLength="3" lengthUomId="TF_mon"/>
             <mantle.party.time.TimePeriodType description="Payroll Month" timePeriodTypeId="PayrollMonth"
-                    periodPurposeEnumId="Payroll" periodLength="1" lengthUomId="TF_mon"/>
+                    parentPeriodTypeId="PayrollQuarter" periodPurposeEnumId="Payroll" periodLength="1" lengthUomId="TF_mon"/>
             <mantle.party.time.TimePeriodType description="Payroll Semi-Month" timePeriodTypeId="PayrollSemiMonth"
-                    periodPurposeEnumId="Payroll" periodLength="0.5" lengthUomId="TF_mon"/>
+                    parentPeriodTypeId="PayrollMonth" periodPurposeEnumId="Payroll" periodLength="0.5" lengthUomId="TF_mon"/>
             <mantle.party.time.TimePeriodType description="Payroll Bi-Week" timePeriodTypeId="PayrollBiWeek"
-                    periodPurposeEnumId="Payroll" periodLength="2" lengthUomId="TF_wk"/>
+                    parentPeriodTypeId="PayrollMonth" periodPurposeEnumId="Payroll" periodLength="2" lengthUomId="TF_wk"/>
             <mantle.party.time.TimePeriodType description="Payroll Week" timePeriodTypeId="PayrollWeek"
-                    periodPurposeEnumId="Payroll" periodLength="1" lengthUomId="TF_wk"/>
+                    parentPeriodTypeId="PayrollMonth" periodPurposeEnumId="Payroll" periodLength="1" lengthUomId="TF_wk"/>
 
             <mantle.party.time.TimePeriodType description="Sales Year" timePeriodTypeId="SalesYear"
                     periodPurposeEnumId="Sales" periodLength="1" lengthUomId="TF_yr"/>
             <mantle.party.time.TimePeriodType description="Sales Quarter" timePeriodTypeId="SalesQuarter"
-                    periodPurposeEnumId="Sales" periodLength="3" lengthUomId="TF_mon"/>
+                    parentPeriodTypeId="SalesYear" periodPurposeEnumId="Sales" periodLength="3" lengthUomId="TF_mon"/>
             <mantle.party.time.TimePeriodType description="Sales Month" timePeriodTypeId="SalesMonth"
-                    periodPurposeEnumId="Sales" periodLength="1" lengthUomId="TF_mon"/>
+                    parentPeriodTypeId="SalesQuarter" periodPurposeEnumId="Sales" periodLength="1" lengthUomId="TF_mon"/>
 
             <mantle.party.time.TimePeriodType description="Tax Year" timePeriodTypeId="TaxYear"
                     periodPurposeEnumId="Tax" periodLength="1" lengthUomId="TF_yr"/>
             <mantle.party.time.TimePeriodType description="Tax Quarter" timePeriodTypeId="TaxQuarter"
-                    periodPurposeEnumId="Tax" periodLength="3" lengthUomId="TF_mon"/>
+                    parentPeriodTypeId="TaxYear" periodPurposeEnumId="Tax" periodLength="3" lengthUomId="TF_mon"/>
             <mantle.party.time.TimePeriodType description="Tax Month" timePeriodTypeId="TaxMonth"
-                    periodPurposeEnumId="Tax" periodLength="1" lengthUomId="TF_mon"/>
+                    parentPeriodTypeId="TaxQuarter" periodPurposeEnumId="Tax" periodLength="1" lengthUomId="TF_mon"/>
         </seed-data>
     </entity>
 </entities>
diff --git a/entity/ProductAssetEntities.xml b/entity/ProductAssetEntities.xml
@@ -311,22 +311,24 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="assetIssuanceId" type="id"/>
         <field name="assetReceiptId" type="id"/>
         <field name="physicalInventoryId" type="id"/>
+        <field name="physicalInventoryCountId" type="id"/>
         <field name="varianceReasonEnumId" type="id"/>
         <field name="description" type="text-medium"/>
         <field name="acctgTransResultEnumId" type="id" create-only="false"/>
-        <relationship type="one" related="mantle.product.asset.Asset"/>
-        <relationship type="one-nofk" related="mantle.product.issuance.AssetReservation"/><!-- no FK for when record is deleted -->
-        <relationship type="one" related="mantle.shipment.Shipment"/>
-        <relationship type="one" related="mantle.product.Product"/>
-        <relationship type="one" related="mantle.order.return.ReturnItem"/>
-        <relationship type="one" related="mantle.work.effort.WorkEffort"/>
-        <relationship type="one" related="mantle.product.maintenance.AssetMaintenance"/>
-        <relationship type="one" related="mantle.product.issuance.AssetIssuance"/>
-        <relationship type="one" related="mantle.product.receipt.AssetReceipt"/>
-        <relationship type="one" related="mantle.product.asset.PhysicalInventory"/>
-        <relationship type="one" title="InventoryVarianceReason" related="moqui.basic.Enumeration">
+        <relationship type="one" related="mantle.product.asset.Asset" short-alias="asset"/>
+        <relationship type="one-nofk" related="mantle.product.issuance.AssetReservation" short-alias="assetReservation"/><!-- no FK for when record is deleted -->
+        <relationship type="one" related="mantle.shipment.Shipment" short-alias="shipment"/>
+        <relationship type="one" related="mantle.product.Product" short-alias="product"/>
+        <relationship type="one" related="mantle.order.return.ReturnItem" short-alias="returnItem"/>
+        <relationship type="one" related="mantle.work.effort.WorkEffort" short-alias="workEffort"/>
+        <relationship type="one" related="mantle.product.maintenance.AssetMaintenance" short-alias="assetMaintenance"/>
+        <relationship type="one" related="mantle.product.issuance.AssetIssuance" short-alias="assetIssuance"/>
+        <relationship type="one" related="mantle.product.receipt.AssetReceipt" short-alias="assetReceipt"/>
+        <relationship type="one" related="mantle.product.asset.PhysicalInventory" short-alias="physicalInventory"/>
+        <relationship type="one" related="mantle.product.asset.PhysicalInventoryCount" short-alias="physicalInventoryCount"/>
+        <relationship type="one" title="InventoryVarianceReason" related="moqui.basic.Enumeration" short-alias="varianceReasonEnum">
             <key-map field-name="varianceReasonEnumId"/></relationship>
-        <relationship type="one" title="AcctgTransResult" related="moqui.basic.Enumeration">
+        <relationship type="one" title="AcctgTransResult" related="moqui.basic.Enumeration" short-alias="acctgTransResultEnum">
             <key-map field-name="acctgTransResultEnumId"/></relationship>
         <seed-data>
             <!-- Inventory Variance Reason -->
@@ -465,6 +467,20 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="physicalInventoryDate" type="date-time"/>
         <field name="partyId" type="id"/>
         <field name="comments" type="text-long"/>
+        <relationship type="one" related="mantle.party.Party" short-alias="party"/>
+    </entity>
+    <entity entity-name="PhysicalInventoryCount" package="mantle.product.asset" cache="never">
+        <field name="physicalInventoryCountId" type="id" is-pk="true"/>
+        <field name="physicalInventoryId" type="id"/>
+        <field name="facilityId" type="id"/>
+        <field name="locationSeqId" type="id"/>
+        <field name="productId" type="id"/>
+        <field name="countDate" type="date-time"/>
+        <field name="quantityOnHand" type="number-decimal"/>
+        <field name="comments" type="text-medium"/>
+        <relationship type="one" related="mantle.facility.Facility" short-alias="facility"/>
+        <relationship type="one-nofk" related="mantle.facility.FacilityLocation" short-alias="facilityLocation"/>
+        <relationship type="one" related="mantle.product.Product" short-alias="product"/>
     </entity>
 
     <!-- ========================================================= -->

diff --git a/entity/ProductDefinitionEntities.xml b/entity/ProductDefinitionEntities.xml
@@ -83,7 +83,7 @@ along with this software (see the LICENSE.md file). If not, see
         <!-- explicit many relationship, used in MantleProduct DataDocument -->
         <relationship type="many" related="mantle.product.ProductAssoc" short-alias="assocs">
             <key-map field-name="productId"/></relationship>
-        <relationship type="many" related="mantle.product.ProductAssoc" short-alias="toAssocs">
+        <relationship type="many" title="To" related="mantle.product.ProductAssoc" short-alias="toAssocs">
             <key-map field-name="productId" related="toProductId"/></relationship>
         <relationship type="many" related="mantle.product.ProductContent" short-alias="contents">
             <key-map field-name="productId"/></relationship>