svn commit: r814793 - in /ofbiz/branches/release09.04: ./ applications/order/entitydef/entitymodel.xml

Author: jleroux
Date: Mon Sep 14 19:25:48 2009
New Revision: 814793

URL: http://svn.apache.org/viewvc?rev=814793&view=rev
Log:
"Applied fix from trunk for revision: 778273 "
------------------------------------------------------------------------
r778273 | jonesde | 2009-05-25 06:01:58 +0200 (lun. 25 mai 2009) | 1 ligne

Added new OrderProductPromoCode entity to keep track of promo codes enetered so that can be used again when promotions are calculated when an order is changed; also moved OrderContent and OrderContentType entities to be in alpha order
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/order/entitydef/entitymodel.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 19:25:48 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
 836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810
 832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731

Modified: ofbiz/branches/release09.04/applications/order/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/entitydef/entitymodel.xml?rev=814793&r1=814792&r2=814793&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/order/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release09.04/applications/order/entitydef/entitymodel.xml Mon Sep 14 19:25:48 2009
@@ -293,6 +293,39 @@
         <key-map field-name="contactMechPurposeTypeId"/>
       </relation>
     </entity>
+    <entity entity-name="OrderContent" package-name="org.ofbiz.order.order" title="Order Data Object Entity">
+        <field name="orderId" type="id-ne"></field>
+        <field name="orderItemSeqId" type="id-ne"></field>
+        <field name="contentId" type="id-ne"></field>
+        <field name="orderContentTypeId" type="id-ne"></field>
+        <field name="fromDate" type="date-time"></field>
+        <field name="thruDate" type="date-time"></field>
+        <prim-key field="contentId"/>
+        <prim-key field="orderId"/>
+        <prim-key field="orderItemSeqId"/>
+        <prim-key field="orderContentTypeId"/>
+        <prim-key field="fromDate"/>
+        <relation type="one" fk-name="ORD_CNT_PROD" rel-entity-name="OrderHeader">
+            <key-map field-name="orderId"/>
+        </relation>
+        <relation type="one" fk-name="ORD_CNT_CNT" rel-entity-name="Content">
+            <key-map field-name="contentId"/>
+        </relation>
+        <relation type="one" fk-name="ORD_CNT_TYPE" rel-entity-name="OrderContentType">
+            <key-map field-name="orderContentTypeId"/>
+        </relation>
+    </entity>
+    <entity entity-name="OrderContentType" package-name="org.ofbiz.order.order" default-resource-name="OrderEntityLabels"
+        title="Order Content Type Entity">
+        <field name="orderContentTypeId" type="id-ne"></field>
+        <field name="parentTypeId" type="id"></field>
+        <field name="hasTable" type="indicator"></field>
+        <field name="description" type="description"></field>
+        <prim-key field="orderContentTypeId"/>
+        <relation type="one" fk-name="ORDCT_TYP_PARENT" title="Parent" rel-entity-name="OrderContentType">
+            <key-map field-name="parentTypeId" rel-field-name="orderContentTypeId"/>
+        </relation>
+    </entity>
     <entity entity-name="OrderDeliverySchedule"
             package-name="org.ofbiz.order.order"
             never-cache="true"
@@ -1047,6 +1080,18 @@
         <index-field name="needsNsfRetry"/>
       </index>
     </entity>
+    <entity entity-name="OrderProductPromoCode" package-name="org.ofbiz.order.order" title="Order Product Promo Code Entity">
+        <field name="orderId" type="id-ne"></field>
+        <field name="productPromoCodeId" type="id-ne"></field>
+        <prim-key field="orderId"/>
+        <prim-key field="productPromoCodeId"/>
+        <relation type="one" fk-name="ORDER_PPCD_ORD" rel-entity-name="OrderHeader">
+            <key-map field-name="orderId"/>
+        </relation>
+        <relation type="one" fk-name="ORDER_PPCD_PPC" rel-entity-name="ProductPromoCode">
+            <key-map field-name="productPromoCodeId"/>
+        </relation>
+    </entity>
     <entity entity-name="OrderRole"
             package-name="org.ofbiz.order.order"
             never-cache="true"
@@ -1257,43 +1302,6 @@
         <key-map field-name="engagementItemSeqId" rel-field-name="orderItemSeqId"/>
       </relation>
     </entity>
-    <entity entity-name="OrderContent"
-            package-name="org.ofbiz.order.order"
-            title="Order Data Object Entity">
-      <field name="orderId" type="id-ne"></field>
-      <field name="orderItemSeqId" type="id-ne"></field>
-      <field name="contentId" type="id-ne"></field>
-      <field name="orderContentTypeId" type="id-ne"></field>
-      <field name="fromDate" type="date-time"></field>
-      <field name="thruDate" type="date-time"></field>
-      <prim-key field="contentId"/>
-      <prim-key field="orderId"/>
-      <prim-key field="orderItemSeqId"/>
-      <prim-key field="orderContentTypeId"/>
-      <prim-key field="fromDate"/>
-      <relation type="one" fk-name="ORD_CNT_PROD" rel-entity-name="OrderHeader">
-        <key-map field-name="orderId"/>
-      </relation>
-      <relation type="one" fk-name="ORD_CNT_CNT" rel-entity-name="Content">
-        <key-map field-name="contentId"/>
-      </relation>
-      <relation type="one" fk-name="ORD_CNT_TYPE" rel-entity-name="OrderContentType">
-        <key-map field-name="orderContentTypeId"/>
-      </relation>
-    </entity>
-    <entity entity-name="OrderContentType"
-            package-name="org.ofbiz.order.order"
-            default-resource-name="OrderEntityLabels"
-            title="Order Content Type Entity">
-      <field name="orderContentTypeId" type="id-ne"></field>
-      <field name="parentTypeId" type="id"></field>
-      <field name="hasTable" type="indicator"></field>
-      <field name="description" type="description"></field>
-      <prim-key field="orderContentTypeId"/>
-      <relation type="one" fk-name="ORDCT_TYP_PARENT" title="Parent" rel-entity-name="OrderContentType">
-        <key-map field-name="parentTypeId" rel-field-name="orderContentTypeId"/>
-      </relation>
-    </entity>
     <entity entity-name="WorkOrderItemFulfillment"
             package-name="org.ofbiz.order.order"
             title="Work Order Item Fulfillment Entity">