svn commit: r1176227 - in /ofbiz/trunk: applications/accounting/entitydef/entitymodel.xml applications/product/entitydef/entitymodel.xml applications/product/entitydef/entitymodel_shipment.xml specialpurpose/assetmaint/entitydef/entitymodel.xml

[hansbak-2]

Author: hansbak
Date: Tue Sep 27 06:28:16 2011
New Revision: 1176227

URL: http://svn.apache.org/viewvc?rev=1176227&view=rev
Log:
correction on commit for rev: 1176145

Modified:
    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.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?rev=1176227&r1=1176226&r2=1176227&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Tue Sep 27 06:28:16 2011
@@ -4073,8 +4073,8 @@ under the License.
     <!-- Extend Entity Inventory Item for relation Fix Asset -->
     <extend-entity entity-name="InventoryItem">
         <field name="fixedAssetId" type="id"></field>
-        <relation type="one" fk-name="FIXED_ASSET" title="FixedAsset" rel-entity-name="InventoryItem">
-            <key-map field-name="fixedAssetId" rel-field-name="inventoryItemId"/>
+        <relation type="one" fk-name="IYIM_FAST" title="FixedAsset" rel-entity-name="FixedAsset">
+            <key-map field-name="fixedAssetId"/>
         </relation>
     </extend-entity>
 </entitymodel>

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=1176227&r1=1176226&r2=1176227&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Tue Sep 27 06:28:16 2011
@@ -1976,11 +1976,27 @@ under the License.
         <member-entity entity-alias="II" entity-name="InventoryItem"/>
         <member-entity entity-alias="IID" entity-name="InventoryItemDetail"/>
         <alias-all entity-alias="II"/>
-        <alias-all entity-alias="IID">
-            <exclude field="unitCost"/>
-            <exclude field="fixedAssetId"/>
-        </alias-all>
+        <alias name="inventoryItemId" entity-alias="IID"/>
+        <alias name="inventoryItemDetailSeqId" entity-alias="IID"/>
+        <alias name="effectiveDate" entity-alias="IID"/>
+        <alias name="quantityOnHandDiff" entity-alias="IID"/>
+        <alias name="availableToPromiseDiff" entity-alias="IID"/>
+        <alias name="accountingQuantityDiff" entity-alias="IID"/>
+        <alias name="orderId" entity-alias="IID"/>
+        <alias name="orderItemSeqId" entity-alias="IID"/>
+        <alias name="shipGroupSeqId" entity-alias="IID"/>
+        <alias name="shipmentId" entity-alias="IID"/>
+        <alias name="shipmentItemSeqId" entity-alias="IID"/>
+        <alias name="returnId" entity-alias="IID"/>
+        <alias name="returnItemSeqId" entity-alias="IID"/>
+        <alias name="workEffortId" entity-alias="IID"/>
         <alias name="inventoryItemDetailFixedAssetId" field="fixedAssetId" entity-alias="IID"/>
+        <alias name="maintHistSeqId" entity-alias="IID"/>
+        <alias name="itemIssuanceId" entity-alias="IID"/>
+        <alias name="receiptId" entity-alias="IID"/>
+        <alias name="physicalInventoryId" entity-alias="IID"/>
+        <alias name="reasonEnumId" entity-alias="IID"/>
+        <alias name="description" entity-alias="IID"/>
         <view-link entity-alias="II" rel-entity-alias="IID">
             <key-map field-name="inventoryItemId"/>
         </view-link>

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml?rev=1176227&r1=1176226&r2=1176227&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml Tue Sep 27 06:28:16 2011
@@ -92,13 +92,22 @@ under the License.
     <view-entity entity-name="ItemIssuanceAndInventoryItem" package-name="org.ofbiz.shipment.issuance">
         <member-entity entity-alias="IISS" entity-name="ItemIssuance"/>
         <member-entity entity-alias="IITM" entity-name="InventoryItem"/>
-        <alias-all entity-alias="IISS">
-            <exclude field="fixedAssetId"/>
-        </alias-all>
         <alias-all entity-alias="IITM"/>
-        <alias name="inventoryItemDetailFixedAssetId" field="fixedAssetId" entity-alias="IISS"/>
+        <alias name="itemIssuanceId" entity-alias="IISS"/>
+        <alias name="orderId" entity-alias="IISS"/>
+        <alias name="orderItemSeqId" entity-alias="IISS"/>
+        <alias name="shipGroupSeqId" entity-alias="IISS"/>
+        <alias name="inventoryItemId" entity-alias="IISS"/>
+        <alias name="shipmentId" entity-alias="IISS"/>
+        <alias name="shipmentItemSeqId" entity-alias="IISS"/>
+        <alias name="itemIssuanceFixedAssetId" field="fixedAssetId" entity-alias="IISS"/>
+        <alias name="maintHistSeqId" entity-alias="IISS"/>
+        <alias name="issuedDateTime" entity-alias="IISS"/>
+        <alias name="issuedByUserLoginId" entity-alias="IISS"/>
+        <alias name="quantity" entity-alias="IISS"/>
+        <alias name="cancelQuantity" entity-alias="IISS"/>
         <view-link entity-alias="IISS" rel-entity-alias="IITM">
-        <key-map field-name="inventoryItemId"/>
+          <key-map field-name="inventoryItemId"/>
         </view-link>
     </view-entity>
     <entity entity-name="ItemIssuanceRole"

Modified: ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml?rev=1176227&r1=1176226&r2=1176227&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml Tue Sep 27 06:28:16 2011
@@ -113,9 +113,6 @@
         <member-entity entity-alias="IMIE" entity-name="ItemIssuance"/>
         <member-entity entity-alias="IYIM" entity-name="InventoryItem"/>
         <member-entity entity-alias="PT" entity-name="Product"/>
-        <alias-all entity-alias="IMIE">
-            <exclude field="fixedAssetId"/>
-        </alias-all>
         <alias-all entity-alias="IYIM">
             <exclude field="facilityId"/>
         </alias-all>
@@ -134,7 +131,19 @@
         <alias entity-alias="PT" name="isVariant"/>
         <alias entity-alias="PT" name="createdDate"/>
         <alias entity-alias="PT" name="createdByUserLogin"/>
-        <alias name="inventoryItemDetailFixedAssetId" field="fixedAssetId" entity-alias="IMIE"/>
+        <alias name="itemIssuanceId" entity-alias="IMIE"/>
+        <alias name="orderId" entity-alias="IMIE"/>
+        <alias name="orderItemSeqId" entity-alias="IMIE"/>
+        <alias name="shipGroupSeqId" entity-alias="IMIE"/>
+        <alias name="inventoryItemId" entity-alias="IMIE"/>
+        <alias name="shipmentId" entity-alias="IMIE"/>
+        <alias name="shipmentItemSeqId" entity-alias="IMIE"/>
+        <alias name="itemIssuanceFixedAssetId" field="fixedAssetId" entity-alias="IMIE"/>
+        <alias name="maintHistSeqId" entity-alias="IMIE"/>
+        <alias name="issuedDateTime" entity-alias="IMIE"/>
+        <alias name="issuedByUserLoginId" entity-alias="IMIE"/>
+        <alias name="quantity" entity-alias="IMIE"/>
+        <alias name="cancelQuantity" entity-alias="IMIE"/>
         <view-link entity-alias="IMIE" rel-entity-alias="IYIM">
             <key-map field-name="inventoryItemId"/>
         </view-link>