Banque EUR
BEUR
- cash
+ bank
diff --git a/addons/l10n_ch/partner.py b/addons/l10n_ch/partner.py
index 35a4456b7fd..9301c564227 100644
--- a/addons/l10n_ch/partner.py
+++ b/addons/l10n_ch/partner.py
@@ -30,35 +30,4 @@ class res_partner(osv.osv):
}
res_partner()
-
-class res_partner_bank(osv.osv):
- _inherit = "res.partner.bank"
- _columns = {
- 'name': fields.char('Description', size=128, required=True),
- 'post_number': fields.char('Post number', size=64),
- 'bvr_adherent_num': fields.char('BVR adherent number', size=11),
- 'dta_code': fields.char('DTA code', size=5),
- }
-
- def name_get(self, cr, uid, ids, context=None):
- if not len(ids):
- return []
- bank_type_obj = self.pool.get('res.partner.bank.type')
-
- type_ids = bank_type_obj.search(cr, uid, [])
- bank_type_names = {}
- for bank_type in bank_type_obj.browse(cr, uid, type_ids,
- context=context):
- bank_type_names[bank_type.code] = bank_type.name
- res = []
- for r in self.read(cr, uid, ids, ['name','state'], context):
- res.append((r['id'], r['name']+' : '+bank_type_names[r['state']]))
- return res
-
- _sql_constraints = [
- ('bvr_adherent_uniq', 'unique (bvr_adherent_num)', 'The BVR adherent number must be unique !')
- ]
-
-res_partner_bank()
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_ch/report/bvr.mako b/addons/l10n_ch/report/bvr.mako
index 6ff8921a142..e4a2a2ea87d 100644
--- a/addons/l10n_ch/report/bvr.mako
+++ b/addons/l10n_ch/report/bvr.mako
@@ -7,6 +7,17 @@
font-weight: normal;
src: url(${police_absolute_path('ocrbb.ttf')}) format("truetype");
}
+ .ocrbb{
+ text-align:right;
+ font-family:bvrocrb;
+ font-size:${str(company.bvr_scan_line_font_size or '0.0').replace(',','.')}pt;
+ position:absolute;top:${str(company.bvr_scan_line_vert or '0.0').replace(',','.')}mm;
+ left:${str(company.bvr_scan_line_horz or '0.0').replace(',','.')}mm;
+ z-index:4;
+ letter-spacing:str(company.bvr_scan_line_letter_spacing or '0.0').replace(',','.')
+ }
+ ${css}
+
@@ -87,9 +98,41 @@
}
- ${_check(objects)}
%for inv in objects :
<% setLang(inv.partner_id.lang) %>
+
+
+ ${inv.partner_id.title.name or ''|entity} ${inv.partner_id.name |entity} |
+ ${inv.address_invoice_id.street or ''|entity} |
+ ${inv.address_invoice_id.street2 or ''|entity} |
+ ${inv.address_invoice_id.zip or ''|entity} ${inv.address_invoice_id.city or ''|entity} |
+ %if inv.address_invoice_id.country_id :
+ ${inv.address_invoice_id.country_id.name or ''|entity} |
+ %endif
+ %if inv.address_invoice_id.phone :
+ ${_("Tel") |entity}: ${inv.address_invoice_id.phone|entity} |
+ %endif
+ %if inv.address_invoice_id.fax :
+ ${_("Fax") |entity}: ${inv.address_invoice_id.fax|entity} |
+ %endif
+ %if inv.address_invoice_id.email :
+ ${_("E-mail") |entity}: ${inv.address_invoice_id.email|entity} |
+ %endif
+ %if inv.partner_id.vat :
+ ${_("VAT") |entity}: ${inv.partner_id.vat|entity} |
+ %endif
+
+
+
+ ${_('Invoice')} - ${inv.number or ''|entity}
+
+
+ ${_('Here is the BVR to allow you to pay the invoice %s - %s') % (inv.name or '', inv.number or '',)}
+
+ ${_('Regards')}
+
+
+ ${mod10r('01'+str('%.2f' % inv.amount_total).replace('.','').rjust(10,'0'))}>${_get_ref(inv)}+${inv.partner_bank_id.post_number.split('-')[0]+(str(inv.partner_bank_id.post_number.split('-')[1])).rjust(6,'0')+inv.partner_bank_id.post_number.split('-')[2]}>
@@ -103,7 +146,7 @@
| ${_space(('%.2f' % inv.amount_total)[:-3], 1)} | | ${ _space(('%.2f' % inv.amount_total)[-2:], 1)} | |
| | ${_space(('%.2f' % inv.amount_total)[:-3], 1)} | | ${ _space(('%.2f' % inv.amount_total)[-2:], 1)} | |
| |
| | |
| | |
- | ${mod10r('01'+str('%.2f' % inv.amount_total).replace('.','').rjust(10,'0'))}>${_get_ref(inv)}+${inv.partner_bank_id.post_number.split('-')[0]+(str(inv.partner_bank_id.post_number.split('-')[1])).rjust(6,'0')+inv.partner_bank_id.post_number.split('-')[2]}> |
+ | |
%endfor