You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2007/01/29 04:49:06 UTC
svn commit: r500933 - in /ofbiz/trunk:
applications/accounting/entitydef/entitymodel.xml
specialpurpose/assetmaint/entitydef/entitymodel.xml
Author: lektran
Date: Sun Jan 28 19:49:05 2007
New Revision: 500933
URL: http://svn.apache.org/viewvc?view=rev&rev=500933
Log:
Applied patch from Anil K Patel (OFBIZ-662), fixes Asset Maintenance entity warnings on startup
Modified:
ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml
Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?view=diff&rev=500933&r1=500932&r2=500933
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Sun Jan 28 19:49:05 2007
@@ -657,7 +657,7 @@
<prim-key field="maintHistSeqId"/>
<prim-key field="orderId"/>
<prim-key field="orderItemSeqId"/>
- <relation type="one" fk-name="FXDASTMNT_ORD_FXAST" rel-entity-name="FixedAsset">
+ <relation type="one" fk-name="FXDASTMNT_ORD_FXAS" rel-entity-name="FixedAsset">
<key-map field-name="fixedAssetId"/>
</relation>
<relation type="one" fk-name="FXDASTMNT_ORD" rel-entity-name="OrderHeader">
Modified: ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml?view=diff&rev=500933&r1=500932&r2=500933
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml Sun Jan 28 19:49:05 2007
@@ -50,7 +50,9 @@
<member-entity entity-alias="FAM" entity-name="FixedAssetMaint"/>
<member-entity entity-alias="WE" entity-name="WorkEffort"/>
<alias-all entity-alias="FAM"/>
- <alias-all entity-alias="WE"/>
+ <alias-all entity-alias="WE">
+ <exclude field="fixedAssetId"/>
+ </alias-all>
<view-link entity-alias="FAM" rel-entity-alias="WE">
<key-map field-name="scheduleWorkEffortId" rel-field-name="workEffortId"/>
</view-link>
@@ -71,7 +73,9 @@
<member-entity entity-alias="WE" entity-name="WorkEffort"/>
<member-entity entity-alias="WEPA" entity-name="WorkEffortPartyAssignment"/>
<alias-all entity-alias="FAM"/>
- <alias-all entity-alias="WE"/>
+ <alias-all entity-alias="WE">
+ <exclude field="fixedAssetId"/>
+ </alias-all>
<alias entity-alias="WEPA" name="workEffortId"/>
<alias entity-alias="WEPA" name="partyId"/>
<alias entity-alias="WEPA" name="roleTypeId"/>
@@ -83,7 +87,7 @@
<view-link entity-alias="WE" rel-entity-alias="WEPA">
<key-map field-name="workEffortId"/>
</view-link>
- <relation type="one" rel-entity-name="FixedAssetMaint">
+ <relation type="one" rel-entity-name="WorkEffort">
<key-map field-name="scheduleWorkEffortId" rel-field-name="workEffortId"/>
</relation>
<relation type="many" rel-entity-name="WorkEffortPartyAssignment">
@@ -97,7 +101,9 @@
<member-entity entity-alias="WE" entity-name="WorkEffort"/>
<member-entity entity-alias="TE" entity-name="TimeEntry"/>
<alias-all entity-alias="FAM"/>
- <alias-all entity-alias="WE"/>
+ <alias-all entity-alias="WE">
+ <exclude field="fixedAssetId"/>
+ </alias-all>
<alias-all entity-alias="TE"/>
<view-link entity-alias="FAM" rel-entity-alias="WE">
<key-map field-name="scheduleWorkEffortId" rel-field-name="workEffortId"/>
@@ -105,7 +111,7 @@
<view-link entity-alias="WE" rel-entity-alias="TE">
<key-map field-name="workEffortId"/>
</view-link>
- <relation type="one" rel-entity-name="FixedAssetMaint">
+ <relation type="one" rel-entity-name="WorkEffort">
<key-map field-name="scheduleWorkEffortId" rel-field-name="workEffortId"/>
</relation>
<relation type="many" rel-entity-name="TimeEntry">
@@ -119,7 +125,9 @@
<member-entity entity-alias="IYIM" entity-name="InventoryItem"/>
<member-entity entity-alias="PT" entity-name="Product"/>
<alias-all entity-alias="IMIE"/>
- <alias-all entity-alias="IYIM"/>
+ <alias-all entity-alias="IYIM">
+ <exclude field="facilityId"/>
+ </alias-all>
<alias entity-alias="PT" name="productId"/>
<alias entity-alias="PT" name="productTypeId"/>
<alias entity-alias="PT" name="primaryProductCategoryId"/>
@@ -131,7 +139,6 @@
<alias entity-alias="PT" name="requireInventory"/>
<alias entity-alias="PT" name="taxable"/>
<alias entity-alias="PT" name="chargeShipping"/>
- <alias entity-alias="PT" name="taxable"/>
<alias entity-alias="PT" name="isVirtual"/>
<alias entity-alias="PT" name="isVariant"/>
<alias entity-alias="PT" name="createdDate"/>
@@ -156,7 +163,9 @@
<member-entity entity-alias="IYIM" entity-name="InventoryItem"/>
<member-entity entity-alias="IMIE" entity-name="ItemIssuance"/>
<alias-all entity-alias="IMIE"/>
- <alias-all entity-alias="IYIM"/>
+ <alias-all entity-alias="IYIM">
+ <exclude field="facilityId"/>
+ </alias-all>
<alias entity-alias="PT" name="productId"/>
<alias entity-alias="PT" name="productTypeId"/>
<alias entity-alias="PT" name="primaryProductCategoryId"/>
@@ -168,7 +177,6 @@
<alias entity-alias="PT" name="requireInventory"/>
<alias entity-alias="PT" name="taxable"/>
<alias entity-alias="PT" name="chargeShipping"/>
- <alias entity-alias="PT" name="taxable"/>
<alias entity-alias="PT" name="isVirtual"/>
<alias entity-alias="PT" name="isVariant"/>
<alias entity-alias="PT" name="createdDate"/>