Merge lp:~alejandrosantana/ocb-addons/6.1-ocb-addons-fix-bug-1089229 into lp:ocb-addons/6.1

[Alejandro Santana]

[FIX] Fixes the sales order report to show correctly the unit price if UoS is definied. Also corrects the decimal precision of subtotals, total untaxed, taxes and total taxed.

Fixes bug lp:1089229
[FIX] Fixes the sales order report to show correctly the unit price if UoS is definied. Also corrects the decimal precision of subtotals, total untaxed, taxes and total taxed.

[lp:~alejandrosantana/ocb-addons/6.1-ocb-addons-fix-bug-1089229]

6827. By Alejandro Santana on 2014-01-19

[FIX] Fixes the sales order report to show correctly the unit price if UoS is definied. Also corrects the decimal precision of subtotals, total untaxed, taxes and total taxed.

[Alejandro Santana (alejandrosantana)]

Same as MP in v7.0 (https://code.launchpad.net/~alejandrosantana/ocb-addons/7.0-ocb-addons-fix-bug-1089229/+merge/202233):
"
OK, despite the pure mathematics, I set myself as 'Needs fixing', because rounding calculations make mandatory to compute subtotal as shown in the report:
product_uos_qty (dp as "UoM") * price_unit_uos (dp as "Product Price") = subtotal (dp as "Account")
dp = decimal precision

A case of use:
Description VAT Quantity Unit Disc.(%) Price Price
Handful of peanuts ITAX S 10.000 g 20.00 0.00 200.00 €
Handful of peanuts (big) ITAX S 30.000 g 8.33 0.00 250.00 € <-- This should be: 30.000*8.33=249.90

In this simple case we see how rounding methods can easily make a 0.10€ difference.

So to correctly fix this it may be necessary to create the product.template.list_price_uos, as pointed in those code comments I told about. Would it be acceptable in OCB? (It adds a column)
Or should I create a new module that fixes this and make a MP into community branches?
Not sure, because it's a bug for me (as an incomplete feature), but it modifies the module.
"

review: Needs Information

Unmerged revisions

6827. By Alejandro Santana on 2014-01-19

[FIX] Fixes the sales order report to show correctly the unit price if UoS is definied. Also corrects the decimal precision of subtotals, total untaxed, taxes and total taxed.

=== modified file 'sale/report/sale_order.rml'
--- sale/report/sale_order.rml	2013-11-20 01:17:39 +0000
+++ sale/report/sale_order.rml	2014-01-19 23:04:55 +0000
@@ -67,7 +67,6 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
@@ -126,11 +125,8 @@
     <images/>
   </stylesheet>
   <story>
-  <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
-  <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
+    <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
+    <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
     <blockTable colWidths="265.0,51.0,225.0" style="Table1">
       <tr>
         <td>
@@ -208,32 +204,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <pto>
-    <pto_header>
-      <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
-        <tr>
-          <td>
-            <para style="terp_tblheader_Details">Description</para>
-         </td>
-         <td>
-            <para style="terp_tblheader_Details_Centre">VAT</para>
-         </td>
-         <td>
-           <para style="terp_tblheader_Details_Right">Quantity</para>
-         </td>
-         <td>
-           <para style="terp_tblheader_Details_Right">Unit Price</para>
-         </td>
-         <td>
-           <para style="terp_tblheader_Details_Centre">Disc.(%)</para>
-         </td>
-         <td>
-           <para style="terp_tblheader_Details_Right">Price</para>
-         </td>
-        </tr>
-      </blockTable>
-    </pto_header>
-    <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
+    <blockTable colWidths="202.0,94.0,68.0,59.0,50.0,63.0" repeatRows="1" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -257,7 +228,7 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[repeatIn(o.order_line,'line')]]</para>
-      <blockTable colWidths="180.0,70.0,80.0,70.0,50.0,85.0" style="Table5">
+      <blockTable colWidths="203.0,94.0,68.0,61.0,42.0,70.0" style="Table5">
         <tr>
           <td>
             <para style="terp_default_9">[[ line.name ]] </para>
@@ -269,13 +240,13 @@
             <para style="terp_default_Right_9">[[ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_unit ) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.product_uos and (line.price_unit * line.product_uom_qty / line.product_uos_qty) or line.price_unit , digits=get_digits(dp='Product Price'))]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ formatLang(line.discount) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Sale Price'), currency_obj=o.pricelist_id.currency_id) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id) ]]</para>
           </td>
         </tr>
         <tr>
@@ -310,8 +281,7 @@
         </tr>
       </blockTable>
     </section>
-    </pto>
-    <blockTable colWidths="381.0,60.0,93.0" style="Table6">
+    <blockTable colWidths="374.0,69.0,94.0" style="Table6">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -322,7 +292,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -335,7 +305,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -348,13 +318,11 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
+    <para style="terp_default_8"/>
     <para style="terp_default_9">[[ format(o.note or '') ]]</para>
     <blockTable colWidths="533.0" style="Table7">
       <tr>

=== modified file 'sale/report/sale_order.sxw'
Binary files sale/report/sale_order.sxw	2012-12-17 09:49:00 +0000 and sale/report/sale_order.sxw	2014-01-19 23:04:55 +0000 differ