From 018709b2728d41557ec5dd364a0c5acfefcd8600 Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 11:51:31 +0200 Subject: [PATCH 04/31] [IMP] report_intrastat: 'invoice' report now uses decimal.precision (changed the sxw too and now pass 'dp' instead of calling get_digits) [related rev:4177] bzr revid: olt@tinyerp.com-20101005095131-lzsy0vodqsd7y3a4 --- addons/report_intrastat/report/invoice.rml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml index 08a1ab14fe0..e931a6d735d 100644 --- a/addons/report_intrastat/report/invoice.rml +++ b/addons/report_intrastat/report/invoice.rml @@ -357,7 +357,7 @@ [[ l.discount and formatLang (l.discount) or '' ]] - [[ formatLang(l.price_subtotal) ]] + [[ formatLang(l.price_subtotal, dp='Account') ]] [[ o.currency_id.code ]] @@ -488,7 +488,7 @@ - [[ o.amount_tax and formatLang(o.amount_tax, digits=get_digits(dp='Account')) or removeParentNode('blockTable') ]] + [[ o.amount_tax and formatLang(o.amount_tax, dp='Account') or removeParentNode('blockTable') ]] @@ -516,10 +516,10 @@ [[ t.name ]] - [[ formatLang(t.base, digits=get_digits(dp='Account')) ]] + [[ formatLang(t.base, dp='Account') ]] - [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] + [[ formatLang(t.amount, dp='Account') ]] From d85b91ce11ec5df3fb15730c6bd5a06947916231 Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 11:54:29 +0200 Subject: [PATCH 05/31] [IMP] account: 'invoice' report now uses decimal.precision (changed the sxw too and now pass 'dp' instead of calling get_digits) [related rev:4176] bzr revid: olt@tinyerp.com-20101005095429-csuj62lfymna1x4a --- addons/account/report/invoice.rml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index 173cbd1e6c4..5bfab4b7fa7 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -232,10 +232,10 @@ [[ formatLang(l.price_unit) ]][[ o.currency_id.symbol ]] - [[ formatLang(l.discount, digits=get_digits(dp='Account')) ]] + [[ formatLang(l.discount, dp='Account') ]] - [[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] + [[ formatLang(l.price_subtotal, dp='Account') ]] [[ o.currency_id.symbol ]] @@ -294,7 +294,7 @@ Taxes: - [[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount_tax, dp='Account') ]] [[ o.currency_id.symbol ]] @@ -338,7 +338,7 @@ [[ t.name ]] - [[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] + [[ formatLang(t.base, dp='Account') ]] [[ o.currency_id.symbol ]] [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]] [[ o.currency_id.symbol ]] From c678ed27758529f0804ecabb2cec8b1b74d6cb8b Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 12:04:09 +0200 Subject: [PATCH 06/31] [IMP] purchase: 'purchase order' report now uses decimal.precision (changed the sxw too and now pass 'dp' instead of calling get_digits) [related rev:4169] bzr revid: olt@tinyerp.com-20101005100409-22208s68eqqtrt0y --- addons/purchase/report/order.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index 5fbc2cbdcc2..ffde9f2cd9f 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -333,7 +333,7 @@ Taxes : - [[ formatLang(o.amount_tax, digits=get_digits(dp='Purchase Price')) ]] [[ o.pricelist_id.currency_id. symbol ]] + [[ formatLang(o.amount_tax, dp='Purchase Price') ]] [[ o.pricelist_id.currency_id. symbol ]] From 02a49e3fbc166283c009f14f234b2b0b16701274 Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 12:14:31 +0200 Subject: [PATCH 07/31] [IMP] sale: 'sale order' reports now uses decimal.precision (changed the sxw too and now pass 'dp' instead of calling get_digits) [related rev:4159] bzr revid: olt@tinyerp.com-20101005101431-ibpakl3991rrjmvd --- addons/sale/report/sale_order.rml | 6 +++--- addons/sale_layout/report/report_sale_layout.rml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml index a4eab5aa86d..0b3d811cf7c 100644 --- a/addons/sale/report/sale_order.rml +++ b/addons/sale/report/sale_order.rml @@ -312,7 +312,7 @@ Net Total : - [[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]] + [[ formatLang(o.amount_untaxed, dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]] @@ -325,7 +325,7 @@ Taxes : - [[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]] + [[ formatLang(o.amount_tax, dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]] @@ -338,7 +338,7 @@ Total : - [[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]] + [[ formatLang(o.amount_total, dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]] diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml index b01affd5329..cdab0c4d7ff 100755 --- a/addons/sale_layout/report/report_sale_layout.rml +++ b/addons/sale_layout/report/report_sale_layout.rml @@ -318,13 +318,13 @@ [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ a['product_uom'] ]] - [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] [[ formatLang(a['price_unit'], digits=get_digits(dp='Sale Price')) ]] + [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] [[ formatLang(a['price_unit'], dp='Sale Price') ]] - [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ formatLang(a['discount'], digits=get_digits(dp='Sale Price')) ]] + [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ formatLang(a['discount'], dp='Sale Price') ]] - [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]] + [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ formatLang(a['price_subtotal'], dp='Sale Price') ]] [[ o.pricelist_id.currency_id.symbol ]] From 0f5f67d62815744af29649ab35531692dbbcbf67 Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 12:16:41 +0200 Subject: [PATCH 08/31] [IMP] account_budget: 'crossovered_budget' report now uses decimal.precision (now pass 'dp' instead of calling get_digits) [related rev:4156] bzr revid: olt@tinyerp.com-20101005101641-bl50epg75822ic10 --- .../report/crossovered_budget_report.rml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/account_budget/report/crossovered_budget_report.rml b/addons/account_budget/report/crossovered_budget_report.rml index e297c8b3ca2..a62e9f1d611 100644 --- a/addons/account_budget/report/crossovered_budget_report.rml +++ b/addons/account_budget/report/crossovered_budget_report.rml @@ -148,13 +148,13 @@ [['.....' *(a['status']-1) ]][[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ a['name'] ]] - [[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['theo'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + [[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['theo'], dp='Account') ]] [[ company.currency_id.symbol ]] - [[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['pln'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + [[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['pln'], dp='Account') ]] [[ company.currency_id.symbol ]] - [[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['prac'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + [[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['prac'], dp='Account') ]] [[ company.currency_id.symbol ]] [[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['perc'], digits=2) ]]% @@ -168,13 +168,13 @@ [[ repeatIn(funct_total(data['form']),'b') ]]Total: - [[ formatLang(b['tot_theo'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + [[ formatLang(b['tot_theo'], dp='Account') ]] [[ company.currency_id.symbol ]] - [[ formatLang(b['tot_pln'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + [[ formatLang(b['tot_pln'], dp='Account') ]] [[ company.currency_id.symbol ]] - [[ formatLang(b['tot_prac'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + [[ formatLang(b['tot_prac'], dp='Account') ]] [[ company.currency_id.symbol ]] [[ formatLang(b['tot_perc'], digits=2) ]]% From 83f3a3e27503214a05f5d56b681f836935dc6252 Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 12:43:46 +0200 Subject: [PATCH 09/31] [IMP] rml reports: replaced call to get_digits by directly passing the 'dp' parameter bzr revid: olt@tinyerp.com-20101005104346-mdxiu47w4m46o2zm --- .../account_general_ledger_landscape.rml | 20 +++++++++---------- .../report/report_account_invoice_layout.rml | 10 +++++----- .../report/special_message_invoice.rml | 10 +++++----- addons/mrp_repair/report/order.rml | 6 +++--- .../report/account_statement.rml | 8 ++++---- .../sale_layout/report/report_sale_layout.rml | 2 +- addons/stock/report/lot_overview.rml | 8 ++++---- addons/stock/report/lot_overview_all.rml | 8 ++++---- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index 1321bdea750..b370b03a4ec 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -266,10 +266,10 @@ [[ '..'*(o.level-1) ]][[ o.code ]] [[ o.name ]] - [[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]] - [[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]] - [[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] - [[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]] + [[ formatLang(sum_debit_account(o), dp='Account') ]] + [[ formatLang(sum_credit_account(o), dp='Account') ]] + [[ formatLang(sum_balance_account(o), dp='Account') ]] [[ company.currency_id.symbol ]] + [[ o.currency_id and formatLang(sum_currency_amount_account(o), dp='Account') + o.currency_id.code or '' ]] @@ -292,9 +292,9 @@ [[ line['move'] ]] [[ line['lname'] ]] [[ strip_name(line['line_corresp'].replace(', ',','),40) ]] - [[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]] - [[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]] - [[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line['debit'], dp='Account') ]] + [[ formatLang(line['credit'], dp='Account') ]] + [[ formatLang(line['progress'], dp='Account') ]] [[ company.currency_id.symbol ]] [[ formatLang(line['amount_currency'] or '')]] [[ line['currency_code'] or '' ]] @@ -327,9 +327,9 @@ [[ '..'*(o.level-1) ]][[ o.code ]] [[ o.name ]] - [[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]] - [[ formatLang(sum_credit_account(o), digits=get_digits(dp=Account)) ]] - [[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + [[ formatLang(sum_debit_account(o), dp='Account') ]] + [[ formatLang(sum_credit_account(o), dp='Account') ]] + [[ formatLang(sum_balance_account(o), 'Account') ]] [[ company.currency_id.symbol ]] diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml index 3cd64a08b02..3373f6416a0 100644 --- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml +++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml @@ -376,7 +376,7 @@ Net Total: - [[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount_untaxed, dp='Account') ]] [[ o.currency_id.symbol ]] @@ -391,7 +391,7 @@ Taxes: - [[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount_tax, dp='Account') ]] [[ o.currency_id.symbol ]] @@ -406,7 +406,7 @@ Total: - [[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount_total, dp='Account') ]] [[ o.currency_id.symbol ]] @@ -445,10 +445,10 @@ [[ t.name ]] - [[ formatLang(t.base, digits=get_digits(dp='Account')) ]] + [[ formatLang(t.base, dp='Account') ]] - [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] + [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, dp='Account') ]] diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml index 8bea44a67f7..40d9fa685a4 100644 --- a/addons/account_invoice_layout/report/special_message_invoice.rml +++ b/addons/account_invoice_layout/report/special_message_invoice.rml @@ -380,7 +380,7 @@ Net Total: - [[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount_untaxed, dp='Account') ]] [[ o.currency_id.symbol ]] @@ -395,7 +395,7 @@ Taxes: - [[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount_tax, dp='Account') ]] [[ o.currency_id.symbol ]] @@ -410,7 +410,7 @@ Total: - [[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount_total, dp='Account') ]] [[ o.currency_id.symbol ]] @@ -449,10 +449,10 @@ [[ t.name ]] - [[ formatLang(t.base, digits=get_digits(dp='Account')) ]] + [[ formatLang(t.base, dp='Account') ]] - [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] + [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, dp='Account') ]] diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml index 328b5e931ee..edb3d43c7b3 100644 --- a/addons/mrp_repair/report/order.rml +++ b/addons/mrp_repair/report/order.rml @@ -343,7 +343,7 @@ Net Total : - [[ formatLang(o.amount_untaxed, digits=get_digits(dp='Sale Price'))]] [[ o.pricelist_id.currency_id. symbol ]] + [[ formatLang(o.amount_untaxed, dp='Sale Price')]] [[ o.pricelist_id.currency_id. symbol ]] @@ -357,7 +357,7 @@ Taxes: - [[ formatLang(o.amount_tax, digits=get_digits(dp='Account'))]] [[ o.pricelist_id.currency_id. symbol ]] + [[ formatLang(o.amount_tax, dp='Account')]] [[ o.pricelist_id.currency_id. symbol ]] @@ -370,7 +370,7 @@ Total : - [[ formatLang(total(o), digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]] + [[ formatLang(total(o), dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]] diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml index ed26143aa4e..024dd65f186 100644 --- a/addons/point_of_sale/report/account_statement.rml +++ b/addons/point_of_sale/report/account_statement.rml @@ -216,10 +216,10 @@ [[ formatLang(statement.closing_date,date=True) ]] - [[ formatLang(statement.balance_start, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]] + [[ formatLang(statement.balance_start, dp='Account') ]][[ company.currency_id.symbol ]] - [[ formatLang(statement.balance_end_real, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]] + [[ formatLang(statement.balance_end_real, dp='Account') ]][[ company.currency_id.symbol ]] @@ -254,7 +254,7 @@ [[ line_ids.partner_id.name ]] - [[ formatLang(line_ids.amount, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]] + [[ formatLang(line_ids.amount, dp='Account') ]][[ company.currency_id.symbol ]] @@ -269,7 +269,7 @@ Total : - [[ formatLang(get_total(statement.line_ids), digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_total(statement.line_ids), dp='Account') ]][[ company.currency_id.symbol ]] diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml index cdab0c4d7ff..0a499b01e3a 100755 --- a/addons/sale_layout/report/report_sale_layout.rml +++ b/addons/sale_layout/report/report_sale_layout.rml @@ -397,7 +397,7 @@ Taxes : - [[ formatLang(o.amount_tax, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id.symbol ]] + [[ formatLang(o.amount_tax, dp='Account') ]] [[ o.pricelist_id.currency_id.symbol ]] diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml index cebacedeb01..79749d270e4 100644 --- a/addons/stock/report/lot_overview.rml +++ b/addons/stock/report/lot_overview.rml @@ -167,10 +167,10 @@ [[formatLang( p['prod_qty']) ]] [[ p['uom'] ]] - [[ formatLang(p['price'], digits=get_digits(dp='Account')) ]] + [[ formatLang(p['price'], dp='Account') ]] - [[ formatLang(p['price_value'], digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol]] + [[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]] @@ -184,7 +184,7 @@ Total: - [[ formatLang(price_total(), digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]] @@ -201,7 +201,7 @@ - [[ formatLang(grand_total_price(), digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]] diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml index 4c4c71561a2..d4e60823e0d 100644 --- a/addons/stock/report/lot_overview_all.rml +++ b/addons/stock/report/lot_overview_all.rml @@ -167,10 +167,10 @@ [[formatLang( p['prod_qty']) ]] [[ p['uom'] ]] - [[ formatLang(p['price'], digits=get_digits(dp='Account')) ]] + [[ formatLang(p['price'], dp='Account') ]] - [[ formatLang(p['price_value'], digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol]] + [[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]] @@ -184,7 +184,7 @@ Total: - [[ formatLang(price_total(), digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]] @@ -201,7 +201,7 @@ - [[ formatLang(grand_total_price(), digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]] From b2b6c4b3eaeb4241dde4e171eb4cc0d6754f72e4 Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 09:10:57 +0200 Subject: [PATCH 10/31] [FIX] base_iban: no 'bank' field in res.partner.bank.type bzr revid: olt@tinyerp.com-20101005071057-1pzk0dhv60h3iy2n --- addons/base_iban/base_iban_data.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/base_iban/base_iban_data.xml b/addons/base_iban/base_iban_data.xml index 4269bb83ac6..dae3999505e 100644 --- a/addons/base_iban/base_iban_data.xml +++ b/addons/base_iban/base_iban_data.xml @@ -3,12 +3,11 @@ + Default bank account description + --> IBAN Account iban - iban From f233bd317ab0489302f75a5d38da270bb7740d6c Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 13:19:29 +0200 Subject: [PATCH 20/31] [IMP] hr_payroll: 'payslip' report now uses decimal.precision bzr revid: olt@tinyerp.com-20101005111929-ij6mgz6a3fkechm6 --- addons/hr_payroll/hr_payroll.py | 7 +++--- addons/hr_payroll/report/payslip.rml | 26 +++++++++++----------- addons/hr_payroll/report/report_payslip.py | 13 ----------- 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index d7de7efbcbc..7ce1faace82 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -27,6 +27,7 @@ import netsvc from osv import fields, osv from tools import config from tools.translate import _ +import decimal_precision as dp @@ -774,9 +775,9 @@ class hr_payslip(osv.osv): ('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)), diff --git a/addons/hr_payroll/report/payslip.rml b/addons/hr_payroll/report/payslip.rml index 58b2fd81275..075023638f3 100755 --- a/addons/hr_payroll/report/payslip.rml +++ b/addons/hr_payroll/report/payslip.rml @@ -392,19 +392,19 @@ Basic Salary - [[ formatLang(o.basic_before_leaves) ]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(o.basic_before_leaves, dp='Account') ]] [[ o.company_id.currency_id.symbol ]] Leaved Deduction - [[ o.leaves or '' ]] + [[ formatLang(o.leaves, dp='Account') ]] [[ o.company_id.currency_id.symbol ]] Basic Salary – Leaves - [[ formatLang(o.basic) ]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(o.basic, dp='Account') ]] [[ o.company_id.currency_id.symbol ]] @@ -433,7 +433,7 @@ [[ ld.code ]] - [[ formatLang(ld.total) ]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(ld.total, dp='Account') ]] [[ o.company_id.currency_id.symbol ]] @@ -463,7 +463,7 @@ Basic Salary - [[ formatLang(o.basic) ]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(o.basic, dp='Account') ]] [[ o.company_id.currency_id.symbol ]] @@ -471,7 +471,7 @@ [[repeatIn(get_earnings(o.line_ids),'a') ]] [[ a.code or removeParentNode('tr') ]] - [[ formatLang(a.total) ]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(a.total, dp='Account') ]] [[ o.company_id.currency_id.symbol ]] @@ -488,7 +488,7 @@ [[ b.code ]] - [[ formatLang(b.total) ]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(b.total, dp='Account') ]] [[ o.company_id.currency_id.symbol ]] @@ -508,13 +508,13 @@ Total Earnings([[ o.company_id.currency_id.code ]]) - [[ formatLang(o.allounce + o.basic) ]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(o.allounce + o.basic, dp='Account') ]] [[ o.company_id.currency_id.symbol ]] Total Deductions([[ o.company_id.currency_id.code ]]) - [[ formatLang(o.deduction) ]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(o.deduction, dp='Account') ]] [[ o.company_id.currency_id.symbol ]] @@ -542,10 +542,10 @@ [[ ol.type in ['advance','loan','otherpay','otherdeduct','installment'] and ol.code or '' ]] - [[ 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 '' ]] + [[ 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 '' ]] - [[ ol.type in ['otherdeduct','installment'] and formatLang(ol.total) or '' ]] [[ ol.type in ['advance','loan','otherpay'] and o.company_id.currency_id.symbol or '' ]] + [[ 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 '' ]] @@ -561,7 +561,7 @@ Net Amount([[ o.company_id.currency_id.code ]]) - [[ formatLang(o.net) ]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(o.net, dp='Account') ]] [[ o.company_id.currency_id.symbol ]] @@ -609,4 +609,4 @@ - \ No newline at end of file + diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py index e818e0f3727..c0d3946d3ef 100755 --- a/addons/hr_payroll/report/report_payslip.py +++ b/addons/hr_payroll/report/report_payslip.py @@ -99,18 +99,5 @@ class payslip_report(report_sxw.rml_parse): 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: - - - - - - - - From c4ef37b82a45fb12ff5076be8eda021411cd02cd Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 13:23:11 +0200 Subject: [PATCH 21/31] [IMP] hr_payroll: 'bank payment advice' report now uses decimal.precision bzr revid: olt@tinyerp.com-20101005112311-3ofe7d0mgt04gnsj --- addons/hr_payroll/report/report_payroll_advice.rml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/hr_payroll/report/report_payroll_advice.rml b/addons/hr_payroll/report/report_payroll_advice.rml index ff793469284..5264b41f003 100644 --- a/addons/hr_payroll/report/report_payroll_advice.rml +++ b/addons/hr_payroll/report/report_payroll_advice.rml @@ -229,10 +229,10 @@ [[ line['name'] ]] - [[ formatLang(line['amount' ]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line['amount'], dp='Account') ]] [[ company.currency_id.symbol ]] - [[ formatLang(line['bysal']) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line['bysal'], dp='Account') ]] [[ company.currency_id.symbol ]] [[ line['acc_no'] ]] @@ -260,10 +260,10 @@ Total([[ company.currency_id.code ]]): - [[ formatLang(get_total()) ]] [[ company.currency_id.symbol ]] + [[ formatLang(get_total(), dp='Account') ]] [[ company.currency_id.symbol ]] - [[ formatLang(get_bysal_total()) ]] [[ company.currency_id.symbol ]] + [[ formatLang(get_bysal_total(), dp='Account') ]] [[ company.currency_id.symbol ]] From 4e7dfb38434aa53a399895372ea49b393b782d86 Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 13:26:15 +0200 Subject: [PATCH 22/31] [IMP] hr_payroll: 'salary payment register' report now uses decimal.precision bzr revid: olt@tinyerp.com-20101005112615-kmorvnwp7cm9yavu --- addons/hr_payroll/report/payroll_register.rml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/addons/hr_payroll/report/payroll_register.rml b/addons/hr_payroll/report/payroll_register.rml index d7df0ada7cc..f5ec73cede4 100644 --- a/addons/hr_payroll/report/payroll_register.rml +++ b/addons/hr_payroll/report/payroll_register.rml @@ -179,22 +179,22 @@ [[ l.employee_id.name ]] - [[ formatLang(l.basic) ]] [[ company.currency_id.symbol]] + [[ formatLang(l.basic, dp='Account') ]] [[ company.currency_id.symbol]] - [[ formatLang(l.other_pay)]] [[ company.currency_id.symbol]] + [[ formatLang(l.other_pay, dp='Account')]] [[ company.currency_id.symbol]] - [[ formatLang(l.allounce)]] [[ company.currency_id.symbol]] + [[ formatLang(l.allounce, dp='Account')]] [[ company.currency_id.symbol]] - [[ formatLang(l.grows)]] [[ company.currency_id.symbol]] + [[ formatLang(l.grows, dp='Account')]] [[ company.currency_id.symbol]] - [[ formatLang(l.deduction)]] [[ company.currency_id.symbol]] + [[ formatLang(l.deduction, dp='Account')]] [[ company.currency_id.symbol]] - [[ formatLang(l.net)]] [[ company.currency_id.symbol]] + [[ formatLang(l.net, dp='Account')]] [[ company.currency_id.symbol]] @@ -213,22 +213,22 @@ Total SAL([[ company.currency_id.code]]) - [[formatLang(get_basic())]][[ company.currency_id.symbol]] + [[formatLang(get_basic(), dp='Account')]][[ company.currency_id.symbol]] - [[formatLang(get_other())]] [[ company.currency_id.symbol]] + [[formatLang(get_other(), dp='Account')]] [[ company.currency_id.symbol]] - [[formatLang(get_allow())]] [[ company.currency_id.symbol]] + [[formatLang(get_allow(), dp='Account')]] [[ company.currency_id.symbol]] - [[formatLang(get_grows())]] [[ company.currency_id.symbol]] + [[formatLang(get_grows(), dp='Account')]] [[ company.currency_id.symbol]] - [[formatLang(get_deduct())]] [[ company.currency_id.symbol]] + [[formatLang(get_deduct(), dp='Account')]] [[ company.currency_id.symbol]] - [[formatLang(get_net())]] [[ company.currency_id.symbol]] + [[formatLang(get_net(), dp='Account')]] [[ company.currency_id.symbol]] @@ -265,4 +265,4 @@ - \ No newline at end of file + From e4ecbb0a71e3101b8dd9633db312a98ec208b3b7 Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 13:34:21 +0200 Subject: [PATCH 23/31] [IMP] hr: 'exepnse', 'recruitment' and 'timesheet' dynamic reports now uses decimal.precision bzr revid: olt@tinyerp.com-20101005113421-8svidbt2oflfkzsj --- addons/hr_expense/report/hr_expense_report.py | 5 +++-- addons/hr_recruitment/report/hr_recruitment_report.py | 9 +++++---- addons/hr_timesheet_sheet/report/hr_timesheet_report.py | 4 +++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py index 1de708d2beb..304787b7563 100644 --- a/addons/hr_expense/report/hr_expense_report.py +++ b/addons/hr_expense/report/hr_expense_report.py @@ -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 @@ class hr_expense_report(osv.osv): '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), diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py index 2a2ab8fce2b..67da3e35577 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report.py +++ b/addons/hr_recruitment/report/hr_recruitment_report.py @@ -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 @@ class hr_recruitment_report(osv.osv): '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 @@ class hr_recruitment_report(osv.osv): 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): diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py index 84ef868ab81..d20ad3a5f4c 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py @@ -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 @@ class hr_timesheet_report(osv.osv): '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), } From ae5b993dce95dcca373e91e88a4cefbbad2c2510 Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 13:43:38 +0200 Subject: [PATCH 24/31] [FIX] report.timesheet.task.user: fixed an error in date string parsing bzr revid: olt@tinyerp.com-20101005114338-s541m8y3u1v81z9g --- addons/project_timesheet/report/task_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_timesheet/report/task_report.py b/addons/project_timesheet/report/task_report.py index 261f4e17c64..5ebaa1d1b69 100644 --- a/addons/project_timesheet/report/task_report.py +++ b/addons/project_timesheet/report/task_report.py @@ -32,7 +32,7 @@ class report_timesheet_task_user(osv.osv): 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']) From 73b83e84c59870cd2812a69541951741b559e411 Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 13:44:09 +0200 Subject: [PATCH 25/31] [IMP] hr_timesheet_sheet: timesheet report now uses decimal.precision bzr revid: olt@tinyerp.com-20101005114409-kc22r86oduvc2qs6 --- addons/hr_timesheet_sheet/report/timesheet_report.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py index a8c0440a053..2148f370560 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report.py +++ b/addons/hr_timesheet_sheet/report/timesheet_report.py @@ -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 @@ class timesheet_report(osv.osv): ('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): From e9bed69abe04daded640d59b738dd62490abc71a Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 13:53:38 +0200 Subject: [PATCH 26/31] [IMP] hr_payroll: employee salary detail report now uses decimal.precision bzr revid: olt@tinyerp.com-20101005115338-kec4ru1drsyjaor3 --- .../report/report_employees_detail.rml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml index 1988d932ce2..fcb98ef2b6d 100644 --- a/addons/hr_payroll/report/report_employees_detail.rml +++ b/addons/hr_payroll/report/report_employees_detail.rml @@ -572,46 +572,46 @@ - [[ get_monthly_total()[0] ]] + [[ get_monthly_total()[0]+'xxx' ]] - [[ formatLang(get_monthly_total()[1]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[1], dp='Account') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[2]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[2], dp='Account') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[3]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[3], dp='Account') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[4]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[4], dp='Account') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[5]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[5], dp='Account') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[6]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[6], dp='Account') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[7]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[7], dp='Account') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[8]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[8], dp='Account') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[9]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[9], dp='Account') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[10]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[10], dp='Account') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[11]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[11], dp='Account') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[12]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[12], dp='Account') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_total()) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_total(), dp='Account') ]][[ company.currency_id.symbol ]] From bd438c2c65bf40f3811693313b8a1bdcc25d800a Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 13:56:31 +0200 Subject: [PATCH 27/31] [IMP] hr_payroll: yearly salary detail report now uses decimal.precision bzr revid: olt@tinyerp.com-20101005115631-ytlplyukezcqi717 --- .../report/report_employees_detail.rml | 2 +- .../hr_payroll/report/report_year_report.rml | 52 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml index fcb98ef2b6d..c1b91ce5910 100644 --- a/addons/hr_payroll/report/report_employees_detail.rml +++ b/addons/hr_payroll/report/report_employees_detail.rml @@ -572,7 +572,7 @@ - [[ get_monthly_total()[0]+'xxx' ]] + [[ get_monthly_total()[0] ]] [[ formatLang(get_monthly_total()[1], dp='Account') ]][[ company.currency_id.symbol ]] diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml index 4c32436955a..77762c6cfcc 100755 --- a/addons/hr_payroll/report/report_year_report.rml +++ b/addons/hr_payroll/report/report_year_report.rml @@ -191,43 +191,43 @@ [[ e[0] ]] - [[ formatLang(e[1]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[1], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(e[2]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[2], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(e[3]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[3], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(e[4]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[4], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(e[5]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[5], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(e[6]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[6], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(e[7]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[7], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(e[8]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[8], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(e[9]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[9], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(e[10]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[10], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(e[11]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[11], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(e[12]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[12], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(e[13]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[13], dp='Account') ]] [[company.currency_id.symbol]] @@ -250,43 +250,43 @@ Total([[company.currency_id.code]]) - [[ formatLang(t[1]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[1], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(t[2]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[2], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(t[3]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[3], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(t[4]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[4], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(t[5]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[5], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(t[6]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[6], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(t[7]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[7], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(t[8]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[8], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(t[9]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[9], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(t[10]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[10], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(t[11]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[11], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(t[12]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[12], dp='Account') ]] [[company.currency_id.symbol]] - [[ formatLang(get_total()) ]] [[company.currency_id.symbol]] + [[ formatLang(get_total(), dp='Account') ]] [[company.currency_id.symbol]] From b7232380928c341b49723f183fb73d5008005dbe Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 14:09:06 +0200 Subject: [PATCH 28/31] [IMP] point_of_sale: detail of sales report now uses decimal.precision bzr revid: olt@tinyerp.com-20101005120906-3f167keib40njq54 --- addons/point_of_sale/report/pos_details.rml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml index f3bebade402..9bb241387b5 100644 --- a/addons/point_of_sale/report/pos_details.rml +++ b/addons/point_of_sale/report/pos_details.rml @@ -229,13 +229,13 @@ [[ line_ids['name'] ]] - [[ formatLang(line_ids['price_unit']) ]][[ company.currency_id.symbol ]] + [[ formatLang(line_ids['price_unit'], dp='Sale Price') ]][[ company.currency_id.symbol ]] [[ formatLang(line_ids['qty']) ]] - [[ formatLang(line_ids['discount']) ]][[ company.currency_id.symbol ]] + [[ formatLang(line_ids['discount'], dp='Sale Price') ]][[ company.currency_id.symbol ]] [[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]] @@ -281,7 +281,7 @@ [[ repeatIn(getpayments(data['form'],user), 'p') ]] [[ p['name'] or removeParentNode('tr') ]] - [[ formatLang(p['sum']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]] + [[ formatLang(p['sum'], dp='Account') or removeParentNode('tr') ]] [[ company.currency_id.symbol ]] @@ -290,7 +290,7 @@ - + s @@ -312,7 +312,7 @@ Sales total - [[ formatLang(getsalestotal2(data['form'],user)) ]][[ company.currency_id.symbol ]] + [[ formatLang(getsalestotal2(data['form'],user), dp='Sale Price') ]][[ company.currency_id.symbol ]] @@ -328,7 +328,7 @@ Total invoiced - [[ formatLang(getsuminvoice2(data['form'],user)) ]][[ company.currency_id.symbol ]] + [[ formatLang(getsuminvoice2(data['form'],user), dp='Sale Price') ]][[ company.currency_id.symbol ]] @@ -336,7 +336,7 @@ Total discount - [[ formatLang(getsumdisc(objects)) ]][[ company.currency_id.symbol ]] + [[ formatLang(getsumdisc(objects), dp='Sale Price') ]][[ company.currency_id.symbol ]] @@ -344,7 +344,7 @@ Total paid - [[ formatLang(getpaidtotal2(data['form'],user)) ]][[ company.currency_id.symbol ]] + [[ formatLang(getpaidtotal2(data['form'],user), dp='Sale Price') ]][[ company.currency_id.symbol ]] @@ -352,7 +352,7 @@ Total of the day - [[ formatLang(gettotalofthaday(data['form'])) ]][[ company.currency_id.symbol ]] + [[ formatLang(gettotalofthaday(data['form']), dp='Sale Price') ]][[ company.currency_id.symbol ]] @@ -360,4 +360,4 @@ - \ No newline at end of file + From 3703b886bff2e1af1f44674bed8eff923d2dfd06 Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 14:16:51 +0200 Subject: [PATCH 29/31] [IMP] point_of_sale: 'Sales Lines' report now uses decimal.precision bzr revid: olt@tinyerp.com-20101005121651-vbn7jl71aa2w74la --- .../point_of_sale/report/pos_payment_report_date.rml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml index 846eaf1f861..9d132fbfbf0 100644 --- a/addons/point_of_sale/report/pos_payment_report_date.rml +++ b/addons/point_of_sale/report/pos_payment_report_date.rml @@ -158,13 +158,13 @@ [[ formatLang(line_ids['qty']) ]] - [[ formatLang(line_ids['discount']) ]] + [[ formatLang(line_ids['discount'], dp='Sale Price') ]] - [[ formatLang(line_ids['price_unit']) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line_ids['price_unit'], dp='Sale Price') ]] [[ company.currency_id.symbol ]] - [[ formatLang(line_ids['total']) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line_ids['total'], dp='Sale Price') ]] [[ company.currency_id.symbol ]] @@ -190,7 +190,7 @@ Total - [[ formatLang(pos_payment_date_total(data['form'])) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]] + [[ formatLang(pos_payment_date_total(data['form']), dp='Sale Price') or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]] @@ -198,4 +198,4 @@ - \ No newline at end of file + From aaa9f12702dfa0afd96806d4716b69a17e77738d Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 5 Oct 2010 14:29:35 +0200 Subject: [PATCH 30/31] [IMP] marketing: now uses decimal.precision bzr revid: olt@tinyerp.com-20101005122935-qe6yghvx37itxwzw --- addons/marketing_campaign/marketing_campaign.py | 7 ++++--- addons/marketing_campaign/report/campaign_analysis.py | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py index bdfe825781c..c62b5306c57 100644 --- a/addons/marketing_campaign/marketing_campaign.py +++ b/addons/marketing_campaign/marketing_campaign.py @@ -28,6 +28,7 @@ from traceback import format_exception 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 @@ Normal - the campaign runs normally and automatically sends all emails and repor '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 @@ class marketing_campaign_activity(osv.osv): '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", diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py index 066423c546c..08f0599fb24 100644 --- a/addons/marketing_campaign/report/campaign_analysis.py +++ b/addons/marketing_campaign/report/campaign_analysis.py @@ -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 @@ class campaign_analysis(osv.osv): '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'), From 4750ff6cb843fc6b4a88f140afbca2b9f7c7e944 Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Wed, 6 Oct 2010 09:31:04 +0200 Subject: [PATCH 31/31] [FIX] account: account_general_ledger_landscape report: wrong argument passing to formatLang bzr revid: olt@tinyerp.com-20101006073104-forhzegtyvelzgtg --- addons/account/report/account_general_ledger_landscape.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index b370b03a4ec..40f8ad4a85e 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -329,7 +329,7 @@ [[ formatLang(sum_debit_account(o), dp='Account') ]] [[ formatLang(sum_credit_account(o), dp='Account') ]] - [[ formatLang(sum_balance_account(o), 'Account') ]] [[ company.currency_id.symbol ]] + [[ formatLang(sum_balance_account(o), dp='Account') ]] [[ company.currency_id.symbol ]]