svn commit: r681162 - in /ofbiz/trunk/applications/order: src/org/ofbiz/order/shoppingcart/CheckOutHelper.java webapp/ordermgr/WEB-INF/controller.xml

[hansbak-2]

Author: hansbak
Date: Wed Jul 30 11:19:16 2008
New Revision: 681162

URL: http://svn.apache.org/viewvc?rev=681162&view=rev
Log:
enable the calculation of sales tax on purchase orders

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java?rev=681162&r1=681161&r2=681162&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java Wed Jul 30 11:19:16 2008
@@ -752,7 +752,7 @@
     }
 
     public void calcAndAddTax(GenericValue shipAddress) throws GeneralException {
-        if (!"SALES_ORDER".equals(cart.getOrderType()) || (UtilValidate.isEmpty(cart.getShippingContactMechId()) && cart.getBillingAddress() == null && shipAddress == null)) {
+        if (UtilValidate.isEmpty(cart.getShippingContactMechId()) && cart.getBillingAddress() == null && shipAddress == null) {
             return;
         }
 

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=681162&r1=681161&r2=681162&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Wed Jul 30 11:19:16 2008
@@ -584,7 +584,7 @@
         <response name="term" type="view" value="orderTerm"/>
         <response name="shipGroups" type="view" value="SetItemShipGroups"/>
         <response name="sales" type="request" value="calcShipping"/>
-        <response name="po" type="view" value="confirm"/>
+        <response name="po" type="request" value="calcTax"/>
         <response name="error" type="request" value="orderentry"/>
     </request-map>