diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml index e62b07b13fe..12a125fa32b 100644 --- a/addons/account_payment/report/order.rml +++ b/addons/account_payment/report/order.rml @@ -141,7 +141,7 @@ Used Account - [[ o.mode.bank_id.name or '-' ]] + [[ get_account_name(o.mode.bank_id.id) ]] @@ -223,7 +223,7 @@ [[line.partner_id and line.partner_id.name or '-' ]] - [[ line.bank_id and line.bank_id.name or '-' ]] + [[ get_account_name(line.bank_id.id) or '-']] [[ get_invoice_name(line.ml_inv_ref.id) or '-' ]] diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py index c7d35a81ff4..e82bae991df 100644 --- a/addons/account_payment/report/payment_order.py +++ b/addons/account_payment/report/payment_order.py @@ -34,6 +34,7 @@ class payment_order(report_sxw.rml_parse): 'get_company_currency' : self._get_company_currency, 'get_amount_total_in_currency' : self._get_amount_total_in_currency, 'get_amount_total' : self._get_amount_total, + 'get_account_name' : self._get_account_name, }) def _get_invoice_name(self, invoice_id): @@ -69,7 +70,15 @@ class payment_order(report_sxw.rml_parse): pool = pooler.get_pool(self.cr.dbname) user = pool.get('res.users').browse(self.cr, self.uid, self.uid) return user.company_id and user.company_id.currency_id and user.company_id.currency_id.name or False + + def _get_account_name(self,bank_id): + if bank_id: + pool = pooler.get_pool(self.cr.dbname) + value_name = pool.get('res.partner.bank').name_get(self.cr, self.uid, [bank_id]) + if value_name: + return value_name[0][1] + return False report_sxw.report_sxw('report.payment.order', 'payment.order', 'addons/account_payment/report/payment_order.rml', parser=payment_order, header="internal") -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file