svn commit: r1063111 - in /ofbiz/trunk/applications/product: data/ProductTypeData.xml src/org/ofbiz/product/price/PriceServices.java

[jonesde]

Author: jonesde
Date: Tue Jan 25 02:40:09 2011
New Revision: 1063111

URL: http://svn.apache.org/viewvc?rev=1063111&view=rev
Log:
Added new price action for percent of wholesale price, just like the other percent of actions for list, default, etc; allows for wholesale pricing based on classification groups, etc

Modified:
    ofbiz/trunk/applications/product/data/ProductTypeData.xml
    ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java

Modified: ofbiz/trunk/applications/product/data/ProductTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductTypeData.xml?rev=1063111&r1=1063110&r2=1063111&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductTypeData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductTypeData.xml Tue Jan 25 02:40:09 2011
@@ -457,6 +457,7 @@ under the License.
     <ProductPriceActionType description="Percent Of Default Price" productPriceActionTypeId="PRICE_POD"/>
     <ProductPriceActionType description="Percent Of Average Cost" productPriceActionTypeId="PRICE_POAC"/>
     <ProductPriceActionType description="Percent Of Margin" productPriceActionTypeId="PRICE_POM"/>
+    <ProductPriceActionType description="Percent Of Wholesale" productPriceActionTypeId="PRICE_POWHS"/>
     <ProductPriceActionType description="Flat Amount Modify" productPriceActionTypeId="PRICE_FOL"/>
     <ProductPriceActionType description="Flat Amount Override" productPriceActionTypeId="PRICE_FLAT"/>
     <ProductPriceActionType description="Promo Amount Override" productPriceActionTypeId="PRICE_PFLAT"/>

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=1063111&r1=1063110&r2=1063111&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 Tue Jan 25 02:40:09 2011
@@ -973,6 +973,10 @@ public class PriceServices {
                         if (productPriceAction.get("amount") != null) {
                             modifyAmount = margin.multiply(productPriceAction.getBigDecimal("amount").movePointLeft(2));
                         }
+                    } else if ("PRICE_POWHS".equals(productPriceAction.getString("productPriceActionTypeId"))) {
+                        if (productPriceAction.get("amount") != null && wholesalePrice != null) {
+                            modifyAmount = wholesalePrice.multiply(productPriceAction.getBigDecimal("amount").movePointLeft(2));
+                        }
                     } else if ("PRICE_FOL".equals(productPriceAction.getString("productPriceActionTypeId"))) {
                         if (productPriceAction.get("amount") != null) {
                             modifyAmount = productPriceAction.getBigDecimal("amount");