svn commit: r1809376 - in /ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef: accounting-entitymodel.xml product-entitymodel.xml

[Deepak Dixit-5]

Author: deepak
Date: Sat Sep 23 08:29:21 2017
New Revision: 1809376

URL: http://svn.apache.org/viewvc?rev=1809376&view=rev
Log:
Improved: Merge extended entity definition in data model component into the existing entity definition (OFBIZ-9581)

Thanks Aditya Sharma for your contribution.

Modified:
    ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml?rev=1809376&r1=1809375&r2=1809376&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/accounting-entitymodel.xml Sat Sep 23 08:29:21 2017
@@ -4003,6 +4003,7 @@ under the License.
         <field name="fromDate" type="date-time"></field>
         <field name="thruDate" type="date-time"></field>
         <field name="description" type="description"></field>
+        <field name="isTaxInShippingPrice" type="indicator"></field>
         <prim-key field="taxAuthorityRateSeqId"/>
         <relation type="one" fk-name="TAXAUTHRTEP_TXA" rel-entity-name="TaxAuthority">
             <key-map field-name="taxAuthGeoId"/>
@@ -4290,15 +4291,4 @@ under the License.
             <key-map field-name="finAccountId"/>
         </view-link>
     </view-entity>
-    
-    <!-- Extend Entity Inventory Item for relation Fix Asset -->
-    <extend-entity entity-name="InventoryItem">
-        <field name="fixedAssetId" type="id"></field>
-        <relation type="one" fk-name="IYIM_FAST" title="FixedAsset" rel-entity-name="FixedAsset">
-            <key-map field-name="fixedAssetId"/>
-        </relation>
-    </extend-entity>
-    <extend-entity entity-name="TaxAuthorityRateProduct">
-        <field name="isTaxInShippingPrice" type="indicator"></field>
-    </extend-entity>
 </entitymodel>

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml?rev=1809376&r1=1809375&r2=1809376&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/product-entitymodel.xml Sat Sep 23 08:29:21 2017
@@ -1883,6 +1883,7 @@ under the License.
       <field name="activationValidThru" type="date-time"></field>
       <field name="unitCost" type="fixed-point"><description>Higher precision in case it is a calculated number</description></field>
       <field name="currencyUomId" type="id"><description>The currency Uom of the unit cost.</description></field>
+      <field name="fixedAssetId" type="id"></field>
       <prim-key field="inventoryItemId"/>
       <relation type="one" fk-name="INV_ITEM_TYPE" rel-entity-name="InventoryItemType">
         <key-map field-name="inventoryItemTypeId"/>
@@ -1930,6 +1931,9 @@ under the License.
       <relation type="one" fk-name="INV_ITEM_CUOM" title="Currency" rel-entity-name="Uom">
         <key-map field-name="currencyUomId" rel-field-name="uomId"/>
       </relation>
+      <relation type="one" fk-name="IYIM_FAST" title="FixedAsset" rel-entity-name="FixedAsset">
+        <key-map field-name="fixedAssetId"/>
+      </relation>
       <index name="INVITEM_SOFID" unique="true">
         <index-field name="softIdentifier"/>
       </index>