From dc3cfeda7690e97fb3d9902bf7f9152d6465c463 Mon Sep 17 00:00:00 2001 From: "nicolas.bessi@camptocamp.com" <> Date: Fri, 28 Jan 2011 11:47:11 +0100 Subject: [PATCH] [Fix] duplicated data bvr_number and post_number are the same data, modifing demo data in order to add bvr compatible bank to pass unite test. bzr revid: nicolas.bessi@camptocamp.com-20110128104711-v12s3xv48nl51reg --- addons/l10n_ch/__openerp__.py | 2 +- addons/l10n_ch/demo/demo.xml | 19 +++++++++++++++++++ addons/l10n_ch/demo/dta_demo.xml | 3 ++- addons/l10n_ch/dta_data.xml | 4 ++-- addons/l10n_ch/dta_view.xml | 2 -- addons/l10n_ch/partner.py | 1 - addons/l10n_ch/report/bvr.mako | 4 ++-- addons/l10n_ch/report/report_webkit_html.py | 2 +- addons/l10n_ch/test/l10n_ch_report.yml | 13 +------------ addons/l10n_ch/wizard/create_dta.py | 2 +- 10 files changed, 29 insertions(+), 23 deletions(-) diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py index 7beb51e0a81..60b91a06811 100644 --- a/addons/l10n_ch/__openerp__.py +++ b/addons/l10n_ch/__openerp__.py @@ -20,7 +20,7 @@ ############################################################################## { - "name" : "Switzerland localization with 2011 taxes Beta 1", + "name" : "Switzerland - localization with 2011 taxes", "description" : """ Swiss localisation : - DTA generation for a lot of payment types diff --git a/addons/l10n_ch/demo/demo.xml b/addons/l10n_ch/demo/demo.xml index 7782669d995..6b3f4a2fdc4 100644 --- a/addons/l10n_ch/demo/demo.xml +++ b/addons/l10n_ch/demo/demo.xml @@ -1,5 +1,23 @@ + + + Main Partner Bank + 234567 + + + + OpenERP BVR Account + 11-1234-1 + + bvrbank + 11-1234-1 + + CH9100767000S00023455 + 0000000 + + + My bank ! @@ -7,6 +25,7 @@ Banque + +41 31 622 13 00 Marc Dufour diff --git a/addons/l10n_ch/demo/dta_demo.xml b/addons/l10n_ch/demo/dta_demo.xml index fbfc66f642d..d2968fcf40b 100644 --- a/addons/l10n_ch/demo/dta_demo.xml +++ b/addons/l10n_ch/demo/dta_demo.xml @@ -1,6 +1,7 @@ + Fortis s.a. 123456 @@ -11,7 +12,7 @@ 123456 bvrbank - 234567 + 234567 CH9100767000S00023455 diff --git a/addons/l10n_ch/dta_data.xml b/addons/l10n_ch/dta_data.xml index 7d25dcacdde..5ef689d551c 100644 --- a/addons/l10n_ch/dta_data.xml +++ b/addons/l10n_ch/dta_data.xml @@ -89,7 +89,7 @@ - bvr_number + post_number @@ -103,7 +103,7 @@ - bvr_number + post_number diff --git a/addons/l10n_ch/dta_view.xml b/addons/l10n_ch/dta_view.xml index ea2e300d10c..869eacae6f1 100644 --- a/addons/l10n_ch/dta_view.xml +++ b/addons/l10n_ch/dta_view.xml @@ -11,7 +11,6 @@ - @@ -27,7 +26,6 @@ - diff --git a/addons/l10n_ch/partner.py b/addons/l10n_ch/partner.py index cc2097640a0..35a4456b7fd 100644 --- a/addons/l10n_ch/partner.py +++ b/addons/l10n_ch/partner.py @@ -36,7 +36,6 @@ class res_partner_bank(osv.osv): _columns = { 'name': fields.char('Description', size=128, required=True), 'post_number': fields.char('Post number', size=64), - 'bvr_number': fields.char('BVR account number', size=11), 'bvr_adherent_num': fields.char('BVR adherent number', size=11), 'dta_code': fields.char('DTA code', size=5), } diff --git a/addons/l10n_ch/report/bvr.mako b/addons/l10n_ch/report/bvr.mako index bebf943e11b..6ff8921a142 100644 --- a/addons/l10n_ch/report/bvr.mako +++ b/addons/l10n_ch/report/bvr.mako @@ -99,11 +99,11 @@ - + - +
${inv.partner_bank_id and inv.partner_bank_id.print_bank and inv.partner_bank_id.bank and inv.partner_bank_id.bank.name or ''}
${inv.partner_bank_id and inv.partner_bank_id.print_bank and inv.partner_bank_id.bank and inv.partner_bank_id.bank.name or ''}
${user.company_id.partner_id.name}
${user.company_id.partner_id.name}
${user.company_id.partner_id.address[0].street}
${user.company_id.partner_id.address[0].zip} ${user.company_id.partner_id.address[0].city}
${inv.partner_bank_id.print_account and inv.partner_bank_id.bvr_number or ''}
${user.company_id.partner_id.address[0].street}
${user.company_id.partner_id.address[0].zip} ${user.company_id.partner_id.address[0].city}
${inv.partner_bank_id.print_account and inv.partner_bank_id.bvr_number or ''}
${_space(_get_ref(inv))}
${user.company_id.partner_id.address[0].street}
${user.company_id.partner_id.address[0].zip} ${user.company_id.partner_id.address[0].city}
${inv.partner_bank_id.print_account and inv.partner_bank_id.post_number or ''}
${user.company_id.partner_id.address[0].street}
${user.company_id.partner_id.address[0].zip} ${user.company_id.partner_id.address[0].city}
${inv.partner_bank_id.print_account and inv.partner_bank_id.post_number or ''}
${_space(_get_ref(inv))}
${_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.bvr_number.split('-')[0]+(str(inv.partner_bank_id.bvr_number.split('-')[1])).rjust(6,'0')+inv.partner_bank_id.bvr_number.split('-')[2]}>
${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 diff --git a/addons/l10n_ch/report/report_webkit_html.py b/addons/l10n_ch/report/report_webkit_html.py index 5e0a1f22995..619a152405c 100644 --- a/addons/l10n_ch/report/report_webkit_html.py +++ b/addons/l10n_ch/report/report_webkit_html.py @@ -119,7 +119,7 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse): invoice_obj.name_get(cursor, self.uid, [invoice.id], context={})[0][1])) if not self._compile_check_bvr.match( - invoice.partner_bank_id.bvr_number or ''): + invoice.partner_bank_id.post_number or ''): raise wizard.except_wizard(_('UserError'), _("Your bank BVR number should be of the form 0X-XXX-X! " + 'Please check your company ' + diff --git a/addons/l10n_ch/test/l10n_ch_report.yml b/addons/l10n_ch/test/l10n_ch_report.yml index 1f4a89b93f4..7817f78883b 100644 --- a/addons/l10n_ch/test/l10n_ch_report.yml +++ b/addons/l10n_ch/test/l10n_ch_report.yml @@ -1,19 +1,8 @@ -- - Creating a res.partner.bank record -- - !record {model: res.partner.bank, id: res_partner_bank_account0}: - acc_number: 001-1001-1291-12323 - bank: base.res_bank_1 - bvr_number: 01-101-12 - name: Argolait Main Account - partner_id: base.res_partner_agrolait - sequence: 0.0 - state: bvbank - In order to test the BVR report, I will assign a bank to the invoice - !record {model: account.invoice, id: account.test_invoice_1}: - partner_bank_id: res_partner_bank_account0 + partner_bank_id: main_partner_bank - In order to test the PDF reports defined on a l10n_ch, we will print BVR Report - diff --git a/addons/l10n_ch/wizard/create_dta.py b/addons/l10n_ch/wizard/create_dta.py index 90054fdeba0..0daf4211f39 100644 --- a/addons/l10n_ch/wizard/create_dta.py +++ b/addons/l10n_ch/wizard/create_dta.py @@ -411,7 +411,7 @@ def _create_dta(obj, cr, uid, data, context=None): v['partner_post_number']= pline.bank_id.post_number \ and pline.bank_id.post_number.replace('.', '').replace('-', '') \ or False - v['partner_bvr'] = pline.bank_id.bvr_number or '' + v['partner_bvr'] = pline.bank_id.post_number or '' if v['partner_bvr']: v['partner_bvr'] = v['partner_bvr'].replace('-','') if len(v['partner_bvr']) < 9: