Nimesh Contractor(Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-uniformize_reports-atp-amount_with_currency-nco
into lp:~openerp-dev/openobject-addons/trunk-uniformize_reports-atp.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-uniformize_reports-atp-amount_with_currency-nco/+merge/126958
Hello sir,
I have done changes for amount with the currency symbol.
Thanks,
NCO.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-uniformize_reports-atp-amount_with_currency-nco/+merge/126958
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-uniformize_reports-atp.
=== modified file 'hr_expense/report/expense.rml'
--- hr_expense/report/expense.rml 2012-07-05 09:29:21 +0000
+++ hr_expense/report/expense.rml 2012-09-28 13:15:26 +0000
@@ -231,7 +231,7 @@
<para style="terp_default_Right_9">[[ formatLang(line.unit_quantity) ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line.total_amount) ]] [[ o.currency_id.symbol ]] </para>
+ <para style="terp_default_Right_9">[[ formatLang(line.total_amount, currency_obj=o.currency_id) ]] </para>
</td>
</tr>
<tr>
@@ -277,7 +277,7 @@
<para style="terp_tblheader_Details">Total:</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount, currency_obj=o.currency_id) ]]</para>
</td>
</tr>
</blockTable>
=== modified file 'hr_expense/report/expense.sxw'
Binary files hr_expense/report/expense.sxw 2011-01-14 00:11:01 +0000 and hr_expense/report/expense.sxw 2012-09-28 13:15:26 +0000 differ
=== modified file 'mrp_repair/report/order.rml'
--- mrp_repair/report/order.rml 2012-07-19 05:38:03 +0000
+++ mrp_repair/report/order.rml 2012-09-28 13:15:26 +0000
@@ -353,7 +353,7 @@
<para style="terp_default_9">Net Total :</para>
</td>
<td>
- <para style="P26">[[ formatLang(o.amount_untaxed, dp='Sale Price')]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+ <para style="P26">[[ formatLang(o.amount_untaxed, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
</td>
</tr>
@@ -367,7 +367,7 @@
<para style="terp_default_9">Taxes:</para>
</td>
<td>
- <para style="P26">[[ formatLang(o.amount_tax, dp='Account')]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+ <para style="P26">[[ formatLang(o.amount_tax, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
</td>
</tr>
<tr>
@@ -380,7 +380,7 @@
<para style="terp_tblheader_Details">Total :</para>
</td>
<td>
- <para style="terp_default_right_bold_9">[[ formatLang(total(o), dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+ <para style="terp_default_right_bold_9">[[ formatLang(total(o), dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
</td>
</tr>
</blockTable>
=== modified file 'point_of_sale/report/pos_lines.rml'
--- point_of_sale/report/pos_lines.rml 2012-07-19 05:38:03 +0000
+++ point_of_sale/report/pos_lines.rml 2012-09-28 13:15:26 +0000
@@ -186,7 +186,7 @@
<para style="terp_default_Centre_9">[[ formatLang(l.discount) ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, currency_obj=o.pricelist_id.currency_id) ]]</para>
</td>
</tr>
</blockTable>
@@ -202,7 +202,7 @@
<para style="terp_default_9">Net Total :</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_total, currency_obj=o.pricelist_id.currency_id) ]]</para>
</td>
</tr>
<tr>
@@ -215,7 +215,7 @@
<para style="terp_default_9">Taxes :</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, currency_obj=o.pricelist_id.currency_id) ]]</para>
</td>
</tr>
<tr>
@@ -228,7 +228,7 @@
<para style="terp_default_Bold_9">Total:</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
+ <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total + o.amount_tax, currency_obj=o.pricelist_id.currency_id) ]]</para>
</td>
</tr>
</blockTable>
=== modified file 'point_of_sale/report/pos_lines.sxw'
Binary files point_of_sale/report/pos_lines.sxw 2012-07-19 05:38:03 +0000 and point_of_sale/report/pos_lines.sxw 2012-09-28 13:15:26 +0000 differ
=== modified file 'report_intrastat/report/invoice.rml'
--- report_intrastat/report/invoice.rml 2012-07-19 05:38:03 +0000
+++ report_intrastat/report/invoice.rml 2012-09-28 13:15:26 +0000
@@ -245,7 +245,7 @@
<para style="terp_default_Centre_9">[[ l.discount and formatLang (l.discount) or '' ]] </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]] [[ o.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, currency_obj=o.currency_id) ]]</para>
</td>
</tr>
<tr>
@@ -301,7 +301,7 @@
<para style="terp_default_9">Total (excl. taxes):</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, currency_obj=o.currency_id) ]]</para>
</td>
</tr>
<tr>
@@ -314,7 +314,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, currency_obj=o.currency_id) ]]</para>
</td>
</tr>
<tr>
@@ -327,7 +327,7 @@
<para style="terp_default_Bold_9">Total (inclu. taxes):</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount_total, currency_obj=o.currency_id) ]]</para>
</td>
</tr>
</blockTable>
@@ -363,7 +363,7 @@
<para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</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, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</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'), currency_obj=o.currency_id) ]]</para>
</td>
<td>
<para style="terp_default_8">
=== modified file 'report_intrastat/report/invoice.sxw'
Binary files report_intrastat/report/invoice.sxw 2012-07-19 05:38:03 +0000 and report_intrastat/report/invoice.sxw 2012-09-28 13:15:26 +0000 differ
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
