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

[hansbak-2]

Author: hansbak
Date: Tue Sep 27 09:13:54 2011
New Revision: 1176292

URL: http://svn.apache.org/viewvc?rev=1176292&view=rev
Log:
changed view diffinitions wrong, new field fixedAssetId in inventoryItem should be renamed in this case. corrected

Modified:
    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/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=1176292&r1=1176291&r2=1176292&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Tue Sep 27 09:13:54 2011
@@ -1975,28 +1975,34 @@ under the License.
     <view-entity entity-name="InventoryItemAndDetail" package-name="org.ofbiz.product.inventory">
         <member-entity entity-alias="II" entity-name="InventoryItem"/>
         <member-entity entity-alias="IID" entity-name="InventoryItemDetail"/>
-        <alias-all entity-alias="II"/>
-        <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"/>
+        <alias-all entity-alias="IID"/>
+        <alias entity-alias="II" name="inventoryItemId"/>
+        <alias entity-alias="II" name="inventoryItemTypeId"/>
+        <alias entity-alias="II" name="productId"/>
+        <alias entity-alias="II" name="partyId"/>
+        <alias entity-alias="II" name="ownerPartyId"/>
+        <alias entity-alias="II" name="statusId"/>
+        <alias entity-alias="II" name="datetimeReceived"/>
+        <alias entity-alias="II" name="datetimeManufactured"/>
+        <alias entity-alias="II" name="expireDate"/>
+        <alias entity-alias="II" name="facilityId"/>
+        <alias entity-alias="II" name="containerId"/>
+        <alias entity-alias="II" name="lotId"/>
+        <alias entity-alias="II" name="uomId"/>
+        <alias entity-alias="II" name="binNumber"/>
+        <alias entity-alias="II" name="locationSeqId"/>
+        <alias entity-alias="II" name="comments"/>
+        <alias entity-alias="II" name="quantityOnHandTotal"/>
+        <alias entity-alias="II" name="availableToPromiseTotal"/>
+        <alias entity-alias="II" name="accountingQuantityTotal"/>
+        <alias entity-alias="II" name="oldQuantityOnHand"/>
+        <alias entity-alias="II" name="oldAvailableToPromise"/>
+        <alias entity-alias="II" name="serialNumber"/>
+        <alias entity-alias="II" name="softIdentifier"/>
+        <alias entity-alias="II" name="activationNumber"/>
+        <alias entity-alias="II" name="activationValidThru"/>
+        <alias entity-alias="II" name="currencyUomId"/>
+        <alias entity-alias="II" name="inventoryItemFixedAssetId" field="fixedAssetId"/>
         <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=1176292&r1=1176291&r2=1176292&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml Tue Sep 27 09:13:54 2011
@@ -92,20 +92,35 @@ 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="IITM"/>
-        <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"/>
+        <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"/>
+        <alias entity-alias="IITM" name="ownerPartyId"/>
+        <alias entity-alias="IITM" name="statusId"/>
+        <alias entity-alias="IITM" name="datetimeReceived"/>
+        <alias entity-alias="IITM" name="datetimeManufactured"/>
+        <alias entity-alias="IITM" name="expireDate"/>
+        <alias entity-alias="IITM" name="facilityId"/>
+        <alias entity-alias="IITM" name="containerId"/>
+        <alias entity-alias="IITM" name="lotId"/>
+        <alias entity-alias="IITM" name="uomId"/>
+        <alias entity-alias="IITM" name="binNumber"/>
+        <alias entity-alias="IITM" name="locationSeqId"/>
+        <alias entity-alias="IITM" name="comments"/>
+        <alias entity-alias="IITM" name="quantityOnHandTotal"/>
+        <alias entity-alias="IITM" name="availableToPromiseTotal"/>
+        <alias entity-alias="IITM" name="accountingQuantityTotal"/>
+        <alias entity-alias="IITM" name="oldQuantityOnHand"/>
+        <alias entity-alias="IITM" name="oldAvailableToPromise"/>
+        <alias entity-alias="IITM" name="serialNumber"/>
+        <alias entity-alias="IITM" name="softIdentifier"/>
+        <alias entity-alias="IITM" name="activationNumber"/>
+        <alias entity-alias="IITM" name="activationValidThru"/>
+        <alias entity-alias="IITM" name="unitCost"/>
+        <alias entity-alias="IITM" name="currencyUomId"/>
+        <alias entity-alias="IITM" name="inventoryItemFixedAssetId" field="fixedAssetId"/>
         <view-link entity-alias="IISS" rel-entity-alias="IITM">
           <key-map field-name="inventoryItemId"/>
         </view-link>

Modified: ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml?rev=1176292&r1=1176291&r2=1176292&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/entitydef/entitymodel.xml Tue Sep 27 09:13:54 2011
@@ -113,9 +113,34 @@
         <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="IYIM">
-            <exclude field="facilityId"/>
-        </alias-all>
+        <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"/>
+        <alias entity-alias="IYIM" name="datetimeReceived"/>
+        <alias entity-alias="IYIM" name="datetimeManufactured"/>
+        <alias entity-alias="IYIM" name="expireDate"/>
+        <alias entity-alias="IYIM" name="containerId"/>
+        <alias entity-alias="IYIM" name="lotId"/>
+        <alias entity-alias="IYIM" name="uomId"/>
+        <alias entity-alias="IYIM" name="binNumber"/>
+        <alias entity-alias="IYIM" name="locationSeqId"/>
+        <alias entity-alias="IYIM" name="comments"/>
+        <alias entity-alias="IYIM" name="quantityOnHandTotal"/>
+        <alias entity-alias="IYIM" name="availableToPromiseTotal"/>
+        <alias entity-alias="IYIM" name="accountingQuantityTotal"/>
+        <alias entity-alias="IYIM" name="oldQuantityOnHand"/>
+        <alias entity-alias="IYIM" name="oldAvailableToPromise"/>
+        <alias entity-alias="IYIM" name="serialNumber"/>
+        <alias entity-alias="IYIM" name="softIdentifier"/>
+        <alias entity-alias="IYIM" name="activationNumber"/>
+        <alias entity-alias="IYIM" name="activationValidThru"/>
+        <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"/>
@@ -131,19 +156,6 @@
         <alias entity-alias="PT" name="isVariant"/>
         <alias entity-alias="PT" name="createdDate"/>
         <alias entity-alias="PT" name="createdByUserLogin"/>
-        <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>
@@ -163,12 +175,34 @@
         <member-entity entity-alias="PT" entity-name="Product"/>
         <member-entity entity-alias="IYIM" entity-name="InventoryItem"/>
         <member-entity entity-alias="IMIE" entity-name="ItemIssuance"/>
-        <alias-all entity-alias="IMIE">
-            <exclude field="fixedAssetId"/>
-        </alias-all>
-        <alias-all entity-alias="IYIM">
-            <exclude field="facilityId"/>
-        </alias-all>
+        <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"/>
+        <alias entity-alias="IYIM" name="datetimeReceived"/>
+        <alias entity-alias="IYIM" name="datetimeManufactured"/>
+        <alias entity-alias="IYIM" name="expireDate"/>
+        <alias entity-alias="IYIM" name="containerId"/>
+        <alias entity-alias="IYIM" name="lotId"/>
+        <alias entity-alias="IYIM" name="uomId"/>
+        <alias entity-alias="IYIM" name="binNumber"/>
+        <alias entity-alias="IYIM" name="locationSeqId"/>
+        <alias entity-alias="IYIM" name="comments"/>
+        <alias entity-alias="IYIM" name="quantityOnHandTotal"/>
+        <alias entity-alias="IYIM" name="availableToPromiseTotal"/>
+        <alias entity-alias="IYIM" name="accountingQuantityTotal"/>
+        <alias entity-alias="IYIM" name="oldQuantityOnHand"/>
+        <alias entity-alias="IYIM" name="oldAvailableToPromise"/>
+        <alias entity-alias="IYIM" name="serialNumber"/>
+        <alias entity-alias="IYIM" name="softIdentifier"/>
+        <alias entity-alias="IYIM" name="activationNumber"/>
+        <alias entity-alias="IYIM" name="activationValidThru"/>
+        <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"/>
@@ -184,7 +218,6 @@
         <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"/>
         <view-link entity-alias="PT" rel-entity-alias="IYIM">
             <key-map field-name="productId"/>
         </view-link>