pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] account_invoice_layout: 'invoices wihh layout' report now uses decimal.precision

Browse Source 
bzr revid: olt@tinyerp.com-20101004081052-l12jti4h22ss3yez
This commit is contained in:
olt@tinyerp.com
2010-10-04 10:10:52 +02:00
parent 2b09325d65
commit 957c821828
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_invoice_layout/report/report_account_invoice_layout.py
+4 -4
View File
@@ -68,10 +68,10 @@ class account_invoice_1(report_sxw.rml_parse):
tax_names = ','.join([tax_names_dict[x] for x in range(0, len(tax_names_dict))])
res['tax_types'] = tax_names
res['name'] = entry.name
res['quantity'] = "%.2f" % (entry.quantity)
res['price_unit'] = "%.2f" % (entry.price_unit)
res['discount'] = "%.2f" % (entry.discount)
res['price_subtotal'] = "%.2f" % (entry.price_subtotal)
res['quantity'] = self.formatLang(entry.quantity, digits=self.get_digits(dp='Account'))
res['price_unit'] = self.formatLang(entry.price_unit, digits=self.get_digits(dp='Account'))
res['discount'] = self.formatLang(entry.discount, digits=self.get_digits(dp='Account'))
res['price_subtotal'] = self.formatLang(entry.price_subtotal, digits=self.get_digits(dp='Account'))
sub_total[i] = entry.price_subtotal
i = i + 1
res['note'] = entry.note
addons/account_invoice_layout/report/report_account_invoice_layout.rml
+6 -6
View File
@@ -376,7 +376,7 @@
<para style="terp_default_9">Net Total:</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
<para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -391,7 +391,7 @@
<para style="terp_default_9">Taxes:</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]</para>
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -406,7 +406,7 @@
<para style="terp_default_Bold_9">Total:</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
<para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -445,10 +445,10 @@
<para style="terp_default_8">[[ t.name ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
<para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]]</para>
</td>
<td>
<para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]]</para>
<para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]]</para>
</td>
<td>
<para style="terp_default_Right_8">
@@ -485,4 +485,4 @@
<font color="white"> </font>
</para>
</story>
</document>
</document>