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

[hansbak-2]

Author: hansbak
Date: Wed Sep 28 07:42:33 2011
New Revision: 1176765

URL: http://svn.apache.org/viewvc?rev=1176765&view=rev
Log:
reverting r1176764: wrong change

Modified:
    ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
    ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml?rev=1176765&r1=1176764&r2=1176765&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml Wed Sep 28 07:42:33 2011
@@ -92,19 +92,8 @@ 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 entity-alias="IISS" name="itemIssuanceId"/>
-        <alias entity-alias="IISS" name="orderId"/>
-        <alias entity-alias="IISS" name="orderItemSeqId"/>
-        <alias entity-alias="IISS" name="shipGroupSeqId"/>
-        <alias entity-alias="IISS" name="inventoryItemId"/>
-        <alias entity-alias="IISS" name="shipmentId"/>
-        <alias entity-alias="IISS" name="shipmentItemSeqId"/>
-        <alias entity-alias="IISS" name="fixedAssetId"/>
-        <alias entity-alias="IISS" name="maintHistSeqId"/>
-        <alias entity-alias="IISS" name="issuedDateTime"/>
-        <alias entity-alias="IISS" name="issuedByUserLoginId"/>
-        <alias entity-alias="IISS" name="quantity"/>
-        <alias entity-alias="IISS" name="cancelQuantity"/>
+        <alias-all entity-alias="IISS"/>
+        <alias entity-alias="IITM" name="inventoryItemId"/>
         <alias entity-alias="IITM" name="inventoryItemTypeId"/>
         <alias entity-alias="IITM" name="productId"/>
         <alias entity-alias="IITM" name="partyId"/>

Modified: ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml?rev=1176765&r1=1176764&r2=1176765&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml Wed Sep 28 07:42:33 2011
@@ -113,20 +113,10 @@
         <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 entity-alias="IMIE" name="itemIssuanceId"/>
-        <alias entity-alias="IMIE" name="orderId"/>
-        <alias entity-alias="IMIE" name="orderItemSeqId"/>
-        <alias entity-alias="IMIE" name="shipGroupSeqId"/>
-        <alias entity-alias="IMIE" name="inventoryItemId"/>
-        <alias entity-alias="IMIE" name="shipmentId"/>
-        <alias entity-alias="IMIE" name="shipmentItemSeqId"/>
-        <alias entity-alias="IMIE" name="fixedAssetId"/>
-        <alias entity-alias="IMIE" name="maintHistSeqId"/>
-        <alias entity-alias="IMIE" name="issuedDateTime"/>
-        <alias entity-alias="IMIE" name="issuedByUserLoginId"/>
-        <alias entity-alias="IMIE" name="quantity"/>
-        <alias entity-alias="IMIE" name="cancelQuantity"/>
+        <alias-all entity-alias="IMIE"/>
+        <alias entity-alias="IYIM" name="inventoryItemId"/>
         <alias entity-alias="IYIM" name="inventoryItemTypeId"/>
+        <alias entity-alias="IYIM" name="productId"/>
         <alias entity-alias="IYIM" name="partyId"/>
         <alias entity-alias="IYIM" name="ownerPartyId"/>
         <alias entity-alias="IYIM" name="statusId"/>
@@ -186,23 +176,9 @@
         <member-entity entity-alias="IYIM" entity-name="InventoryItem"/>
         <member-entity entity-alias="IMIE" entity-name="ItemIssuance"/>
         <alias-all entity-alias="IMIE"/>
-        <alias entity-alias="PT" name="productId"/>
-        <alias entity-alias="PT" name="productTypeId"/>
-        <alias entity-alias="PT" name="primaryProductCategoryId"/>
-        <alias entity-alias="PT" name="manufacturerPartyId"/>
-        <alias entity-alias="PT" name="facilityId"/>
-        <alias entity-alias="PT" name="introductionDate"/>
-        <alias entity-alias="PT" name="internalName"/>
-        <alias entity-alias="PT" name="description"/>
-        <alias entity-alias="PT" name="requireInventory"/>
-        <alias entity-alias="PT" name="taxable"/>
-        <alias entity-alias="PT" name="chargeShipping"/>
-        <alias entity-alias="PT" name="isVirtual"/>
-        <alias entity-alias="PT" name="isVariant"/>
-        <alias entity-alias="PT" name="createdDate"/>
-        <alias entity-alias="PT" name="createdByUserLogin"/>
         <alias entity-alias="IYIM" name="inventoryItemId"/>
         <alias entity-alias="IYIM" name="inventoryItemTypeId"/>
+        <alias entity-alias="IYIM" name="productId"/>
         <alias entity-alias="IYIM" name="partyId"/>
         <alias entity-alias="IYIM" name="ownerPartyId"/>
         <alias entity-alias="IYIM" name="statusId"/>
@@ -227,6 +203,21 @@
         <alias entity-alias="IYIM" name="unitCost"/>
         <alias entity-alias="IYIM" name="currencyUomId"/>
         <alias entity-alias="IYIM" name="inventoryItemFixedAssetId" field="fixedAssetId"/>
+        <alias entity-alias="PT" name="productId"/>
+        <alias entity-alias="PT" name="productTypeId"/>
+        <alias entity-alias="PT" name="primaryProductCategoryId"/>
+        <alias entity-alias="PT" name="manufacturerPartyId"/>
+        <alias entity-alias="PT" name="facilityId"/>
+        <alias entity-alias="PT" name="introductionDate"/>
+        <alias entity-alias="PT" name="internalName"/>
+        <alias entity-alias="PT" name="description"/>
+        <alias entity-alias="PT" name="requireInventory"/>
+        <alias entity-alias="PT" name="taxable"/>
+        <alias entity-alias="PT" name="chargeShipping"/>
+        <alias entity-alias="PT" name="isVirtual"/>
+        <alias entity-alias="PT" name="isVariant"/>
+        <alias entity-alias="PT" name="createdDate"/>
+        <alias entity-alias="PT" name="createdByUserLogin"/>
         <view-link entity-alias="PT" rel-entity-alias="IYIM">
             <key-map field-name="productId"/>
         </view-link>