odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] mrp_repair: 'Repair Quotation' report now uses decimal.precision 

bzr revid: olt@tinyerp.com-20101004115215-caqr9sv7jcdgduoy
This commit is contained in:
olt@tinyerp.com 2010-10-04 13:52:15 +02:00
parent d51ad12b0c
commit 3a378cef70
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/mrp_repair/report/order.py
View File

@ -33,9 +33,9 @@ class order(report_sxw.rml_parse):
def total(self, repair): def total(self, repair):
total = 0.0 total = 0.0
for operation in repair.operations: for operation in repair.operations:
total+=operation.price_subtotal total += operation.price_subtotal
for fee in repair.fees_lines: for fee in repair.fees_lines:
total+=fee.price_subtotal total += fee.price_subtotal
total = total + repair.amount_tax total = total + repair.amount_tax
return total return total

8
addons/mrp_repair/report/order.rml
View File

@ -343,7 +343,7 @@
<para style="terp_default_9">Net Total :</para> <para style="terp_default_9">Net Total :</para>
</td> </td>
<td> <td>
<para style="P26">[[ formatLang(o.amount_untaxed)]] [[ o.pricelist_id.currency_id. symbol ]]</para> <para style="P26">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Sale Price'))]] [[ o.pricelist_id.currency_id. symbol ]]</para>
</td> </td>
</tr> </tr>
@ -357,7 +357,7 @@
<para style="terp_default_9">Taxes:</para> <para style="terp_default_9">Taxes:</para>
</td> </td>
<td> <td>
<para style="P26">[[ formatLang(o.amount_tax)]] [[ o.pricelist_id.currency_id. symbol ]]</para> <para style="P26">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account'))]] [[ o.pricelist_id.currency_id. symbol ]]</para>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -370,7 +370,7 @@
<para style="terp_tblheader_Details">Total :</para> <para style="terp_tblheader_Details">Total :</para>
</td> </td>
<td> <td>
<para style="terp_default_right_bold_9">[[ formatLang(total(o)) ]] [[ o.pricelist_id.currency_id. symbol ]]</para> <para style="terp_default_right_bold_9">[[ formatLang(total(o), digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -391,4 +391,4 @@
<font color="white"> </font> <font color="white"> </font>
</para> </para>
</story> </story>
</document> </document>