diff --git a/addons/account/company.py b/addons/account/company.py index 0601b24a7a8..93b21d920a1 100644 --- a/addons/account/company.py +++ b/addons/account/company.py @@ -39,11 +39,11 @@ class res_company(osv.osv): _defaults = { 'expects_chart_of_accounts': True, - 'overdue_msg': '''Our records indicate that the payments on your account are still due. Please find details below.\n + 'overdue_msg': '''Our records indicate that the payments on your account are still due. Please find details below. \nIf the amount has already been paid, please disregard this notice. \nOtherwise, please forward us the total amount stated below. \nIf you have any queries regarding your account, Please contact us. - \nThank you in advance for your cooperation.''' + \n\nThank you in advance for your cooperation.''' } res_company() diff --git a/addons/account/report/account_print_overdue.py b/addons/account/report/account_print_overdue.py index 46fcd9af626..1b617e9afa4 100644 --- a/addons/account/report/account_print_overdue.py +++ b/addons/account/report/account_print_overdue.py @@ -83,7 +83,7 @@ class Overdue(report_sxw.rml_parse): def _message(self, obj, company): company_pool = pooler.get_pool(self.cr.dbname).get('res.company') message = company_pool.browse(self.cr, self.uid, company.id, {'lang':obj.lang}).overdue_msg - return message + return message.split('\n') report_sxw.report_sxw('report.account.overdue', 'res.partner', 'addons/account/report/account_print_overdue.rml', parser=Overdue) diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml index dbc9c76243d..e04092fb678 100644 --- a/addons/account/report/account_print_overdue.rml +++ b/addons/account/report/account_print_overdue.rml @@ -158,7 +158,11 @@ - [[ not getLines(o) and removeParentNode('para') or message(o, company) ]] +
+ [[ not getLines(o) and removeParentNode('section') or repeatIn(message(o, company), 'line') ]] + [[ line or removeParentNode('para') ]] + [[ line and removeParentNode('para') ]] +