svn commit: r588181 - /ofbiz/trunk/applications/order/entitydef/entitymodel.xml

[jonesde]

Author: jonesde
Date: Thu Oct 25 02:48:53 2007
New Revision: 588181

URL: http://svn.apache.org/viewvc?rev=588181&view=rev
Log:
Added a shipGroupSeqId field to the OrderPaymentPreference to make it possible to tie them to a ship group on the order; this is like the orderItemSeqId field that has been around for a while to tie it to an item, and also fills the gap to be able to associate an order item and ship group combination to a payment preference; also added an orderPaymentPreferenceId to the OrderStatus entity so that this entity can also be used for payment preference status changes; related logic/UI changes will be coming along soon

Modified:
    ofbiz/trunk/applications/order/entitydef/entitymodel.xml

Modified: ofbiz/trunk/applications/order/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel.xml?rev=588181&r1=588180&r2=588181&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel.xml Thu Oct 25 02:48:53 2007
@@ -923,6 +923,7 @@
       <field name="orderPaymentPreferenceId" type="id-ne"></field>
       <field name="orderId" type="id"></field>
       <field name="orderItemSeqId" type="id"></field>
+      <field name="shipGroupSeqId" type="id"></field>
       <field name="productPricePurposeId" type="id"></field>
       <field name="paymentMethodTypeId" type="id"></field>
       <field name="paymentMethodId" type="id"></field>
@@ -953,6 +954,10 @@
         <key-map field-name="orderId"/>
         <key-map field-name="orderItemSeqId"/>
       </relation>
+      <relation type="one-nofk" rel-entity-name="OrderItemShipGroup">
+        <key-map field-name="orderId"/>
+        <key-map field-name="shipGroupSeqId"/>
+      </relation>
       <relation type="one" fk-name="ORDER_PMPRF_PPRP" rel-entity-name="ProductPricePurpose">
         <key-map field-name="productPricePurposeId"/>
       </relation>
@@ -1047,6 +1052,7 @@
       <field name="statusId" type="id"></field>
       <field name="orderId" type="id"></field>
       <field name="orderItemSeqId" type="id"></field>
+      <field name="orderPaymentPreferenceId" type="id"></field>
       <field name="statusDatetime" type="date-time"></field>
       <field name="statusUserLogin" type="id-vlong"></field>
       <field name="changeReason" type="description"></field>
@@ -1060,6 +1066,9 @@
       <relation type="one-nofk" rel-entity-name="OrderItem">
         <key-map field-name="orderId"/>
         <key-map field-name="orderItemSeqId"/>
+      </relation>
+      <relation type="one-nofk" rel-entity-name="OrderPaymentPreference">
+        <key-map field-name="orderPaymentPreferenceId"/>
       </relation>
       <relation type="one" fk-name="ORDER_STTS_USER" rel-entity-name="UserLogin">
         <key-map field-name="statusUserLogin" rel-field-name="userLoginId"/>