svn commit: r598933 - in /ofbiz/trunk/applications: order/entitydef/entitymodel.xml product/entitydef/entitymodel.xml product/src/org/ofbiz/product/price/PriceServices.java

[jonesde]

Author: jonesde
Date: Wed Nov 28 01:55:33 2007
New Revision: 598933

URL: http://svn.apache.org/viewvc?rev=598933&view=rev
Log:
Added rateCode field and code to set it in OrderItemPriceInfo, now set in calc price service too

Modified:
    ofbiz/trunk/applications/order/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java

Modified: ofbiz/trunk/applications/order/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel.xml?rev=598933&r1=598932&r2=598933&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel.xml Wed Nov 28 01:55:33 2007
@@ -699,6 +699,7 @@
       <field name="productPriceActionSeqId" type="id"></field>
       <field name="modifyAmount" type="floating-point"></field>
       <field name="description" type="description"></field>
+      <field name="rateCode" type="short-varchar"></field>
       <prim-key field="orderItemPriceInfoId"/>
       <relation type="one-nofk" rel-entity-name="OrderHeader">
         <key-map field-name="orderId"/>

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=598933&r1=598932&r2=598933&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Wed Nov 28 01:55:33 2007
@@ -1777,6 +1777,7 @@
       <field name="productPriceActionSeqId" type="id-ne"></field>
       <field name="productPriceActionTypeId" type="id-ne"></field>
       <field name="amount" type="floating-point"></field>
+      <field name="rateCode" type="short-varchar"></field>
       <prim-key field="productPriceRuleId"/>
       <prim-key field="productPriceActionSeqId"/>
       <relation type="one" fk-name="PROD_PCACT_TYPE" rel-entity-name="ProductPriceActionType">

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java?rev=598933&r1=598932&r2=598933&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java Wed Nov 28 01:55:33 2007
@@ -1075,6 +1075,7 @@
                     orderItemPriceInfo.set("productPriceRuleId", productPriceAction.get("productPriceRuleId"));
                     orderItemPriceInfo.set("productPriceActionSeqId", productPriceAction.get("productPriceActionSeqId"));
                     orderItemPriceInfo.set("modifyAmount", new Double(modifyAmount));
+                    orderItemPriceInfo.set("rateCode", productPriceAction.get("rateCode"));
                     // make sure description is <= than 250 chars
                     String priceInfoDescriptionString = priceInfoDescription.toString();