svn commit: r584706 - in /ofbiz/trunk/applications: order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh order/widget/ordermgr/ReportForms.xml product/config/ProductUiLabels.properties

[apatel-2]

Author: apatel
Date: Mon Oct 15 01:26:09 2007
New Revision: 584706

URL: http://svn.apache.org/viewvc?rev=584706&view=rev
Log:
Adding column for % markup in Order Item report.

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh
    ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
    ofbiz/trunk/applications/product/config/ProductUiLabels.properties

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh?rev=584706&r1=584705&r2=584706&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh Mon Oct 15 01:26:09 2007
@@ -132,7 +132,8 @@
     orderItemMap.put("retailPrice",retailPrice);
     orderItemMap.put("listPrice",listPrice);
     orderItemMap.put("discount",(Double.toString(listPrice- retailPrice)));
-    orderItemMap.put("calculatedMarkup",(Double.toString(retailPrice- costPrice)));    
+    orderItemMap.put("calculatedMarkup",(Double.toString(retailPrice - costPrice)));
+    orderItemMap.put("percentMarkup",(Double.toString(((retailPrice - costPrice)/costPrice)*100)));
     orderItemList.add(orderItemMap);    
 }
 
@@ -142,10 +143,12 @@
     totalAmountMap = UtilMisc.toMap("totalCostPrice", totalCostPrice, "totalListPrice", totalListPrice, "totalRetailPrice", totalRetailPrice, "totalquantityOrdered", totalquantityOrdered, "quantityOrdered", quantityOrdered,"totalquantityOpen", totalquantityOpen);
     totalAmountMap.put("totalDiscount",(totalListPrice - totalRetailPrice));
     totalAmountMap.put("totalMarkup",(totalRetailPrice - totalCostPrice));
+    totalAmountMap.put("totalPercentMarkup",((totalRetailPrice - totalCostPrice)/totalCostPrice)*100);
     totalAmountList.add(totalAmountMap);
 }
 context.put("orderItemList", orderItemList);
 context.put("totalAmountList", totalAmountList);
+
 
 
 

Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml?rev=584706&r1=584705&r2=584706&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml Mon Oct 15 01:26:09 2007
@@ -149,6 +149,7 @@
         <field name="retailPrice" title="${uiLabelMap.ProductRetailPrice}"><display/></field>
         <field name="discount" title="${uiLabelMap.ProductDiscount}"><display/></field>
         <field name="calculatedMarkup" title="${uiLabelMap.CalculatedMarkup}"><display/></field>
+        <field name="percentMarkup" title="${uiLabelMap.PercentageMarkup}"><display/></field>
     </form>
     
     <form name="OpenOrderItemsTotal" type="list" list-name="totalAmountList" default-title-style="tableheadtext"
@@ -161,6 +162,7 @@
         <field name="totalRetailPrice"><display/></field>
         <field name="totalDiscount"><display/></field>
         <field name="totalMarkup"><display/></field>
+        <field name="totalPercentMarkup"><display/></field>
     </form>
     
     <!-- form for generating a report of total product purchases (quantity and value) -->

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?rev=584706&r1=584705&r2=584706&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Mon Oct 15 01:26:09 2007
@@ -233,6 +233,7 @@
 PartyState=State/Province
 PartyToName=To Name
 PartyZipCode=Zip/Postal Code
+PercentageMarkup=Percentage Markup
 ProductAbbrev=Abbrev
 ProductAbbreviation=Abbreviation
 ProductAcceptUpsShipmentConfirmation=Accept UPS Shipment Confirmation