Merge lp:~josepato-o/bias-trunk/bias_trunk_v61_suppress_rate into lp:~openbias/bias-trunk/bias_trunk_v61

[josepato]

Se agrego el suppress rate que ya estaba

[OpenBias (openbias)]

review: Approve

=== modified file 'bias_electronic_invoice_v6/report/e_invoice.rml'
--- bias_electronic_invoice_v6/report/e_invoice.rml	2012-08-27 21:43:30 +0000
+++ bias_electronic_invoice_v6/report/e_invoice.rml	2012-08-28 23:35:24 +0000
@@ -571,10 +571,10 @@
             <para style="P43">UoM</para>
           </td>
           <td>
-            <para style="P52">PRECIO LISTA</para>
+            <para style="P52">[[ convert_value('PRECIO LISTA' , {'suppress_rate':o.partner_id.property_product_pricelist.suppress_rate}) ]]</para>
           </td>
           <td>
-            <para style="P52">% DIST.</para>
+            <para style="P52">[[ convert_value('% DIST.' , {'suppress_rate':o.partner_id.property_product_pricelist.suppress_rate}) ]]</para>
           </td>
           <td>
             <para style="P56">VALOR UNIT</para>
@@ -607,10 +607,10 @@
             <para style="P63">[[ l['uom'] or '' ]]</para>
           </td>
           <td>
-            <para style="P63">[[ l['product_list_price'] ]]</para>
+            <para style="P63">[[ convert_value(moneyfmt( '%.2f'% l['product_list_price']),{'suppress_rate':o.partner_id.property_product_pricelist.suppress_rate}) ]] </para>
           </td>
           <td>
-            <para style="P63">[[ l['product_discount_rate'] ]]</para>
+            <para style="P63">[[ convert_value(moneyfmt( '%.2f'% l['product_discount_rate']),{'suppress_rate':o.partner_id.property_product_pricelist.suppress_rate}) ]]</para>
           </td>
           <td>
             <para style="P27">[[ moneyfmt( '%.2f' % l['price_unit']) ]]</para>