odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Bugfix BVR 

bzr revid: pinky-35b45994d08bb0f609687fc22a27cacb1f409503
This commit is contained in:
pinky 2007-01-16 14:07:35 +00:00
parent 11c46231b8
commit ad1032e992
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/l10n_ch/bvr/report/bvr.py
View File

@ -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):

6
addons/l10n_ch/bvr/report/bvr.rml
View File

@ -132,7 +132,7 @@
<drawString x="5.5mm" y="26mm">[[ (o.address_invoice_id.street2 or '')]]</drawString>
<drawString x="5.5mm" y="22mm">[[ o.address_invoice_id.zip ]] [[ o.address_invoice_id.city ]]</drawString>
<drawString x="5.5mm" y="40mm">[[ _get_ref(o) ]]</drawString>
<drawString x="5.5mm" y="40mm">[[ _get_ref(o, data['form']['bank']) ]]</drawString>
<drawString x="126mm" y="51mm">[[ o.partner_id.name ]]</drawString>
<drawString x="126mm" y="47mm">[[ o.address_invoice_id.street ]]</drawString>
@ -140,7 +140,7 @@
<drawString x="126mm" y="39mm">[[ o.address_invoice_id.zip ]] [[ o.address_invoice_id.city ]]</drawString>
<setFont name="ocrb" size="11"/>
<drawString x="124mm" y="67.5mm">[[ _space(_get_ref(o)) ]]</drawString>
<drawString x="124mm" y="67.5mm">[[ _space(_get_ref(o, data['form']['bank'])) ]]</drawString>
<setFont name="ocrb" size="12"/>
@ -157,7 +157,7 @@
-->
<setFont name="ocrb" size="11.5"/>
<drawString x="66.72mm" y="16.20mm">01[[mod10r('%.2f' % o.amount_total).rjust(11,'0')]]&gt;[[ _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] ]]&gt;</drawString>
<drawString x="66.72mm" y="16.20mm">01[[mod10r('%.2f' % o.amount_total).rjust(11,'0')]]&gt;[[ _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] ]]&gt;</drawString>
</illustration>
<frameEnd/>