svn commit: r631330 - in /ofbiz/trunk/applications/order/webapp/ordermgr: WEB-INF/actions/quote/ManageQuotePrices.bsh WEB-INF/actions/quote/ViewQuoteProfit.bsh quote/ViewQuoteItemInfo.ftl

[mrisaliti]

Author: mrisaliti
Date: Tue Feb 26 10:45:08 2008
New Revision: 631330

URL: http://svn.apache.org/viewvc?rev=631330&view=rev
Log:
Quote Items subtotal are not correctly calculated (Issue OFBIZ-1677)

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ManageQuotePrices.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ViewQuoteProfit.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ManageQuotePrices.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ManageQuotePrices.bsh?rev=631330&r1=631329&r2=631330&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ManageQuotePrices.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ManageQuotePrices.bsh Tue Feb 26 10:45:08 2008
@@ -73,7 +73,7 @@
         }
         defaultQuoteUnitPrice = averageCost * costToPriceMult * selectedAmount;
         totalCost += (averageCost * quantity);
-        totalPrice += (unitPrice * quantity);
+        totalPrice += (unitPrice * quantity * selectedAmount);
     } catch(Exception exc) {
         Debug.logError("Problems getting the averageCost for quoteItem: " + quoteItem);
     }

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ViewQuoteProfit.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ViewQuoteProfit.bsh?rev=631330&r1=631329&r2=631330&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ViewQuoteProfit.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/quote/ViewQuoteProfit.bsh Tue Feb 26 10:45:08 2008
@@ -84,7 +84,7 @@
         }
         //defaultQuoteUnitPrice = averageCost * costToPriceMult * selectedAmount;
         totalCost += (averageCost * quantity);
-        totalPrice += (unitPrice * quantity);
+        totalPrice += (unitPrice * quantity * selectedAmount);
     } catch(Exception exc) {
         Debug.logError("Problems getting the averageCost for quoteItem: " + quoteItem);
     }

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=631330&r1=631329&r2=631330&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl Tue Feb 26 10:45:08 2008
@@ -43,7 +43,7 @@
                 <#if quoteItem.productId?exists>
                     <#assign product = quoteItem.getRelatedOne("Product")>
                 </#if>
-                <#assign quoteItemAmount = quoteItem.quoteUnitPrice?default(0) * quoteItem.quantity?default(0)>
+                <#assign quoteItemAmount = quoteItem.quoteUnitPrice?default(0) * quoteItem.quantity?default(0) * quoteItem.selectedAmount?default(0)>
                 <#assign quoteItemAdjustments = quoteItem.getRelated("QuoteAdjustment")>
                 <#assign totalQuoteItemAdjustmentAmount = 0.0>
                 <#list quoteItemAdjustments as quoteItemAdjustment>