diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index 324cf378177..75dc04c507b 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), 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 '' ]] + [[ 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 '' ]] @@ -292,9 +292,9 @@ [[ line['move'] ]] [[ line['lname'] ]] [[ strip_name(line['line_corresp'].replace(', ',','),40) ]] - [[ formatLang(line['debit'], dp='Account') ]] - [[ formatLang(line['credit'], dp='Account') ]] - [[ formatLang(line['progress'], dp='Account') ]] [[ company.currency_id.symbol ]] + [[ 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 ]] [[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']] @@ -352,9 +352,9 @@ [[ line['move'] ]] [[ line['lname'] ]] [[ strip_name(line['line_corresp'],15) ]] - [[ formatLang(line['debit'], dp='Account') ]] - [[ formatLang(line['credit'], dp='Account') ]] - [[ formatLang(line['progress'], dp='Account') ]] [[ company.currency_id.symbol ]] + [[ 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 ]] diff --git a/addons/project/test/test_project_delegation.yml b/addons/project/test/test_project_delegation.yml index 722f58e65c2..02bc9afaae8 100644 --- a/addons/project/test/test_project_delegation.yml +++ b/addons/project/test/test_project_delegation.yml @@ -204,7 +204,7 @@ - state == "pending" - - Close the child project 'Prepare a technical reference for creating your modules' + Close the child task 'Prepare a technical reference for creating your modules' - !python {model: project.task}: | self.do_close(cr, uid, [ref("project_task_delegate_developer_book")], {"lang": "en_US", @@ -214,7 +214,7 @@ }) - - Close the child project 'Prepare a book that gives functional overview of OpenERP' + Close the child task 'Prepare a book that gives functional overview of OpenERP' - !python {model: project.task}: | self.do_close(cr, uid, [ref("project_task_delegate_openerp_tutorial")], {"lang": "en_US",