openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #00137
lp:~openerp-dev/openobject-addons/trunk-dev-addons_decimal_precision into lp:openobject-addons
Olivier (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-dev-addons_decimal_precision into lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
* Reports (and analysis) now uses decimal.precision
* also modified some float fields to use decimal.precision when necessary (mostly because those fields were used in reports)
PS: didn't had the time to check every float and function fields in all the addons
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-dev-addons_decimal_precision/+merge/37594
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-dev-addons_decimal_precision.
=== modified file 'account/report/account_general_ledger_landscape.rml'
--- account/report/account_general_ledger_landscape.rml 2010-10-01 11:58:16 +0000
+++ account/report/account_general_ledger_landscape.rml 2010-10-05 12:47:41 +0000
@@ -266,10 +266,10 @@
<tr>
<td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para></td>
<td><para style="Standard"></para></td>
- <td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
- <td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
- <td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</u></para></td>
- <td><para style="P9b"><u>[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</u></para></td>
+ <td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), dp='Account') ]]</u></para></td>
+ <td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), dp='Account') ]]</u></para></td>
+ <td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), dp='Account') ]] [[ company.currency_id.symbol ]]</u></para></td>
+ <td><para style="P9b"><u>[[ o.currency_id and formatLang(sum_currency_amount_account(o), dp='Account') + o.currency_id.code or '' ]]</u></para></td>
</tr>
</blockTable>
</td>
@@ -292,9 +292,9 @@
<td><para style="P2_content">[[ line['move'] ]]</para></td>
<td><para style="P3_content">[[ line['lname'] ]]</para></td>
<td><para style="P3_content_center">[[ strip_name(line['line_corresp'].replace(', ',','),40) ]]</para></td>
- <td><para style="P4_content">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para></td>
- <td><para style="P4_content">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para></td>
- <td><para style="P4_content">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para></td>
+ <td><para style="P4_content">[[ formatLang(line['debit'], dp='Account') ]]</para></td>
+ <td><para style="P4_content">[[ formatLang(line['credit'], dp='Account') ]]</para></td>
+ <td><para style="P4_content">[[ formatLang(line['progress'], dp='Account') ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content">[[ formatLang(line['amount_currency'] or '')]] [[ line['currency_code'] or '' ]]</para></td>
</tr>
</blockTable>
@@ -327,9 +327,9 @@
<tr>
<td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para></td>
<td><para style="Standard"></para></td>
- <td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
- <td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), digits=get_digits(dp=Account)) ]]</u></para></td>
- <td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</u></para></td>
+ <td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), dp='Account') ]]</u></para></td>
+ <td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), dp='Account') ]]</u></para></td>
+ <td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), 'Account') ]] [[ company.currency_id.symbol ]]</u></para></td>
</tr>
</blockTable>
</td>
=== modified file 'account/report/invoice.rml'
--- account/report/invoice.rml 2010-10-04 07:26:51 +0000
+++ account/report/invoice.rml 2010-10-05 12:47:41 +0000
@@ -232,10 +232,10 @@
<para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]][[ o.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(l.discount, digits=get_digits(dp='Account')) ]] </para>
+ <para style="terp_default_Right_9">[[ formatLang(l.discount, dp='Account') ]] </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
@@ -294,7 +294,7 @@
<para style="terp_default_9">Taxes:</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
@@ -338,7 +338,7 @@
<para style="terp_default_8">[[ t.name ]]</para>
</td>
<td>
- <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">[[ formatLang(t.base, 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) ]] [[ o.currency_id.symbol ]]</para>
=== modified file 'account/report/invoice.sxw'
Binary files account/report/invoice.sxw 2010-09-22 06:07:25 +0000 and account/report/invoice.sxw 2010-10-05 12:47:41 +0000 differ
=== modified file 'account_budget/report/crossovered_budget_report.rml'
--- account_budget/report/crossovered_budget_report.rml 2010-10-01 11:19:29 +0000
+++ account_budget/report/crossovered_budget_report.rml 2010-10-05 12:47:41 +0000
@@ -148,13 +148,13 @@
<para style="terp_default_9"><font color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica">[[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ a['name'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['pln'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['prac'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['pln'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['prac'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['perc'], digits=2) ]]%</para>
@@ -168,13 +168,13 @@
<para style="terp_default_Bold_9"><font face="Helvetica">[[ repeatIn(funct_total(data['form']),'b') ]]</font>Total:</para>
</td>
<td>
- <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_pln'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_pln'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Bold_right_9">[[ formatLang(b['tot_perc'], digits=2) ]]%</para>
=== modified file 'account_invoice_layout/report/report_account_invoice_layout.rml'
--- account_invoice_layout/report/report_account_invoice_layout.rml 2010-10-04 08:10:52 +0000
+++ account_invoice_layout/report/report_account_invoice_layout.rml 2010-10-05 12:47:41 +0000
@@ -376,7 +376,7 @@
<para style="terp_default_9">Net Total:</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, 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, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, 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, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, 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, digits=get_digits(dp='Account')) ]]</para>
+ <para style="terp_default_Right_8">[[ formatLang(t.base, 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, digits=get_digits(dp='Account')) ]]</para>
+ <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, dp='Account') ]]</para>
</td>
<td>
<para style="terp_default_Right_8">
=== modified file 'account_invoice_layout/report/report_account_invoice_layout.sxw'
Binary files account_invoice_layout/report/report_account_invoice_layout.sxw 2010-09-27 19:15:52 +0000 and account_invoice_layout/report/report_account_invoice_layout.sxw 2010-10-05 12:47:41 +0000 differ
=== modified file 'account_invoice_layout/report/special_message_invoice.rml'
--- account_invoice_layout/report/special_message_invoice.rml 2010-10-04 08:02:40 +0000
+++ account_invoice_layout/report/special_message_invoice.rml 2010-10-05 12:47:41 +0000
@@ -380,7 +380,7 @@
<para style="terp_default_9">Net Total:</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -395,7 +395,7 @@
<para style="terp_default_9">Taxes:</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -410,7 +410,7 @@
<para style="terp_default_Bold_9">Total:</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -449,10 +449,10 @@
<para style="terp_default_8">[[ t.name ]]</para>
</td>
<td>
- <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]]</para>
+ <para style="terp_default_Right_8">[[ formatLang(t.base, 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, digits=get_digits(dp='Account')) ]]</para>
+ <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, dp='Account') ]]</para>
</td>
<td>
<para style="terp_default_Right_8">
=== modified file 'account_invoice_layout/report/special_message_invoice.sxw'
Binary files account_invoice_layout/report/special_message_invoice.sxw 2010-09-09 12:16:41 +0000 and account_invoice_layout/report/special_message_invoice.sxw 2010-10-05 12:47:41 +0000 differ
=== modified file 'hr_expense/report/hr_expense_report.py'
--- hr_expense/report/hr_expense_report.py 2010-09-22 12:23:15 +0000
+++ hr_expense/report/hr_expense_report.py 2010-10-05 12:47:41 +0000
@@ -21,6 +21,7 @@
import tools
from osv import fields,osv
+from decimal_precision import decimal_precision as dp
class hr_expense_report(osv.osv):
@@ -47,11 +48,11 @@
'company_id':fields.many2one('res.company', 'Company', readonly=True),
'user_id':fields.many2one('res.users', 'Validation User', readonly=True),
'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
- 'price_total':fields.float('Total Price', readonly=True),
+ 'price_total':fields.float('Total Price', readonly=True, digits_compute=dp.get_precision('Account')),
'delay_valid':fields.float('Delay to Valid', readonly=True),
'delay_confirm':fields.float('Delay to Confirm', readonly=True),
'analytic_account': fields.many2one('account.analytic.account','Analytic account',readonly=True),
- 'price_average':fields.float('Average Price', readonly=True),
+ 'price_average':fields.float('Average Price', readonly=True, digits_compute=dp.get_precision('Account')),
'nbr':fields.integer('# of Lines', readonly=True),
'no_of_products':fields.integer('# of Products', readonly=True),
'no_of_account':fields.integer('# of Accounts', readonly=True),
=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py 2010-09-24 04:39:41 +0000
+++ hr_payroll/hr_payroll.py 2010-10-05 12:47:41 +0000
@@ -27,6 +27,7 @@
from osv import fields, osv
from tools import config
from tools.translate import _
+import decimal_precision as dp
@@ -774,9 +775,9 @@
('done','Paid Salary'),
('cancel','Reject'),
],'State', select=True, readonly=True),
- 'basic_before_leaves': fields.float('Basic Salary', readonly=True, digits=(16, 2)),
- 'leaves': fields.float('Leave Deductions', readonly=True, digits=(16, 2)),
- 'basic': fields.float('Net Basic', readonly=True, digits=(16, 2)),
+ 'basic_before_leaves': fields.float('Basic Salary', readonly=True, digits_compute=dp.get_precision('Account')),
+ 'leaves': fields.float('Leave Deductions', readonly=True, digits_compute=dp.get_precision('Account')),
+ 'basic': fields.float('Net Basic', readonly=True, digits_compute=dp.get_precision('Account')),
'grows': fields.function(_calculate, method=True, store=True, multi='dc', string='Gross Salary', type='float', digits=(16, 2)),
'net': fields.function(_calculate, method=True, store=True, multi='dc', string='Net Salary', digits=(16, 2)),
'allounce': fields.function(_calculate, method=True, store=True, multi='dc', string='Allowance', digits=(16, 2)),
=== modified file 'hr_payroll/report/payroll_register.rml'
--- hr_payroll/report/payroll_register.rml 2010-09-16 12:35:25 +0000
+++ hr_payroll/report/payroll_register.rml 2010-10-05 12:47:41 +0000
@@ -179,22 +179,22 @@
<para style="terp_default_8">[[ l.employee_id.name ]]</para>
</td>
<td>
- <para style="terp_default_9_right">[[ formatLang(l.basic) ]] [[ company.currency_id.symbol]] </para>
- </td>
- <td>
- <para style="terp_default_9_right">[[ formatLang(l.other_pay)]] [[ company.currency_id.symbol]] </para>
- </td>
- <td>
- <para style="terp_default_9_right">[[ formatLang(l.allounce)]] [[ company.currency_id.symbol]] </para>
- </td>
- <td>
- <para style="terp_default_9_right">[[ formatLang(l.grows)]] [[ company.currency_id.symbol]] </para>
- </td>
- <td>
- <para style="terp_default_9_right">[[ formatLang(l.deduction)]] [[ company.currency_id.symbol]] </para>
- </td>
- <td>
- <para style="terp_default_9_right">[[ formatLang(l.net)]] [[ company.currency_id.symbol]] </para>
+ <para style="terp_default_9_right">[[ formatLang(l.basic, dp='Account') ]] [[ company.currency_id.symbol]] </para>
+ </td>
+ <td>
+ <para style="terp_default_9_right">[[ formatLang(l.other_pay, dp='Account')]] [[ company.currency_id.symbol]] </para>
+ </td>
+ <td>
+ <para style="terp_default_9_right">[[ formatLang(l.allounce, dp='Account')]] [[ company.currency_id.symbol]] </para>
+ </td>
+ <td>
+ <para style="terp_default_9_right">[[ formatLang(l.grows, dp='Account')]] [[ company.currency_id.symbol]] </para>
+ </td>
+ <td>
+ <para style="terp_default_9_right">[[ formatLang(l.deduction, dp='Account')]] [[ company.currency_id.symbol]] </para>
+ </td>
+ <td>
+ <para style="terp_default_9_right">[[ formatLang(l.net, dp='Account')]] [[ company.currency_id.symbol]] </para>
</td>
</tr>
</blockTable>
@@ -213,22 +213,22 @@
<para style="terp_tblheader_details">Total SAL<font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
</td>
<td>
- <para style="terp_tbleheader_details_right">[[formatLang(get_basic())]][[ company.currency_id.symbol]] </para>
- </td>
- <td>
- <para style="terp_tbleheader_details_right">[[formatLang(get_other())]] [[ company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_tbleheader_details_right">[[formatLang(get_allow())]] [[ company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_tbleheader_details_right">[[formatLang(get_grows())]] [[ company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_tbleheader_details_right">[[formatLang(get_deduct())]] [[ company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_tbleheader_details_right">[[formatLang(get_net())]] [[ company.currency_id.symbol]]</para>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_basic(), dp='Account')]][[ company.currency_id.symbol]] </para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_other(), dp='Account')]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_allow(), dp='Account')]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_grows(), dp='Account')]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_deduct(), dp='Account')]] [[ company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_net(), dp='Account')]] [[ company.currency_id.symbol]]</para>
</td>
</tr>
</blockTable>
@@ -265,4 +265,4 @@
<font color="white"> </font>
</para>
</story>
-</document>
\ No newline at end of file
+</document>
=== modified file 'hr_payroll/report/payslip.rml'
--- hr_payroll/report/payslip.rml 2010-09-28 06:30:32 +0000
+++ hr_payroll/report/payslip.rml 2010-10-05 12:47:41 +0000
@@ -392,19 +392,19 @@
<para style="terp_default_Bold_9">Basic Salary</para>
</td>
<td>
- <para style="terp_default_9">[[ formatLang(o.basic_before_leaves) ]] [[ o.company_id.currency_id.symbol ]] </para>
+ <para style="terp_default_9">[[ formatLang(o.basic_before_leaves, dp='Account') ]] [[ o.company_id.currency_id.symbol ]] </para>
</td>
<td>
<para style="terp_default_Bold_9">Leaved Deduction</para>
</td>
<td>
- <para style="terp_default_9">[[ o.leaves or '' ]]</para>
+ <para style="terp_default_9">[[ formatLang(o.leaves, dp='Account') ]] [[ o.company_id.currency_id.symbol ]] </para>
</td>
<td>
<para style="terp_default_Bold_9">Basic Salary – Leaves</para>
</td>
<td>
- <para style="terp_default_9">[[ formatLang(o.basic) ]] [[ o.company_id.currency_id.symbol ]]</para>
+ <para style="terp_default_9">[[ formatLang(o.basic, dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -433,7 +433,7 @@
<para style="terp_default_9">[[ ld.code ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(ld.total) ]] [[ o.company_id.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(ld.total, dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -463,7 +463,7 @@
<para style="terp_default_9">Basic Salary</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(o.basic) ]] [[ o.company_id.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(o.basic, dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
@@ -471,7 +471,7 @@
<para style="terp_default_9">[[repeatIn(get_earnings(o.line_ids),'a') ]] [[ a.code or removeParentNode('tr') ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(a.total) ]] [[ o.company_id.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(a.total, dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -488,7 +488,7 @@
<para style="terp_default_9">[[ b.code ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(b.total) ]] [[ o.company_id.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(b.total, dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -508,13 +508,13 @@
<para style="terp_tblheader_Details">Total Earnings<font face="Helvetica" size="7.0">([[ o.company_id.currency_id.code ]])</font></para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(o.allounce + o.basic) ]] [[ o.company_id.currency_id.symbol ]] </para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(o.allounce + o.basic, dp='Account') ]] [[ o.company_id.currency_id.symbol ]] </para>
</td>
<td>
<para style="terp_tblheader_Details">Total Deductions<font face="Helvetica" size="7.0">([[ o.company_id.currency_id.code ]])</font></para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(o.deduction) ]] [[ o.company_id.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(o.deduction, dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -542,10 +542,10 @@
<para style="terp_default_9">[[ ol.type in ['advance','loan','otherpay','otherdeduct','installment'] and ol.code or '' ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ ol.type in ['advance','loan','otherpay'] and formatLang(ol.total) or '' ]] [[ ol.type in ['advance','loan','otherpay'] and o.company_id.currency_id.symbol or '' ]]</para>
+ <para style="terp_default_Right_9">[[ ol.type in ['advance','loan','otherpay'] and formatLang(ol.total, dp='Account') or '' ]] [[ ol.type in ['advance','loan','otherpay'] and o.company_id.currency_id.symbol or '' ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ ol.type in ['otherdeduct','installment'] and formatLang(ol.total) or '' ]] [[ ol.type in ['advance','loan','otherpay'] and o.company_id.currency_id.symbol or '' ]]</para>
+ <para style="terp_default_Right_9">[[ ol.type in ['otherdeduct','installment'] and formatLang(ol.total, dp='Account') or '' ]] [[ ol.type in ['advance','loan','otherpay'] and o.company_id.currency_id.symbol or '' ]]</para>
</td>
</tr>
</blockTable>
@@ -561,7 +561,7 @@
<para style="terp_tblheader_Details">Net Amount<font face="Helvetica" size="7.0">([[ o.company_id.currency_id.code ]])</font></para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(o.net) ]] [[ o.company_id.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(o.net, dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -609,4 +609,4 @@
<font color="white"> </font>
</para>
</story>
-</document>
\ No newline at end of file
+</document>
=== modified file 'hr_payroll/report/report_employees_detail.rml'
--- hr_payroll/report/report_employees_detail.rml 2010-09-28 10:47:36 +0000
+++ hr_payroll/report/report_employees_detail.rml 2010-10-05 12:47:41 +0000
@@ -575,43 +575,43 @@
<para style="terp_tblheader_Details">[[ get_monthly_total()[0] ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[1]) ]][[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[2]) ]][[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[3]) ]][[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[4]) ]][[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[5]) ]][[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[6]) ]][[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[7]) ]][[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[8]) ]][[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[9]) ]][[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[10]) ]][[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[11]) ]][[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[12]) ]][[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[1], dp='Account') ]][[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[2], dp='Account') ]][[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[3], dp='Account') ]][[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[4], dp='Account') ]][[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[5], dp='Account') ]][[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[6], dp='Account') ]][[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[7], dp='Account') ]][[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[8], dp='Account') ]][[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[9], dp='Account') ]][[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[10], dp='Account') ]][[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[11], dp='Account') ]][[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[12], dp='Account') ]][[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">[[ formatLang(get_total(), dp='Account') ]][[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
=== modified file 'hr_payroll/report/report_payroll_advice.rml'
--- hr_payroll/report/report_payroll_advice.rml 2010-09-23 11:40:47 +0000
+++ hr_payroll/report/report_payroll_advice.rml 2010-10-05 12:47:41 +0000
@@ -229,10 +229,10 @@
<para style="terp_default_9">[[ line['name'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line['amount' ]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(line['amount'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line['bysal']) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(line['bysal'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line['acc_no'] ]]</para>
@@ -260,10 +260,10 @@
<para style="terp_tblheader_Details">Total([[ company.currency_id.code ]]):</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_total()) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_total(), dp='Account') ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_bysal_total()) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_bysal_total(), dp='Account') ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">
=== modified file 'hr_payroll/report/report_payslip.py'
--- hr_payroll/report/report_payslip.py 2010-09-29 08:05:01 +0000
+++ hr_payroll/report/report_payslip.py 2010-10-05 12:47:41 +0000
@@ -99,18 +99,5 @@
report_sxw.report_sxw('report.payslip.pdf', 'hr.payslip', 'hr_payroll/report/payslip.rml', parser=payslip_report)
-
-
-
-
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
-
-
-
-
-
-
-
=== modified file 'hr_payroll/report/report_year_report.rml'
--- hr_payroll/report/report_year_report.rml 2010-09-28 05:43:02 +0000
+++ hr_payroll/report/report_year_report.rml 2010-10-05 12:47:41 +0000
@@ -191,43 +191,43 @@
<para style="terp_default_9">[[ e[0] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e[1]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(e[2]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(e[3]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(e[4]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(e[5]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(e[6]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(e[7]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(e[8]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(e[9]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(e[10]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(e[11]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(e[12]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9_Bold">[[ formatLang(e[13]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(e[1], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(e[2], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(e[3], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(e[4], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(e[5], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(e[6], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(e[7], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(e[8], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(e[9], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(e[10], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(e[11], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(e[12], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ formatLang(e[13], dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
</tr>
</blockTable>
@@ -250,43 +250,43 @@
<para style="terp_tblheader_Details">Total([[company.currency_id.code]])</para>
</td>
<td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[1]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[2]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[3]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[4]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[5]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[6]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[7]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[8]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[9]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[10]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[11]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[12]) ]] [[company.currency_id.symbol]]</para>
- </td>
- <td>
- <para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[1], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[2], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[3], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[4], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[5], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[6], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[7], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[8], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[9], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[10], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[11], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[12], dp='Account') ]] [[company.currency_id.symbol]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_General_Right">[[ formatLang(get_total(), dp='Account') ]] [[company.currency_id.symbol]]</para>
</td>
</tr>
</blockTable>
=== modified file 'hr_recruitment/report/hr_recruitment_report.py'
--- hr_recruitment/report/hr_recruitment_report.py 2010-09-22 11:02:14 +0000
+++ hr_recruitment/report/hr_recruitment_report.py 2010-10-05 12:47:41 +0000
@@ -21,6 +21,8 @@
import tools
from osv import fields,osv
from hr_recruitment import hr_recruitment
+from decimal_precision import decimal_precision as dp
+
AVAILABLE_STATES = [
('draft','New'),
@@ -72,9 +74,9 @@
'type_id': fields.many2one('hr.recruitment.degree', 'Degree'),
'department_id':fields.many2one('hr.department','Department',readonly=True),
'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
- 'salary_prop' : fields.float("Salary Proposed"),
- 'salary_prop_avg' : fields.float("Avg Salary Proposed", group_operator="avg"),
- 'salary_exp' : fields.float("Salary Expected"),
+ 'salary_prop' : fields.float("Salary Proposed", digits_compute=dp.get_precision('Account')),
+ 'salary_prop_avg' : fields.float("Avg Salary Proposed", group_operator="avg", digits_compute=dp.get_precision('Account')),
+ 'salary_exp' : fields.float("Salary Expected", digits_compute=dp.get_precision('Account')),
'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact Name',readonly=True),
'available' : fields.float("Availability"),
@@ -82,7 +84,6 @@
help="Number of Days to close the project issue"),
'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg",
help="Number of Days to close the project issue"),
-
}
_order = 'date desc'
def init(self, cr):
=== modified file 'hr_timesheet_sheet/report/hr_timesheet_report.py'
--- hr_timesheet_sheet/report/hr_timesheet_report.py 2010-09-23 11:45:06 +0000
+++ hr_timesheet_sheet/report/hr_timesheet_report.py 2010-10-05 12:47:41 +0000
@@ -21,6 +21,8 @@
import tools
from osv import fields,osv
+from decimal_precision import decimal_precision as dp
+
class hr_timesheet_report(osv.osv):
_name = "hr.timesheet.report"
@@ -40,7 +42,7 @@
'user_id': fields.many2one('res.users', 'User',readonly=True),
'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
'company_id': fields.many2one('res.company', 'Company',readonly=True),
- 'cost': fields.float('Cost',readonly=True),
+ 'cost': fields.float('Cost',readonly=True, digits_compute=dp.get_precision('Account')),
'quantity': fields.float('Quantity',readonly=True),
}
=== modified file 'hr_timesheet_sheet/report/timesheet_report.py'
--- hr_timesheet_sheet/report/timesheet_report.py 2010-06-07 10:49:21 +0000
+++ hr_timesheet_sheet/report/timesheet_report.py 2010-10-05 12:47:41 +0000
@@ -21,6 +21,8 @@
import tools
from osv import fields,osv
+from decimal_precision import decimal_precision as dp
+
class timesheet_report(osv.osv):
_name = "timesheet.report"
@@ -53,7 +55,7 @@
('confirm','Confirmed'),
('done','Done')], 'State', readonly=True),
'quantity': fields.float('#Quantity',readonly=True),
- 'cost': fields.float('#Cost',readonly=True),
+ 'cost': fields.float('#Cost',readonly=True, digits_compute=dp.get_precision('Account')),
}
def init(self, cr):
=== modified file 'marketing_campaign/marketing_campaign.py'
--- marketing_campaign/marketing_campaign.py 2010-09-16 15:26:24 +0000
+++ marketing_campaign/marketing_campaign.py 2010-10-05 12:47:41 +0000
@@ -28,6 +28,7 @@
from sys import exc_info
from tools.safe_eval import safe_eval as eval
import re
+from decimal_precision import decimal_precision as dp
from osv import fields, osv
import netsvc
@@ -108,7 +109,7 @@
'State',),
'activity_ids': fields.one2many('marketing.campaign.activity',
'campaign_id', 'Activities'),
- 'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for running this campaign. You may also specify variable cost and revenue on each campaign activity. Cost and Revenue statistics are included in Campaign Reporting."),
+ 'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for running this campaign. You may also specify variable cost and revenue on each campaign activity. Cost and Revenue statistics are included in Campaign Reporting.", digits_compute=dp.get_precision('Purchase Price')),
}
_defaults = {
@@ -399,8 +400,8 @@
'from_ids': fields.one2many('marketing.campaign.transition',
'activity_to_id',
'Previous Activities'),
- 'variable_cost': fields.float('Variable Cost', help="Set a variable cost if you consider that every campaign item that has reached this point has entailed a certain cost. You can get cost statistics in the Reporting section"),
- 'revenue': fields.float('Revenue', help="Set an expected revenue if you consider that every campaign item that has reached this point has generated a certain revenue. You can get revenue statistics in the Reporting section"),
+ 'variable_cost': fields.float('Variable Cost', help="Set a variable cost if you consider that every campaign item that has reached this point has entailed a certain cost. You can get cost statistics in the Reporting section", digits_compute=dp.get_precision('Purchase Price')),
+ 'revenue': fields.float('Revenue', help="Set an expected revenue if you consider that every campaign item that has reached this point has generated a certain revenue. You can get revenue statistics in the Reporting section", digits_compute=dp.get_precision('Sale Price')),
'signal': fields.char('Signal', size=128,
help='An activity with a signal can be called programmatically. Be careful, the workitem is always created when a signal is sent'),
'keep_if_condition_not_met': fields.boolean("Don't delete workitems",
=== modified file 'marketing_campaign/report/campaign_analysis.py'
--- marketing_campaign/report/campaign_analysis.py 2010-09-13 00:43:29 +0000
+++ marketing_campaign/report/campaign_analysis.py 2010-10-05 12:47:41 +0000
@@ -20,6 +20,8 @@
##############################################################################
import tools
from osv import fields, osv
+from decimal_precision import decimal_precision as dp
+
class campaign_analysis(osv.osv):
_name = "campaign.analysis"
@@ -61,8 +63,8 @@
'country_id': fields.related('partner_id','address', 'country_id',
type='many2one', relation='res.country',string='Country'),
'total_cost' : fields.function(_total_cost, string='Cost', method=True,
- type="float" ),
- 'revenue': fields.float('Revenue',digits=(16,2),readonly=True),
+ type="float", digits_compute=dp.get_precision('Purchase Price')),
+ 'revenue': fields.float('Revenue', readonly=True, digits_compute=dp.get_precision('Sale Price')),
'count' : fields.integer('# of Actions', readonly=True),
'state': fields.selection([('todo', 'To Do'),
('exception', 'Exception'), ('done', 'Done'),
=== modified file 'mrp_repair/report/order.rml'
--- mrp_repair/report/order.rml 2010-10-04 11:52:15 +0000
+++ mrp_repair/report/order.rml 2010-10-05 12:47:41 +0000
@@ -343,7 +343,7 @@
<para style="terp_default_9">Net Total :</para>
</td>
<td>
- <para style="P26">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Sale Price'))]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+ <para style="P26">[[ formatLang(o.amount_untaxed, dp='Sale Price')]] [[ o.pricelist_id.currency_id. symbol ]]</para>
</td>
</tr>
@@ -357,7 +357,7 @@
<para style="terp_default_9">Taxes:</para>
</td>
<td>
- <para style="P26">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account'))]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+ <para style="P26">[[ formatLang(o.amount_tax, dp='Account')]] [[ o.pricelist_id.currency_id. symbol ]]</para>
</td>
</tr>
<tr>
@@ -370,7 +370,7 @@
<para style="terp_tblheader_Details">Total :</para>
</td>
<td>
- <para style="terp_default_right_bold_9">[[ formatLang(total(o), digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+ <para style="terp_default_right_bold_9">[[ formatLang(total(o), dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
</td>
</tr>
</blockTable>
=== modified file 'point_of_sale/report/account_statement.rml'
--- point_of_sale/report/account_statement.rml 2010-10-04 15:13:03 +0000
+++ point_of_sale/report/account_statement.rml 2010-10-05 12:47:41 +0000
@@ -216,10 +216,10 @@
<para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date=True) ]]</para>
</td>
<td>
- <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start, dp='Account') ]][[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real, dp='Account') ]][[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -254,7 +254,7 @@
<para style="terp_default_9">[[ line_ids.partner_id.name ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line_ids.amount, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(line_ids.amount, dp='Account') ]][[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -269,7 +269,7 @@
<para style="terp_default_Right_9_Bold">Total :</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(get_total(statement.line_ids), digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(get_total(statement.line_ids), dp='Account') ]][[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
=== modified file 'point_of_sale/report/pos_details.rml'
--- point_of_sale/report/pos_details.rml 2010-09-21 05:51:40 +0000
+++ point_of_sale/report/pos_details.rml 2010-10-05 12:47:41 +0000
@@ -229,13 +229,13 @@
<para style="terp_default_9">[[ line_ids['name'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit'], dp='Sale Price') ]][[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(line_ids['discount'], dp='Sale Price') ]][[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]</para>
@@ -281,7 +281,7 @@
<para style="terp_default_9"><font face="Helvetica" size="6.0">[[ repeatIn(getpayments(data['form'],user), 'p') ]] </font>[[ p['name'] or removeParentNode('tr') ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(p['sum']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(p['sum'], dp='Account') or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -290,7 +290,7 @@
</para>
<para style="terp_default_9">
<font color="white"> </font>
- </para>
+ </para>s
<para style="terp_default_9">
<font color="white"> </font>
</para>
@@ -312,7 +312,7 @@
<para style="terp_default_Bold_9">Sales total</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(getsalestotal2(data['form'],user)) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(getsalestotal2(data['form'],user), dp='Sale Price') ]][[ company.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
@@ -328,7 +328,7 @@
<para style="terp_default_Bold_9">Total invoiced</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(getsuminvoice2(data['form'],user)) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(getsuminvoice2(data['form'],user), dp='Sale Price') ]][[ company.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
@@ -336,7 +336,7 @@
<para style="terp_default_Bold_9">Total discount</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(getsumdisc(objects)) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(getsumdisc(objects), dp='Sale Price') ]][[ company.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
@@ -344,7 +344,7 @@
<para style="terp_default_Bold_9">Total paid</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(getpaidtotal2(data['form'],user)) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(getpaidtotal2(data['form'],user), dp='Sale Price') ]][[ company.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
@@ -352,7 +352,7 @@
<para style="terp_default_Bold_9">Total of the day</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(gettotalofthaday(data['form'])) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(gettotalofthaday(data['form']), dp='Sale Price') ]][[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -360,4 +360,4 @@
<font color="white"> </font>
</para>
</story>
-</document>
\ No newline at end of file
+</document>
=== modified file 'point_of_sale/report/pos_payment_report_date.rml'
--- point_of_sale/report/pos_payment_report_date.rml 2010-09-21 06:08:49 +0000
+++ point_of_sale/report/pos_payment_report_date.rml 2010-10-05 12:47:41 +0000
@@ -158,13 +158,13 @@
<para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]] [[ company.currency_id.symbol ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(line_ids['discount'], dp='Sale Price') ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit'], dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9">[[ formatLang(line_ids['total'], dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -190,7 +190,7 @@
<para style="terp_tblheader_General_Right">Total</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(pos_payment_date_total(data['form'])) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(pos_payment_date_total(data['form']), dp='Sale Price') or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -198,4 +198,4 @@
<font color="white"> </font>
</para>
</story>
-</document>
\ No newline at end of file
+</document>
=== modified file 'project_timesheet/report/task_report.py'
--- project_timesheet/report/task_report.py 2010-09-29 08:05:01 +0000
+++ project_timesheet/report/task_report.py 2010-10-05 12:47:41 +0000
@@ -32,7 +32,7 @@
def _get_task_hours(self, cr, uid, ids, name,args,context):
result = {}
for record in self.browse(cr, uid, ids,context):
- last_date = datetime(record.name, '%Y-%m-%d') + relativedelta(months=1) - 1
+ last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - 1
task_obj=self.pool.get('project.task.work')
task_ids = task_obj.search(cr, uid, [('user_id','=',record.user_id.id),('date','>=',record.name),('date','<=',last_date.strftime('%Y-%m-%d'))])
tsk_hrs = task_obj.read(cr, uid, task_ids, ['hours','date','user_id'])
=== modified file 'purchase/report/order.rml'
--- purchase/report/order.rml 2010-10-01 14:25:28 +0000
+++ purchase/report/order.rml 2010-10-05 12:47:41 +0000
@@ -333,7 +333,7 @@
<para style="terp_default_9">Taxes :</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Purchase Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Purchase Price') ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
</td>
</tr>
<tr>
=== modified file 'purchase/report/order.sxw'
Binary files purchase/report/order.sxw 2010-09-07 06:03:10 +0000 and purchase/report/order.sxw 2010-10-05 12:47:41 +0000 differ
=== modified file 'report_intrastat/report/invoice.rml'
--- report_intrastat/report/invoice.rml 2010-10-04 07:27:25 +0000
+++ report_intrastat/report/invoice.rml 2010-10-05 12:47:41 +0000
@@ -357,7 +357,7 @@
<para style="terp_default_Right_9">[[ l.discount and formatLang (l.discount) or '' ]] </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, dp='Account') ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
@@ -488,7 +488,7 @@
<blockTable colWidths="530.0" style="Table_Main_Table">
<tr>
<td>
- <para style="terp_default_8">[[ o.amount_tax and formatLang(o.amount_tax, digits=get_digits(dp='Account')) or removeParentNode('blockTable') ]]</para>
+ <para style="terp_default_8">[[ o.amount_tax and formatLang(o.amount_tax, dp='Account') or removeParentNode('blockTable') ]]</para>
<blockTable colWidths="54.0,58.0,67.0" style="Table_Tax_Header">
<tr>
<td>
@@ -516,10 +516,10 @@
<para style="terp_default_Centre_8">[[ t.name ]]</para>
</td>
<td>
- <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]]</para>
+ <para style="terp_default_Right_8">[[ formatLang(t.base, dp='Account') ]]</para>
</td>
<td>
- <para style="terp_default_Right_8">[[ formatLang(t.amount, digits=get_digits(dp='Account')) ]]</para>
+ <para style="terp_default_Right_8">[[ formatLang(t.amount, dp='Account') ]]</para>
</td>
</tr>
</blockTable>
=== modified file 'report_intrastat/report/invoice.sxw'
Binary files report_intrastat/report/invoice.sxw 2009-03-05 12:52:29 +0000 and report_intrastat/report/invoice.sxw 2010-10-05 12:47:41 +0000 differ
=== modified file 'sale/report/sale_order.rml'
--- sale/report/sale_order.rml 2010-10-01 12:13:56 +0000
+++ sale/report/sale_order.rml 2010-10-05 12:47:41 +0000
@@ -312,7 +312,7 @@
<para style="terp_default_9">Net Total :</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
</td>
</tr>
<tr>
@@ -325,7 +325,7 @@
<para style="terp_default_9">Taxes :</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
</td>
</tr>
<tr>
@@ -338,7 +338,7 @@
<para style="terp_default_Bold_9">Total :</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]] </para>
+ <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]] </para>
</td>
</tr>
</blockTable>
=== modified file 'sale/report/sale_order.sxw'
Binary files sale/report/sale_order.sxw 2010-09-07 05:22:12 +0000 and sale/report/sale_order.sxw 2010-10-05 12:47:41 +0000 differ
=== modified file 'sale_layout/report/report_sale_layout.rml'
--- sale_layout/report/report_sale_layout.rml 2010-10-01 12:13:56 +0000
+++ sale_layout/report/report_sale_layout.rml 2010-10-05 12:47:41 +0000
@@ -318,13 +318,13 @@
<para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['product_uom'] ]]</font></para>
</td>
<td>
- <para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] </font><font>[[ formatLang(a['price_unit'], digits=get_digits(dp='Sale Price')) ]]</font></para>
- </td>
- <td>
- <para style="terp_default_Centre_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(a['discount'], digits=get_digits(dp='Sale Price')) ]]</font></para>
- </td>
- <td>
- <para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]]</font></para>
+ <para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] </font><font>[[ formatLang(a['price_unit'], dp='Sale Price') ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(a['discount'], dp='Sale Price') ]]</font></para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(a['price_subtotal'], dp='Sale Price') ]] [[ o.pricelist_id.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
@@ -397,7 +397,7 @@
<para style="terp_default_9">Taxes :</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account') ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
=== modified file 'stock/report/lot_overview.rml'
--- stock/report/lot_overview.rml 2010-10-04 10:57:07 +0000
+++ stock/report/lot_overview.rml 2010-10-05 12:47:41 +0000
@@ -167,10 +167,10 @@
<para style="terp_default_Right_9">[[formatLang( p['prod_qty']) ]] [[ p['uom'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(p['price'], digits=get_digits(dp='Account')) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Account') ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(p['price_value'], digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]]</para>
</td>
</tr>
</blockTable>
@@ -184,7 +184,7 @@
<para style="terp_default_Bold_9">Total:</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -201,7 +201,7 @@
</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
=== modified file 'stock/report/lot_overview.sxw'
Binary files stock/report/lot_overview.sxw 2010-09-08 11:02:26 +0000 and stock/report/lot_overview.sxw 2010-10-05 12:47:41 +0000 differ
=== modified file 'stock/report/lot_overview_all.rml'
--- stock/report/lot_overview_all.rml 2010-10-04 10:57:07 +0000
+++ stock/report/lot_overview_all.rml 2010-10-05 12:47:41 +0000
@@ -167,10 +167,10 @@
<para style="terp_default_Right_9">[[formatLang( p['prod_qty']) ]] [[ p['uom'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(p['price'], digits=get_digits(dp='Account')) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Account') ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(p['price_value'], digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]]</para>
</td>
</tr>
</blockTable>
@@ -184,7 +184,7 @@
<para style="terp_default_Bold_9">Total:</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -201,7 +201,7 @@
</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
=== modified file 'stock/report/lot_overview_all.sxw'
Binary files stock/report/lot_overview_all.sxw 2010-09-08 11:11:59 +0000 and stock/report/lot_overview_all.sxw 2010-10-05 12:47:41 +0000 differ
Follow ups
