[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

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 @@
 <openerp>
 <data noupdate="1">
+    
+        <record model="res.bank" id="main_bank">
+            <field name="name">Main Partner Bank</field>
+            <field name="clearing">234567</field>
+        </record>
+
+        <record model="res.partner.bank" id="main_partner_bank">
+            <field name="name">OpenERP BVR Account</field>
+            <field name="acc_number">11-1234-1</field>
+            <field name="partner_id" ref="base.main_partner"/>
+            <field name="state">bvrbank</field>
+            <field name="post_number">11-1234-1</field>
+            <field name="bank" ref="main_bank"/>
+            <field name="iban">CH9100767000S00023455</field>
+            <field name="bvr_adherent_num">0000000</field>
+            
+            
+        </record>
 
         <record id="bank" model="res.partner">
                 <field name="comment">My bank !</field>
@@ -7,6 +25,7 @@
                 <field name="name">Banque</field>
                 <field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
         </record>
+        
         <record id="res_partner_address_bank1" model="res.partner.address">
             <field name="fax">+41 31 622 13 00</field>
             <field name="name">Marc Dufour</field>
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 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
+    <!-- Transform into YAML for testing -->
     <record model="res.bank" id="partner_bank">
         <field name="name">Fortis s.a.</field>
         <field name="clearing">123456</field>
@@ -11,7 +12,7 @@
         <field name="acc_number">123456</field>
         <field name="partner_id" ref="base.res_partner_agrolait"/>
         <field name="state">bvrbank</field>
-        <field name="bvr_number">234567</field>
+        <field name="post_number">234567</field>
         <field name="bank" ref="partner_bank"/>
         <field name="iban">CH9100767000S00023455</field>
     </record>
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 @@
     <field name="readonly" eval="False"/>
   </record>
   <record model="res.partner.bank.type.field" id="bvr_num_field_bvrbank">
-    <field name="name">bvr_number</field>
+    <field name="name">post_number</field>
     <field name="bank_type_id" ref="bvrbank"/>
     <field name="required" eval="True"/>
     <field name="readonly" eval="False"/>
@@ -103,7 +103,7 @@
     <field name="readonly" eval="False"/>
   </record>
   <record model="res.partner.bank.type.field" id="bvr_num_field_bvrpost">
-    <field name="name">bvr_number</field>
+    <field name="name">post_number</field>
     <field name="bank_type_id" ref="bvrpost"/>
     <field name="required" eval="True"/>
     <field name="readonly" eval="False"/>
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 @@
             <field name="arch" type="xml">
                 <field name="acc_number" position="after">
                     <newline/>
-                    <field name="bvr_number"/>
                     <field name="bvr_adherent_num"/>
                     <field name="post_number"/>
                     <field name="dta_code"/>
@@ -27,7 +26,6 @@
             <field name="arch" type="xml">
                 <field name="acc_number" position="after">
                     <newline/>
-                    <field name="bvr_number"/>
                     <field name="bvr_adherent_num"/>
                     <field name="post_number"/>
                     <field name="dta_code"/>
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 @@
     <table name="bvrframe"  id="${inv.id}" style="width:210mm;height:106mm;border-collapse:collapse;padding-left:3mm;font-family:Helvetica;font-size:8pt;border-width:0px" border="0" CELLPADDING="0" CELLSPACING="0"> <!--border-width:1px;border-style:solid;border-color:black;-->
         <tr style="height:16.933333mm;vertical-align:bottom;padding-bottom:3mm"><td style="width:60.14mm;padding-bottom:3mm"><div style="padding-left:3mm;">${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 ''}</div></td><td style="width:60.96mm;padding-bottom:3mm"><div style="padding-left:3mm;">${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 ''}</div></td><td style="width:88.9mm"></td></tr>
         <tr style="height:12.7mm;vertical-align:bottom;padding-bottom:3mm"><td style="width:60.14mm;padding-bottom:3mm"><div style="padding-left:3mm;"><b>${user.company_id.partner_id.name}</b></div></td><td style="width:60.96mm;padding-bottom:3mm"><div style="padding-left:3mm;"><b>${user.company_id.partner_id.name}</b></div></td><td style="width:88.9mm"></td></tr>
-        <tr style="height:16.933333mm;vertical-align:bottom;padding-bottom:0"><td><table style="padding-left:3mm;font-family:Helvetica;font-size:8pt" height="100%"><tr style="vertical-align:top;padding-bottom:0"><td>${user.company_id.partner_id.address[0].street}<br/> ${user.company_id.partner_id.address[0].zip} ${user.company_id.partner_id.address[0].city}</td></tr><tr style="vertical-align:bottom;padding-bottom:0"><td><div style="padding-left:30.48mm;">${inv.partner_bank_id.print_account and inv.partner_bank_id.bvr_number or ''}</div></td></tr></table></td><td style="padding-left:3mm"><table style="padding-left:3mm;font-family:Helvetica;font-size:8pt" height="100%"><tr style="vertical-align:top;padding-bottom:0"><td>${user.company_id.partner_id.address[0].street}<br/>${user.company_id.partner_id.address[0].zip} ${user.company_id.partner_id.address[0].city}</td></tr><tr style="vertical-align:bottom;padding-bottom:0"><td><div style="padding-left:30.48mm;">${inv.partner_bank_id.print_account and inv.partner_bank_id.bvr_number or ''}</div></td></tr></table></td><td style="text-align: right;padding-right:4mm;padding-bottom:8mm;font-size:11pt">${_space(_get_ref(inv))}</td></tr>
+        <tr style="height:16.933333mm;vertical-align:bottom;padding-bottom:0"><td><table style="padding-left:3mm;font-family:Helvetica;font-size:8pt" height="100%"><tr style="vertical-align:top;padding-bottom:0"><td>${user.company_id.partner_id.address[0].street}<br/> ${user.company_id.partner_id.address[0].zip} ${user.company_id.partner_id.address[0].city}</td></tr><tr style="vertical-align:bottom;padding-bottom:0"><td><div style="padding-left:30.48mm;">${inv.partner_bank_id.print_account and inv.partner_bank_id.post_number or ''}</div></td></tr></table></td><td style="padding-left:3mm"><table style="padding-left:3mm;font-family:Helvetica;font-size:8pt" height="100%"><tr style="vertical-align:top;padding-bottom:0"><td>${user.company_id.partner_id.address[0].street}<br/>${user.company_id.partner_id.address[0].zip} ${user.company_id.partner_id.address[0].city}</td></tr><tr style="vertical-align:bottom;padding-bottom:0"><td><div style="padding-left:30.48mm;">${inv.partner_bank_id.print_account and inv.partner_bank_id.post_number or ''}</div></td></tr></table></td><td style="text-align: right;padding-right:4mm;padding-bottom:8mm;font-size:11pt">${_space(_get_ref(inv))}</td></tr>
         <tr style="height:8.4666667mm;vertical-align:bottom;padding-bottom:0"> <td><table  style="width:100%" CELLPADDING="0" CELLSPACING="0"><td  style="width:4mm"></td><td style="width:40mm;text-align: right" >${_space(('%.2f' % inv.amount_total)[:-3], 1)}</td><td style="width:6mm"></td><td style="width:10mm;text-align: right">${ _space(('%.2f' % inv.amount_total)[-2:], 1)}</td><td style="width:3mm;text-align: right"></td></table></td><td><table  style="width:100%" CELLPADDING="0" CELLSPACING="0"><td  style="width:4mm"></td><td style="width:40mm;text-align: right" >${_space(('%.2f' % inv.amount_total)[:-3], 1)}</td><td style="width:6mm"></td><td style="width:10mm;text-align: right">${ _space(('%.2f' % inv.amount_total)[-2:], 1)}</td><td style="width:3mm;text-align: right"></td></table></td><td></td></tr>
         <tr style="height:21.166667mm"><td></td><td></td><td></td></tr>
         <tr style="height:8.4666667mm"> <td></td><td></td><td></td></tr>
-        <tr style="height:21.166667mm;vertical-align:top"><td></td><td colspan="2" style="text-align:right;padding-right:0.3in;font-family:bvrocrb;font-size:12pt">${mod10r('01'+str('%.2f' % inv.amount_total).replace('.','').rjust(10,'0'))}&gt;${_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]}&gt;</td></tr>
+        <tr style="height:21.166667mm;vertical-align:top"><td></td><td colspan="2" style="text-align:right;padding-right:0.3in;font-family:bvrocrb;font-size:12pt">${mod10r('01'+str('%.2f' % inv.amount_total).replace('.','').rjust(10,'0'))}&gt;${_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]}&gt;</td></tr>
     </table>
     %endfor
 </body>
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: