Skip to content

Commit 214d090

Browse files
jonesdejonesde
authored
Merge pull request #27 from sssonline/master
2016-11-04
2 parents a925f77 + f884c5c commit 214d090

File tree

4 files changed

+69
-41
lines changed

4 files changed

+69
-41
lines changed

‎entity/AccountingOtherEntities.xml‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,15 @@ along with this software (see the LICENSE.md file). If not, see
2929
<field name="timePeriodId" type="id"/>
3030
<field name="subTimePeriodTypeId" type="id"/>
3131
<field name="statusId" type="id" enable-audit-log="true"/>
32+
<field name="currencyUomId" type="id"/>
3233
<field name="description" type="text-medium"/>
3334
<field name="comments" type="text-long"/>
34-
<relationship type="one" title="BudgetType" related="moqui.basic.Enumeration">
35+
<relationship type="one" title="BudgetType" related="moqui.basic.Enumeration" short-alias="type">
3536
<key-map field-name="budgetTypeEnumId"/></relationship>
36-
<relationship type="one" related="mantle.party.time.TimePeriod"/>
37-
<relationship type="one" title="Budget" related="moqui.basic.StatusItem"/>
37+
<relationship type="one" related="mantle.party.time.TimePeriod" short-alias="timePeriod"/>
38+
<relationship type="one" title="Budget" related="moqui.basic.StatusItem" short-alias="status"/>
39+
<relationship type="one" title="Currency" related="moqui.basic.Uom" short-alias="currencyUom">
40+
<key-map field-name="currencyUomId"/></relationship>
3841
<seed-data>
3942
<!-- Budget Type -->
4043
<moqui.basic.EnumerationType description="Budget Type" enumTypeId="BudgetType"/>
@@ -58,17 +61,21 @@ along with this software (see the LICENSE.md file). If not, see
5861
<field name="purpose" type="text-medium"/>
5962
<field name="justification" type="text-medium"/>
6063
<field name="subTimePeriodId" type="id"><description>A TimePeriod for the item within the TimePeriod for the entire budget</description></field>
61-
<relationship type="one" related="Budget"/>
62-
<relationship type="one" title="BudgetItemType" related="moqui.basic.Enumeration">
64+
<relationship type="one" related="mantle.other.budget.Budget" short-alias="budget"/>
65+
<relationship type="one" title="BudgetItemType" related="moqui.basic.Enumeration" short-alias="budgetItemType">
6366
<key-map field-name="budgetItemTypeEnumId"/></relationship>
64-
<relationship type="one" title="ItemType" related="moqui.basic.Enumeration" short-alias="type">
67+
<relationship type="one" title="ItemType" related="moqui.basic.Enumeration" short-alias="itemType">
6568
<key-map field-name="itemTypeEnumId"/></relationship>
6669
<relationship type="one" related="mantle.ledger.account.GlAccount" short-alias="glAccount"/>
6770
<relationship type="one" related="mantle.product.Product" short-alias="product"/>
6871
<relationship type="one" title="Quantity" related="moqui.basic.Uom" short-alias="quantityUom">
6972
<key-map field-name="quantityUomId"/></relationship>
7073
<relationship type="one" title="Sub" related="mantle.party.time.TimePeriod" short-alias="subTimePeriod">
7174
<key-map field-name="subTimePeriodId"/></relationship>
75+
76+
<relationship type="many" related="mantle.other.budget.BudgetItemDetail" short-alias="details">
77+
<key-map field-name="budgetId"/><key-map field-name="budgetItemSeqId"/></relationship>
78+
7279
<seed-data>
7380
<!-- Budget Item Type -->
7481
<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
8390
<field name="facilityId" type="id"/>
8491
<field name="assetId" type="id"/>
8592
<field name="amount" type="currency-precise"/>
93+
<field name="productId" type="id"/>
8694
<field name="quantity" type="number-decimal"/>
8795

88-
<relationship type="one-nofk" related="mantle.other.budget.Budget"/>
89-
<relationship type="one" related="mantle.other.budget.BudgetItem"/>
90-
<relationship type="one" related="mantle.facility.Facility"/>
91-
<relationship type="one" related="mantle.product.asset.Asset"/>
96+
<relationship type="one-nofk" related="mantle.other.budget.Budget" short-alias="budget"/>
97+
<relationship type="one" related="mantle.other.budget.BudgetItem" short-alias="budgetItem"/>
98+
<relationship type="one" related="mantle.facility.Facility" short-alias="facility"/>
99+
<relationship type="one" related="mantle.product.asset.Asset" short-alias="asset"/>
100+
<relationship type="one" related="mantle.product.Product" short-alias="product"/>
92101
</entity>
93102
<entity entity-name="BudgetReview" package="mantle.other.budget">
94103
<field name="budgetReviewId" type="id" is-pk="true"/>

‎entity/PartyEntities.xml‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,9 +1305,9 @@ along with this software (see the LICENSE.md file). If not, see
13051305
<field name="partyId" type="id"><description>The Party that owns the TimePeriod, generally an Internal Organization.</description></field>
13061306
<field name="periodNum" type="number-integer"/>
13071307
<field name="periodName" type="text-medium"/>
1308-
<field name="fromDate" type="date"><description>The first day of the period.</description></field>
1309-
<field name="thruDate" type="date"><description>The last day of the period.</description></field>
1310-
<field name="isClosed" type="text-indicator"/>
1308+
<field name="fromDate" type="date" not-null="true"><description>The first day of the period.</description></field>
1309+
<field name="thruDate" type="date" not-null="true"><description>The last day of the period.</description></field>
1310+
<field name="isClosed" type="text-indicator" default="'N'"/>
13111311
<relationship type="one" title="Parent" related="mantle.party.time.TimePeriod" short-alias="parent">
13121312
<key-map field-name="parentPeriodId" related="timePeriodId"/></relationship>
13131313
<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
13171317
<entity entity-name="TimePeriodType" package="mantle.party.time">
13181318
<field name="timePeriodTypeId" type="id" is-pk="true"/>
13191319
<field name="periodPurposeEnumId" type="id"/>
1320+
<field name="parentPeriodTypeId" type="id"/>
13201321
<field name="description" type="text-medium"/>
13211322
<field name="periodLength" type="number-decimal"/>
13221323
<field name="lengthUomId" type="id"/>
13231324
<relationship type="one" title="TimePeriodPurpose" related="moqui.basic.Enumeration" short-alias="purpose">
13241325
<key-map field-name="periodPurposeEnumId"/></relationship>
1325-
<relationship type="one" title="Length" related="moqui.basic.Uom" short-alias="">
1326+
<relationship type="one" title="Parent" related="mantle.party.time.TimePeriodType" short-alias="parentPeriodType">
1327+
<key-map field-name="parentPeriodTypeId"/></relationship>
1328+
<relationship type="one" title="Length" related="moqui.basic.Uom" short-alias="lengthUom">
13261329
<key-map field-name="lengthUomId" related="uomId"/></relationship>
13271330
<seed-data>
13281331
<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
13341337
<mantle.party.time.TimePeriodType description="Fiscal Year" timePeriodTypeId="FiscalYear"
13351338
periodPurposeEnumId="Fiscal" periodLength="1" lengthUomId="TF_yr"/>
13361339
<mantle.party.time.TimePeriodType description="Fiscal Quarter" timePeriodTypeId="FiscalQuarter"
1337-
periodPurposeEnumId="Fiscal" periodLength="3" lengthUomId="TF_mon"/>
1340+
parentPeriodTypeId="FiscalYear" periodPurposeEnumId="Fiscal" periodLength="3" lengthUomId="TF_mon"/>
13381341
<mantle.party.time.TimePeriodType description="Fiscal Month" timePeriodTypeId="FiscalMonth"
1339-
periodPurposeEnumId="Fiscal" periodLength="1" lengthUomId="TF_mon"/>
1342+
parentPeriodTypeId="FiscalQuarter" periodPurposeEnumId="Fiscal" periodLength="1" lengthUomId="TF_mon"/>
13401343
<mantle.party.time.TimePeriodType description="Fiscal Bi-Week" timePeriodTypeId="FiscalBiWeek"
1341-
periodPurposeEnumId="Fiscal" periodLength="2" lengthUomId="TF_wk"/>
1344+
parentPeriodTypeId="FiscalMonth" periodPurposeEnumId="Fiscal" periodLength="2" lengthUomId="TF_wk"/>
13421345
<mantle.party.time.TimePeriodType description="Fiscal Week" timePeriodTypeId="FiscalWeek"
1343-
periodPurposeEnumId="Fiscal" periodLength="1" lengthUomId="TF_wk"/>
1346+
parentPeriodTypeId="FiscalMonth" periodPurposeEnumId="Fiscal" periodLength="1" lengthUomId="TF_wk"/>
13441347

13451348
<mantle.party.time.TimePeriodType description="Payroll Year" timePeriodTypeId="PayrollYear"
13461349
periodPurposeEnumId="Payroll" periodLength="1" lengthUomId="TF_yr"/>
13471350
<mantle.party.time.TimePeriodType description="Payroll Semi-Year" timePeriodTypeId="PayrollSemiYear"
1348-
periodPurposeEnumId="Payroll" periodLength="6" lengthUomId="TF_mon"/>
1351+
parentPeriodTypeId="PayrollYear" periodPurposeEnumId="Payroll" periodLength="6" lengthUomId="TF_mon"/>
13491352
<mantle.party.time.TimePeriodType description="Payroll Quarter" timePeriodTypeId="PayrollQuarter"
1350-
periodPurposeEnumId="Payroll" periodLength="3" lengthUomId="TF_mon"/>
1353+
parentPeriodTypeId="PayrollYear" periodPurposeEnumId="Payroll" periodLength="3" lengthUomId="TF_mon"/>
13511354
<mantle.party.time.TimePeriodType description="Payroll Month" timePeriodTypeId="PayrollMonth"
1352-
periodPurposeEnumId="Payroll" periodLength="1" lengthUomId="TF_mon"/>
1355+
parentPeriodTypeId="PayrollQuarter" periodPurposeEnumId="Payroll" periodLength="1" lengthUomId="TF_mon"/>
13531356
<mantle.party.time.TimePeriodType description="Payroll Semi-Month" timePeriodTypeId="PayrollSemiMonth"
1354-
periodPurposeEnumId="Payroll" periodLength="0.5" lengthUomId="TF_mon"/>
1357+
parentPeriodTypeId="PayrollMonth" periodPurposeEnumId="Payroll" periodLength="0.5" lengthUomId="TF_mon"/>
13551358
<mantle.party.time.TimePeriodType description="Payroll Bi-Week" timePeriodTypeId="PayrollBiWeek"
1356-
periodPurposeEnumId="Payroll" periodLength="2" lengthUomId="TF_wk"/>
1359+
parentPeriodTypeId="PayrollMonth" periodPurposeEnumId="Payroll" periodLength="2" lengthUomId="TF_wk"/>
13571360
<mantle.party.time.TimePeriodType description="Payroll Week" timePeriodTypeId="PayrollWeek"
1358-
periodPurposeEnumId="Payroll" periodLength="1" lengthUomId="TF_wk"/>
1361+
parentPeriodTypeId="PayrollMonth" periodPurposeEnumId="Payroll" periodLength="1" lengthUomId="TF_wk"/>
13591362

13601363
<mantle.party.time.TimePeriodType description="Sales Year" timePeriodTypeId="SalesYear"
13611364
periodPurposeEnumId="Sales" periodLength="1" lengthUomId="TF_yr"/>
13621365
<mantle.party.time.TimePeriodType description="Sales Quarter" timePeriodTypeId="SalesQuarter"
1363-
periodPurposeEnumId="Sales" periodLength="3" lengthUomId="TF_mon"/>
1366+
parentPeriodTypeId="SalesYear" periodPurposeEnumId="Sales" periodLength="3" lengthUomId="TF_mon"/>
13641367
<mantle.party.time.TimePeriodType description="Sales Month" timePeriodTypeId="SalesMonth"
1365-
periodPurposeEnumId="Sales" periodLength="1" lengthUomId="TF_mon"/>
1368+
parentPeriodTypeId="SalesQuarter" periodPurposeEnumId="Sales" periodLength="1" lengthUomId="TF_mon"/>
13661369

13671370
<mantle.party.time.TimePeriodType description="Tax Year" timePeriodTypeId="TaxYear"
13681371
periodPurposeEnumId="Tax" periodLength="1" lengthUomId="TF_yr"/>
13691372
<mantle.party.time.TimePeriodType description="Tax Quarter" timePeriodTypeId="TaxQuarter"
1370-
periodPurposeEnumId="Tax" periodLength="3" lengthUomId="TF_mon"/>
1373+
parentPeriodTypeId="TaxYear" periodPurposeEnumId="Tax" periodLength="3" lengthUomId="TF_mon"/>
13711374
<mantle.party.time.TimePeriodType description="Tax Month" timePeriodTypeId="TaxMonth"
1372-
periodPurposeEnumId="Tax" periodLength="1" lengthUomId="TF_mon"/>
1375+
parentPeriodTypeId="TaxQuarter" periodPurposeEnumId="Tax" periodLength="1" lengthUomId="TF_mon"/>
13731376
</seed-data>
13741377
</entity>
13751378
</entities>

‎entity/ProductAssetEntities.xml‎

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -311,22 +311,24 @@ along with this software (see the LICENSE.md file). If not, see
311311
<field name="assetIssuanceId" type="id"/>
312312
<field name="assetReceiptId" type="id"/>
313313
<field name="physicalInventoryId" type="id"/>
314+
<field name="physicalInventoryCountId" type="id"/>
314315
<field name="varianceReasonEnumId" type="id"/>
315316
<field name="description" type="text-medium"/>
316317
<field name="acctgTransResultEnumId" type="id" create-only="false"/>
317-
<relationship type="one" related="mantle.product.asset.Asset"/>
318-
<relationship type="one-nofk" related="mantle.product.issuance.AssetReservation"/><!-- no FK for when record is deleted -->
319-
<relationship type="one" related="mantle.shipment.Shipment"/>
320-
<relationship type="one" related="mantle.product.Product"/>
321-
<relationship type="one" related="mantle.order.return.ReturnItem"/>
322-
<relationship type="one" related="mantle.work.effort.WorkEffort"/>
323-
<relationship type="one" related="mantle.product.maintenance.AssetMaintenance"/>
324-
<relationship type="one" related="mantle.product.issuance.AssetIssuance"/>
325-
<relationship type="one" related="mantle.product.receipt.AssetReceipt"/>
326-
<relationship type="one" related="mantle.product.asset.PhysicalInventory"/>
327-
<relationship type="one" title="InventoryVarianceReason" related="moqui.basic.Enumeration">
318+
<relationship type="one" related="mantle.product.asset.Asset" short-alias="asset"/>
319+
<relationship type="one-nofk" related="mantle.product.issuance.AssetReservation" short-alias="assetReservation"/><!-- no FK for when record is deleted -->
320+
<relationship type="one" related="mantle.shipment.Shipment" short-alias="shipment"/>
321+
<relationship type="one" related="mantle.product.Product" short-alias="product"/>
322+
<relationship type="one" related="mantle.order.return.ReturnItem" short-alias="returnItem"/>
323+
<relationship type="one" related="mantle.work.effort.WorkEffort" short-alias="workEffort"/>
324+
<relationship type="one" related="mantle.product.maintenance.AssetMaintenance" short-alias="assetMaintenance"/>
325+
<relationship type="one" related="mantle.product.issuance.AssetIssuance" short-alias="assetIssuance"/>
326+
<relationship type="one" related="mantle.product.receipt.AssetReceipt" short-alias="assetReceipt"/>
327+
<relationship type="one" related="mantle.product.asset.PhysicalInventory" short-alias="physicalInventory"/>
328+
<relationship type="one" related="mantle.product.asset.PhysicalInventoryCount" short-alias="physicalInventoryCount"/>
329+
<relationship type="one" title="InventoryVarianceReason" related="moqui.basic.Enumeration" short-alias="varianceReasonEnum">
328330
<key-map field-name="varianceReasonEnumId"/></relationship>
329-
<relationship type="one" title="AcctgTransResult" related="moqui.basic.Enumeration">
331+
<relationship type="one" title="AcctgTransResult" related="moqui.basic.Enumeration" short-alias="acctgTransResultEnum">
330332
<key-map field-name="acctgTransResultEnumId"/></relationship>
331333
<seed-data>
332334
<!-- Inventory Variance Reason -->
@@ -465,6 +467,20 @@ along with this software (see the LICENSE.md file). If not, see
465467
<field name="physicalInventoryDate" type="date-time"/>
466468
<field name="partyId" type="id"/>
467469
<field name="comments" type="text-long"/>
470+
<relationship type="one" related="mantle.party.Party" short-alias="party"/>
471+
</entity>
472+
<entity entity-name="PhysicalInventoryCount" package="mantle.product.asset" cache="never">
473+
<field name="physicalInventoryCountId" type="id" is-pk="true"/>
474+
<field name="physicalInventoryId" type="id"/>
475+
<field name="facilityId" type="id"/>
476+
<field name="locationSeqId" type="id"/>
477+
<field name="productId" type="id"/>
478+
<field name="countDate" type="date-time"/>
479+
<field name="quantityOnHand" type="number-decimal"/>
480+
<field name="comments" type="text-medium"/>
481+
<relationship type="one" related="mantle.facility.Facility" short-alias="facility"/>
482+
<relationship type="one-nofk" related="mantle.facility.FacilityLocation" short-alias="facilityLocation"/>
483+
<relationship type="one" related="mantle.product.Product" short-alias="product"/>
468484
</entity>
469485

470486
<!-- ========================================================= -->

‎entity/ProductDefinitionEntities.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ along with this software (see the LICENSE.md file). If not, see
8383
<!-- explicit many relationship, used in MantleProduct DataDocument -->
8484
<relationship type="many" related="mantle.product.ProductAssoc" short-alias="assocs">
8585
<key-map field-name="productId"/></relationship>
86-
<relationship type="many" related="mantle.product.ProductAssoc" short-alias="toAssocs">
86+
<relationship type="many" title="To" related="mantle.product.ProductAssoc" short-alias="toAssocs">
8787
<key-map field-name="productId" related="toProductId"/></relationship>
8888
<relationship type="many" related="mantle.product.ProductContent" short-alias="contents">
8989
<key-map field-name="productId"/></relationship>

0 commit comments

Comments
 (0)