diff --git a/addons/l10n_ch/bvr/report/bvr.py b/addons/l10n_ch/bvr/report/bvr.py index 78472c32685..19014ed0f42 100644 --- a/addons/l10n_ch/bvr/report/bvr.py +++ b/addons/l10n_ch/bvr/report/bvr.py @@ -49,12 +49,13 @@ class account_invoice_bvr(report_sxw.rml_parse): return res def _bank_get(self, bid): - return self.pool.get("res.partner.bank").browse(cr,uid,bid) + return self.pool.get("res.partner.bank").browse(self.cr,self.uid,bid) - def _get_ref(self, o): + def _get_ref(self, o, bid): + bank = self._bank_get(bid) res = '' - if o.bank_id.bank_code: - res = o.bank_id.bank_code + if bank.bank_code: + res = bank.bank_code return self._mod10r(res+o.number.rjust(26-len(res), '0')) def _mod10r(self,nbr): diff --git a/addons/l10n_ch/bvr/report/bvr.rml b/addons/l10n_ch/bvr/report/bvr.rml index c94c5a5e494..a8baaed6a33 100644 --- a/addons/l10n_ch/bvr/report/bvr.rml +++ b/addons/l10n_ch/bvr/report/bvr.rml @@ -132,7 +132,7 @@ [[ (o.address_invoice_id.street2 or '')]] [[ o.address_invoice_id.zip ]] [[ o.address_invoice_id.city ]] - [[ _get_ref(o) ]] + [[ _get_ref(o, data['form']['bank']) ]] [[ o.partner_id.name ]] [[ o.address_invoice_id.street ]] @@ -140,7 +140,7 @@ [[ o.address_invoice_id.zip ]] [[ o.address_invoice_id.city ]] - [[ _space(_get_ref(o)) ]] + [[ _space(_get_ref(o, data['form']['bank'])) ]] @@ -157,7 +157,7 @@ --> - 01[[mod10r('%.2f' % o.amount_total).rjust(11,'0')]]>[[ _get_ref(o) ]]+ [[_bank_get(data['form']['bank']).bvr_number.split('-')[0]+(o.bank_id.bvr_number.split('-')[1]).rjust(6,'0')+o.bank_id.bvr_number.split('-')[2] ]]> + 01[[mod10r('%.2f' % o.amount_total).rjust(11,'0')]]>[[ _get_ref(o, data['form']['bank']) ]]+ [[_bank_get(data['form']['bank']).bvr_number.split('-')[0]+(_bank_get(data['form']['bank']).bvr_number.split('-')[1]).rjust(6,'0')+_bank_get(data['form']['bank']).bvr_number.split('-')[2] ]]>