Merge lp:~camptocamp/openerp-swiss-localization/add_l10n_ch_rouding into lp:~camptocamp/openerp-swiss-localization/7.0-add-l10n_ch_add_invoice_rounding

[Vincent Renaville@camptocamp]

Limit to customer invoice

[lp:~camptocamp/openerp-swiss-localization/add_l10n_ch_rouding]

179. By Vincent Renaville@camptocamp on 2013-07-15

[ADD] documentation

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Merged revno 178 and 179 as base branch is not the same.

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2013-02-15 14:55:06 +0000
+++ ChangeLog	2013-07-15 15:22:25 +0000
@@ -1,34 +1,60 @@
+Change with release 7.1
+
+  *) Add ccp account on res_bank but keep retro compatibility with old model.
+     If no ccp is set on bank old behavior is kept.
+     Be aware if you have customizde bvr.mako you have to replace acc_number by get_account_number().
+     This change allows to avoid duplication of res.partner.bank
+
+  *) Fix res.bank view
+
+  *) Improve res.bank name search by adding intelligent search
+
+  *) Add city to res.bank name_get
+
+  *) Add constraint to avoid wrong entries on res.partner.bank
+
+  *) Disable invoice reference overwrite when validating an invoice
+
+  *) Better res.bank views in list mode
+
+  *) Fix BVR options in res.partner.bank views
+
+  *) Remove attachments from payment order view as document addon is fixed
+
+  *) Various fixes of DTA wizard
+
 Changes with release 7.0
 
   *) This release will introduce major changes to l10n_ch.
-     Due to important refactoring needs and the Switzerland adoption of new international payment standard during 2013-2014. 
+     Due to important refactoring needs and the Switzerland adoption of new international payment standard during 2013-2014.
      We have reorganised the swiss localization addons this way:
 
   *) l10n_ch: Multilang swiss STERCHI account chart and taxes (official addon)
      - Removing all code not related to account chart
      - Added de_DE, it_IT tranlsation files
-  
+
   *) l10n_ch_base_bank: Technical module that introduces a new and simplified version of bank type management
      - Type are simplified we add only BV and BVR, bank view is also simplified.
-  
+
   *) l10n_ch_bank: List of swiss banks
      - No changes, just code ceanup
-    
+
   *) l10n_ch_zip: List of swiss postal zip
-    - Updated with 2012 data, 
+    - Updated with 2012 data,
     - Removing duplicated entries and military NPA (Caserne etc.)
-    
+
   *) l10n_ch_dta: Support of dta payment protocol (will be deprecated end 2014)
      - Refactoring and clean-up done + adaptation to the new bank type
-    
+
   *) l10n_ch_payment_slip: Support of ESR/BVR payment slip report and reconciliation. Report refactored with easy element positioning.
-     - Refactoring of Mako CSS. 
+     - Refactoring of Mako CSS.
      - Remove of custom parser
      - Cleaning dead code
+     - Switch to commercial_entity for address display
      - TODO a wizard that contatenate the invoice PDF + the payment slip
-    
+
   *) l10n_ch_sepa: Alpha implementation of PostFinance SEPA/PAIN support will be completed during 2013/2014
-     -Not ported yet
+     - Not ported yet
 
 Changes with release 6.1
 

=== modified file 'l10n_ch/__openerp__.py'
--- l10n_ch/__openerp__.py	2013-04-15 09:53:12 +0000
+++ l10n_ch/__openerp__.py	2013-07-15 15:22:25 +0000
@@ -47,7 +47,7 @@
 The modules will be soon available on OpenERP swiss localization on launchpad:
 https://launchpad.net/openerp-swiss-localization
 """,
- 'version': '7.0',
+ 'version': '7.1',
  'author': 'Camptocamp',
  'category': 'Localization/Account Charts',
  'website': 'http://www.camptocamp.com',

=== modified file 'l10n_ch_bank/__openerp__.py'
--- l10n_ch_bank/__openerp__.py	2013-02-15 13:28:41 +0000
+++ l10n_ch_bank/__openerp__.py	2013-07-15 15:22:25 +0000
@@ -40,4 +40,4 @@
     "update_xml": [],
     "active": False,
     "installable": True,
-}
+ }

=== modified file 'l10n_ch_base_bank/__openerp__.py'
--- l10n_ch_base_bank/__openerp__.py	2013-02-15 13:28:41 +0000
+++ l10n_ch_base_bank/__openerp__.py	2013-07-15 15:22:25 +0000
@@ -19,13 +19,13 @@
 ##############################################################################
 
 {'name': 'Switzerland - Bank type',
- 'description':  """
+ 'description': """
 Swiss localization Bank type. Add new bank types
 ================================================
 This addons will add different bank type required by
 DTA, and ESR system in order to manage duality of Post and bank systems
 """,
- 'version': '1.0',
+ 'version': '1.1',
  'author': 'Camptocamp',
  'category': 'Localization',
  'website': 'http://www.camptocamp.com',
@@ -36,5 +36,5 @@
  'auto_install': False,
  'installable': True,
  'images': []
-}
+ }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_ch_base_bank/bank.py'
--- l10n_ch_base_bank/bank.py	2013-02-15 13:24:31 +0000
+++ l10n_ch_base_bank/bank.py	2013-07-15 15:22:25 +0000
@@ -20,37 +20,11 @@
 #
 ##############################################################################
 import re
-from openerp.osv.orm import Model, fields
+from openerp.osv import orm, fields
 from tools import mod10r
 
 
-class Bank(Model):
-    """Inherit res.bank class in order to add swiss specific field"""
-    _inherit = 'res.bank'
-    _columns = {
-        ### Internal reference
-        'code': fields.char('Code', size=64),
-        ###Swiss unik bank identifier also use in IBAN number
-        'clearing': fields.char('Clearing number', size=64),
-        ### city of the bank
-        'city': fields.char('City', size=128, select=1),
-    }
-
-
-class ResPartnerBank(Model):
-    """
-    Inherit res.partner.bank class in order to add swiss specific fields and state controls
-    """
-    _inherit = "res.partner.bank"
-
-    _columns = {
-        'name': fields.char('Description', size=128, required=True),
-        'bvr_adherent_num': fields.char('Bank BVR adherent number', size=11, 
-                                        help=("Your Bank adherent number to be printed in references of your BVR."
-                                              "This is not a postal account number.")),
-        'acc_number': fields.char('Account/IBAN Number', size=64, required=True),
-    }
-
+class BankCommon(object):
 
     def _check_9_pos_postal_num(self, number):
         """
@@ -63,12 +37,11 @@
             return False
         nums = number.split('-')
         prefix = nums[0]
-        num = nums[1].rjust(6,'0')
+        num = nums[1].rjust(6, '0')
         checksum = nums[2]
         expected_checksum = mod10r(prefix + num)[-1]
         return expected_checksum == checksum
 
-
     def _check_5_pos_postal_num(self, number):
         """
         check if a postal number on 5 positions is correct
@@ -78,23 +51,152 @@
             return False
         return True
 
+
+class Bank(orm.Model, BankCommon):
+    """Inherit res.bank class in order to add swiss specific field"""
+    _inherit = 'res.bank'
+    _columns = {
+        ### Internal reference
+        'code': fields.char('Code', size=64, select=True),
+        ###Swiss unik bank identifier also use in IBAN number
+        'clearing': fields.char('Clearing number', size=64),
+        ### city of the bank
+        'city': fields.char('City', size=128, select=1),
+        ### ccp of the bank
+        'ccp': fields.char('CCP', size=64, select=1)
+    }
+
+    def _check_ccp_duplication(self, cursor, uid, ids):
+        p_acc_obj = self.pool['res.partner.bank']
+        for bank in self.browse(cursor, uid, ids):
+            p_acc_ids = p_acc_obj.search(cursor, uid, [('bank', '=', bank.id)])
+            if p_acc_ids:
+                check = p_acc_obj._check_ccp_duplication(cursor, uid, p_acc_ids)
+                if not check:
+                    return False
+        return True
+
     def _check_postal_num(self, cursor, uid, ids):
         """
         validate postal number format
         """
         banks = self.browse(cursor, uid, ids)
-        for b in banks:
-            if not b.state in ('bv', 'bvr'):
-                return True
-            return self._check_9_pos_postal_num(b.acc_number) or \
-                   self._check_5_pos_postal_num(b.acc_number)
-
-
-    _constraints = [(_check_postal_num,
-                    'Please enter a correct postal number. (01-23456-1 or 12345)',
-                    ['acc_number'])]
+        for bank in banks:
+            if not bank.ccp:
+                continue
+            if not (self._check_9_pos_postal_num(bank.ccp) or
+                    self._check_5_pos_postal_num(bank.ccp)):
+                return False
+        return True
+
+    def name_get(self, cursor, uid, ids, context=None):
+        res = []
+        cols = ('bic', 'name', 'street', 'city')
+        for bank in self.browse(cursor, uid, ids, context):
+            vals = (bank[x] for x in cols if bank[x])
+            res.append((bank.id, ' - '.join(vals)))
+        return res
+
+    def name_search(self, cursor, uid, name, args=None, operator='ilike', context=None, limit=80):
+        if args is None:
+            args = []
+        if context is None:
+            context = {}
+        ids = []
+        cols = ('code', 'bic', 'name', 'street', 'city')
+        if name:
+            for val in name.split(' '):
+                for col in cols:
+                    tmp_ids = self.search(cursor, uid, [(col, 'ilike', val)] + args, limit=limit)
+                    if tmp_ids:
+                        ids += tmp_ids
+                        break
+        # we sort by occurence
+        to_ret_ids = list(set(ids))
+        to_ret_ids = sorted(to_ret_ids, key=lambda x: ids.count(x), reverse=True)
+
+        return self.name_get(cursor, uid, to_ret_ids, context=context)
+
+    _constraints = [(_check_postal_num,
+                    'Please enter a correct postal number. (01-23456-1 or 12345)',
+                    ['ccp']),
+
+                    (_check_ccp_duplication,
+                    'You can not enter a ccp both on the bank and on an account'
+                    ' of type BV, BVR',
+                    ['acc_number', 'bank'])]
+
+
+class ResPartnerBank(orm.Model, BankCommon):
+    """
+    Inherit res.partner.bank class in order to add swiss specific fields and state controls
+    """
+    _inherit = 'res.partner.bank'
+
+    _columns = {
+        'name': fields.char('Description', size=128, required=True),
+        'bvr_adherent_num': fields.char('Bank BVR adherent number', size=11,
+                                        help=("Your Bank adherent number to be printed in references of your BVR."
+                                              "This is not a postal account number.")),
+        'acc_number': fields.char('Account/IBAN Number', size=64, required=True),
+        'ccp': fields.related('bank', 'ccp', type='char', string='CCP',
+                              readonly=True),
+    }
+
+    def get_account_number(self, cursor, uid, bid, context=None):
+        if isinstance(bid, list):
+            bid = bid[0]
+        current = self.browse(cursor, uid, bid, context=context)
+        if current.state not in ('bv', 'bvr'):
+            return current.acc_number
+        if current.bank and current.bank.ccp:
+            return current.bank.ccp
+        else:
+            return current.acc_number
+
+    def _check_postal_num(self, cursor, uid, ids):
+        """
+        validate postal number format
+        """
+        p_banks = self.browse(cursor, uid, ids)
+        for p_bank in p_banks:
+            if not p_bank.state in ('bv', 'bvr'):
+                continue
+            if not (self._check_9_pos_postal_num(p_bank.get_account_number()) or
+                    self._check_5_pos_postal_num(p_bank.get_account_number())):
+                return False
+        return True
+
+    def _check_ccp_duplication(self, cursor, uid, ids):
+        """
+          Ensure that there is not a ccp in bank and res partner bank
+          at same time
+        """
+        p_banks = self.browse(cursor, uid, ids)
+        for p_bank in p_banks:
+            if not p_bank.state in ('bv', 'bvr'):
+                continue
+            bank_ccp = p_bank.bank.ccp if p_bank.bank else False
+            if not bank_ccp:
+                continue
+            part_bank_check = (self._check_5_pos_postal_num(p_bank.acc_number) or
+                               self._check_9_pos_postal_num(p_bank.acc_number))
+            bank_check = (self._check_5_pos_postal_num(p_bank.bank.ccp) or
+                          self._check_9_pos_postal_num(p_bank.bank.ccp))
+            if part_bank_check and bank_check:
+                return False
+        return True
+
+    _constraints = [(_check_postal_num,
+                    'Please enter a correct postal number. (01-23456-1 or 12345)',
+                    ['acc_number']),
+
+                    (_check_ccp_duplication,
+                    'You can not enter a ccp both on the bank and on an account'
+                    ' of type BV, BVR',
+                    ['acc_number', 'bank'])]
 
     _sql_constraints = [('bvr_adherent_uniq', 'unique (bvr_adherent_num)',
-        'The BVR adherent number must be unique !')]
+                         'The BVR adherent number must be unique !')]
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_ch_base_bank/bank_view.xml'
--- l10n_ch_base_bank/bank_view.xml	2013-02-08 11:19:29 +0000
+++ l10n_ch_base_bank/bank_view.xml	2013-07-15 15:22:25 +0000
@@ -42,5 +42,68 @@
         </field>
       </field>
     </record>
+
+    <record id="view__bank_search" model="ir.ui.view">
+      <field name="name">res.bank.search</field>
+      <field name="model">res.bank</field>
+      <field name="arch" type="xml">
+        <search string="Banks">
+          <filter name="Postfinance"
+                  icon="terp-check" string="PostFinance"
+                  domain="[('bic', '=', 'POFICHBEXXX')]"
+                  help="PostFinance"/>
+          <field name="name"/>
+          <field name="code"/>
+          <field name="street"/>
+          <field name="city"/>
+
+        </search>
+      </field>
+    </record>
+
+    <!-- 'POFICHBEXXX' corresponds to Postfinance bic -->
+
+    <record model="ir.ui.view" id="add_custom_fields_on_bank">
+      <field name="name">add custom fields on bank</field>
+      <field name="model">res.bank</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.view_res_bank_form"/>
+      <field name="arch" type="xml">
+        <field name="bic" position="after">
+          <field name="code"/>
+          <field name="clearing"/>
+          <field name="ccp" attrs="{'invisible': [('bic', '=', 'POFICHBEXXX')]}"/>
+        </field>
+      </field>
+    </record>
+
+    <record model="ir.ui.view" id="add_custom_fields_on_bank_list">
+      <field name="name">add custom fields on bank list</field>
+      <field name="model">res.bank</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.view_res_bank_tree"/>
+      <field name="arch" type="xml">
+        <field name="bic" position="after">
+          <field name="code"/>
+          <field name="clearing"/>
+          <field name="ccp"/>
+          <field name="street"/>
+          <field name="city"/>
+        </field>
+      </field>
+    </record>
+
+    <record model="ir.ui.view" id="add_ccp_on_res_partner_bank">
+      <field name="name">Add ccp on res partner bank</field>
+      <field name="model">res.partner.bank</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.view_partner_bank_form"/>
+      <field name="arch" type="xml">
+        <field name="bank_bic" position="after">
+          <field name="ccp" attrs="{'invisible': [('bank_bic', '=', 'POFICHBEXXX')]}"/>
+        </field>
+      </field>
+    </record>
+
   </data>
 </openerp>

=== modified file 'l10n_ch_dta/__openerp__.py'
--- l10n_ch_dta/__openerp__.py	2013-02-15 13:28:41 +0000
+++ l10n_ch_dta/__openerp__.py	2013-07-15 15:22:25 +0000
@@ -31,8 +31,7 @@
  'website': 'http://www.camptocamp.com',
  'depends': ['base', 'account_payment', 'l10n_ch_base_bank'],
  'data': ["wizard/create_dta_view.xml",
-          "bank_view.xml",
-          "payent_view.xml"],
+          "bank_view.xml"],
  'demo': ["demo/dta_demo.xml"],
  'test': [], # To be ported or migrate to unit tests or scenarios
  'auto_install': False,

=== modified file 'l10n_ch_dta/bank_view.xml'
--- l10n_ch_dta/bank_view.xml	2013-02-08 12:51:18 +0000
+++ l10n_ch_dta/bank_view.xml	2013-07-15 15:22:25 +0000
@@ -7,11 +7,11 @@
       <field name="inherit_id" ref="base.view_partner_bank_form"/>
       <field name="arch" type="xml">
         <group name="bank" position="after">
-          <group string="DTA options" attrs="{'invisible': ['|', ('company_id', '=', False), ('state','in',['bv','bvr'])]}">
+          <group string="DTA options" attrs="{'invisible': [('company_id', '=', False)]}">
             <field name="dta_code"/>
           </group>
         </group>
       </field>
     </record>
   </data>
-</openerp>
\ No newline at end of file
+</openerp>

=== removed file 'l10n_ch_dta/payent_view.xml'
--- l10n_ch_dta/payent_view.xml	2013-02-07 10:35:27 +0000
+++ l10n_ch_dta/payent_view.xml	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<openerp>
-  <data>
-    <record id="add_dta_files" model="ir.ui.view">
-      <field name="name">Add DTA files</field>
-      <field name="model">payment.order</field>
-      <field name="inherit_id" ref="account_payment.view_payment_order_form" />
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-        <field name="line_ids" position="before">
-          <label string="DTA"/>
-          <field name="dta_ids" colspan="4"/>
-        </field>
-      </field>
-    </record>
-  </data>
-</openerp>

=== modified file 'l10n_ch_dta/wizard/create_dta.py'
--- l10n_ch_dta/wizard/create_dta.py	2013-02-15 13:28:41 +0000
+++ l10n_ch_dta/wizard/create_dta.py	2013-07-15 15:22:25 +0000
@@ -26,7 +26,7 @@
 import unicode2ascii
 
 from openerp.osv.osv import except_osv
-from openerp.osv.orm import TransientModel, fields
+from openerp.osv.orm import TransientModel
 from openerp.tools.translate import _
 from tools import mod10r
 
@@ -37,13 +37,13 @@
          (u'î', 'i'),
          (u'ï', 'i'),
          (u'â', 'a'),
-         (u'ä', 'a'),
-         ]
+         (u'ä', 'a')]
 
 
 def _u2a(text):
     """Tries to convert unicode charactere to asci equivalence"""
-    if not text: return ""
+    if not text:
+        return ""
     txt = ""
     for c in text:
         if ord(c) < 128:
@@ -56,7 +56,8 @@
             txt += unicode2ascii.EXTRA_CHARACTERS[c]
         elif c in unicode2ascii.FG_HACKS:
             txt += unicode2ascii.FG_HACKS[c]
-        else: txt += "_"
+        else:
+            txt += "_"
     return txt
 
 
@@ -80,8 +81,7 @@
         self.pool = pool
         self.pline = pline
         for i in global_context_dict:
-            global_context_dict[i] = global_context_dict[i] \
-                                       and tr(global_context_dict[i])
+            global_context_dict[i] = global_context_dict[i] and tr(global_context_dict[i])
         self.fields = []
         self.global_values = global_context_dict
         self.validate_global_context_dict()
@@ -216,14 +216,15 @@
         super(record_gt826, self).validate_global_context_dict()
         if not self.global_values['reference']:
             raise except_osv(_('Error'),
-                             _('You must provide a BVR reference number \n for the line: %s') % self.pline.name)
+                             _('You must provide a BVR reference'
+                               'number \n for the line: %s') % self.pline.name)
 
         self.global_values['reference'] = self.global_values['reference'].replace(' ', '')
         if self.is_9_pos_adherent:
             if len(self.global_values['reference']) > 27:
                 raise except_osv(_('Error'),
-                                     _('BVR reference number is not valid \n for the line: %s. \n'
-                                       'Reference is too long.') % self.pline.name)
+                                 _('BVR reference number is not valid \n for the line: %s. \n'
+                                   'Reference is too long.') % self.pline.name)
             # do a mod10 check
             if mod10r(self.global_values['reference'][:-1]) != self.global_values['reference']:
                 raise except_osv(_('Error'),
@@ -247,7 +248,7 @@
             raise except_osv(_('Error'),
                              _('You must provide a BVR number\n'
                                'for the bank account: %s'
-                               'on line: %s') % (self.pline.bank_id.acc_number, self.pline.name))
+                               'on line: %s') % (self.pline.bank_id.get_account_number(), self.pline.name))
 
 
 class record_gt827(postal_record):
@@ -260,19 +261,13 @@
             raise except_osv(_('Error'),
                              _('You must provide a bank number \n'
                                'for the partner bank: %s\n on line: %s') %
-                               (self.pline.bank_id.acc_number, self.pline.name))
-        if not  self.global_values['partner_bank_clearing']:
+                             (self.pline.bank_id.get_account_number(), self.pline.name))
+        if not self.global_values['partner_bank_clearing']:
             raise except_osv(_('Error'),
                              _('You must provide a Clearing Number\n'
                                'for the partner bank: %s\n on line %s') %
-                               (self.pline.bank_id.acc_number, self.pline.name))
+                             (self.pline.bank_id.get_account_number(), self.pline.name))
         self.global_values['partner_bank_number'] = '/C/' + self.global_values['partner_bank_number']
-        if not self.global_values['partner_post_number']:
-            raise except_osv(_('Error'),
-                             _('You must provide a post number \n for the partner bank: %s\n'
-                               'on line: %s') % (self.pline.bank_id.acc_number, self.pline.name))
-        self.global_values['partner_bank_clearing'] = ''
-        self.global_values['partner_bank_number'] = '/C/' + self.global_values['partner_post_number']
 
     def init_local_context(self):
         self.fields = [
@@ -341,19 +336,20 @@
 
     def validate_global_context_dict(self):
         part = self.pline.partner_id
-        self.global_values['partner_country']= part.country_id and part.country_id.code + '-' or ''
+        self.global_values['partner_country'] = part.country_id and part.country_id.code + '-' or ''
         co_addr = self.pline.order_id.company_id
         self.global_values['comp_country'] = co_addr.country_id and co_addr.country_id.code + '-' or ''
         if not self.global_values['partner_bank_iban']:
             raise except_osv(_('Error'),
                              _('No IBAN defined \n for the bank account: %s\n'
-                               'on line: %s') % (self.pline.bank_id.acc_number, self.pline.name))
-        if self.global_values['partner_bank_code']: # bank code is swift (BIC address)
-            self.global_values['option_id_bank']= 'A'
-            self.global_values['partner_bank_ident']= self.global_values['partner_bank_code']
+                               'on line: %s') % (self.pline.bank_id.get_account_number(),
+                                                 self.pline.name))
+        if self.global_values['partner_bank_code']:  # Bank code is swift (BIC address)
+            self.global_values['option_id_bank'] = 'A'
+            self.global_values['partner_bank_ident'] = self.global_values['partner_bank_code']
         elif self.global_values['partner_bank_city']:
             self.global_values['option_id_bank'] = 'D'
-            self.global_values['partner_bank_ident']= self.global_values['partner_bank_name'] \
+            self.global_values['partner_bank_ident'] = self.global_values['partner_bank_name'] \
                     + ' ' + self.global_values['partner_bank_street'] \
                     + ' ' + self.global_values['partner_bank_zip'] \
                     + ' ' + self.global_values['partner_bank_city'] \
@@ -361,8 +357,8 @@
         else:
             raise except_osv(_('Error'),
                              _('You must provide the bank city '
-                               'or the bic code for the partner bank: \n %s\n on line: %s') % (self.pline.bank_id.acc_number, self.pline.name))
-
+                               'or the bic code for the partner bank: \n %s\n on line: %s') %
+                             (self.pline.bank_id.get_account_number(), self.pline.name))
 
     def init_local_context(self):
         self.fields = [
@@ -453,17 +449,19 @@
             ('padding', 59)
         ]
         self.pre.update({'partner_bank_clearing': '', 'partner_cpt_benef': '',
-            'company_bank_clearing': '', 'genre_trans': '890'})
+                         'company_bank_clearing': '', 'genre_trans': '890'})
+
     def validate_global_context_dict(self):
         return
 
+
 def c_ljust(s, size):
     """
     check before calling ljust
     """
-    s= s or ''
+    s = s or ''
     if len(s) > size:
-        s= s[:size]
+        s = s[:size]
     s = s.decode('utf-8').encode('latin1', 'replace').ljust(size)
     return s
 
@@ -517,8 +515,8 @@
         elec_context['partner_bank_city'] = pline.bank_id.bank.city or False
         elec_context['partner_bank_street'] = pline.bank_id.bank.street or ''
         elec_context['partner_bank_zip'] = pline.bank_id.bank.zip or ''
-        elec_context['partner_bank_country'] = pline.bank_id.bank.country and \
-                                                   pline.bank_id.bank.country.name or ''
+        elec_context['partner_bank_country'] = (pline.bank_id.bank.country and
+                                                pline.bank_id.bank.country.name or '')
 
         elec_context['partner_bank_code'] = pline.bank_id.bank_bic
         elec_context['reference'] = pline.move_line_id.ref
@@ -531,7 +529,7 @@
             elec_context['partner_zip'] = part.zip
 
             # If iban => country=country code for space reason
-            elec_context['partner_country']= part.country_id and part.country_id.name or ''
+            elec_context['partner_country'] = part.country_id and part.country_id.name or ''
         else:
             raise except_osv(_('Error'),
                              _('No address defined \n for the partner: %s on line') %
@@ -545,9 +543,10 @@
                 raise except_osv(_('Error'),
                                  _('No bank defined for the bank account: %s\n'
                                    'on the partner: %s\n on line: %s') % (pline.bank_id.state,
-                                                                          pline.partner_id.name, pline.name))
+                                                                          pline.partner_id.name,
+                                                                          pline.name))
         elec_context['sequence'] = str(seq).rjust(5).replace(' ', '0')
-        elec_context['amount_to_pay']= str(pline.amount_currency).replace('.', ',')
+        elec_context['amount_to_pay'] = str(pline.amount_currency).replace('.', ',')
         elec_context['number'] = pline.name
         elec_context['currency'] = pline.currency.name
         elec_context['partner_bank_name'] = pline.bank_id.bank_name or False
@@ -556,13 +555,14 @@
             raise except_osv(_('Error'),
                              _('No bank name defined\n for the bank account: %s\n'
                                'on the partner: %s\n on line: %s') % (pline.bank_id.state,
-                                                                      pline.partner_id.name, pline.name))
-        elec_context['partner_bank_iban'] = pline.bank_id.acc_number or False
-        number = pline.bank_id.acc_number or ''
+                                                                      pline.partner_id.name,
+                                                                      pline.name))
+        elec_context['partner_bank_iban'] = (pline.bank_id.get_account_number() or False)
+        number = pline.bank_id.get_account_number() or ''
         elec_context['partner_bank_number'] = number.replace('.', '').replace('-', '') or False
         elec_context['partner_bvr'] = ''
         if pline.bank_id.state in ('bv', 'bvr'):
-            elec_context['partner_bvr'] = pline.bank_id.acc_number or ''
+            elec_context['partner_bvr'] = pline.bank_id.get_account_number() or ''
         self._set_bank_data(cr, uid, data, pline, elec_context, seq, context=context)
         if pline.order_id.date_scheduled:
             date_value = datetime.strptime(pline.order_id.date_scheduled, '%Y-%m-%d')
@@ -573,8 +573,6 @@
         elec_context['date_value'] = date_value.strftime("%y%m%d")
         return elec_context
 
-
-
     def _create_dta(self, cr, uid, data, context=None):
         if context is None:
             context = {}
@@ -589,14 +587,18 @@
         amount_currency_tot = 0
 
         for pline in payment.line_ids:
-            elec_context = self._process_payment_lines(cr, uid, data, pline, elec_context, seq, context=context)
+            elec_context = self._process_payment_lines(cr, uid, data, pline,
+                                                       elec_context, seq, context=context)
             # si compte iban -> iban (836)
             # si payment structure  -> bvr (826)
             # si non -> (827)
             elec_pay = pline.bank_id.state  # Bank type
+            country_code = pline.partner_id.country_id.code if pline.partner_id.country_id else False
             if elec_pay in ['iban', 'bank']:
                 # If iban => country=country code for space reason
                 record_type = record_gt836
+            elif country_code and country_code != 'CH':
+                record_type = record_gt836
             elif elec_pay == 'bvr':
                 record_type = record_gt826
             elif elec_pay == 'bv':
@@ -621,22 +623,17 @@
         dta_data = _u2a(dta)
         dta_data = base64.encodestring(dta)
         payment_obj.set_done(cr, uid, [data['id']], context)
-        dta_dict =  {'name': 'DTA%s'%time.strftime("%Y-%m-%d_%H:%M:%S", time.gmtime()),
-                     'datas': dta_data,
-                     'datas_fname': 'DTA%s.txt'%time.strftime("%Y-%m-%d_%H:%M:%S", time.gmtime()),
-                     'res_model': 'payment.order',
-                     'res_id': data['id']}
+        dta_dict = {'name': 'DTA%s' % time.strftime("%Y-%m-%d_%H:%M:%S", time.gmtime()),
+                    'datas': dta_data,
+                    'datas_fname': 'DTA%s.txt' % time.strftime("%Y-%m-%d_%H:%M:%S", time.gmtime()),
+                    'res_model': 'payment.order',
+                    'res_id': data['id']}
         dta_id = attachment_obj.create(cr, uid, dta_dict, context=context)
         return dta_data
 
     def create_dta(self, cr, uid, ids, context=None):
         if not context:
             context = {}
-        if isinstance(ids, list):
-            req_id = ids[0]
-        else:
-            req_id = ids
-        current = self.browse(cr, uid, req_id, context)
         data = {}
         active_ids = context.get('active_ids', [])
         active_id = context.get('active_id', [])

=== modified file 'l10n_ch_invoice_rounding/account.py'
--- l10n_ch_invoice_rounding/account.py	2013-06-28 09:28:27 +0000
+++ l10n_ch_invoice_rounding/account.py	2013-07-15 15:22:25 +0000
@@ -142,16 +142,16 @@
         Add l10n computing and make sure invoice line for rounding is not computed in totals
         """
         res = super(AccountInvoice, self)._amount_all(cr, uid, ids, name, args, context=context)
-
         for invoice in self.browse(cr, uid, ids, context=context):
-            if invoice.global_round_line_id:
-                res[invoice.id]['amount_untaxed'] -= invoice.global_round_line_id.price_subtotal
-
-            amount_total = res[invoice.id]['amount_tax'] + res[invoice.id]['amount_untaxed']
-            res[invoice.id]['amount_total'] = amount_total
-
-            l10n_rounding = self._compute_l10n_rounding(cr, uid, invoice, res[invoice.id], context=context)
-            res[invoice.id].update(l10n_rounding)
+            if invoice.type in ('out_invoice','out_refund'):
+                if invoice.global_round_line_id:
+                    res[invoice.id]['amount_untaxed'] -= invoice.global_round_line_id.price_subtotal
+    
+                amount_total = res[invoice.id]['amount_tax'] + res[invoice.id]['amount_untaxed']
+                res[invoice.id]['amount_total'] = amount_total
+    
+                l10n_rounding = self._compute_l10n_rounding(cr, uid, invoice, res[invoice.id], context=context)
+                res[invoice.id].update(l10n_rounding)
         return res
 
 

=== added directory 'l10n_ch_invoice_rounding/documentation'
=== added file 'l10n_ch_invoice_rounding/documentation/DOC_l10n_ch_5cts_roundings.ods'
Binary files l10n_ch_invoice_rounding/documentation/DOC_l10n_ch_5cts_roundings.ods	1970-01-01 00:00:00 +0000 and l10n_ch_invoice_rounding/documentation/DOC_l10n_ch_5cts_roundings.ods	2013-07-15 15:22:25 +0000 differ
=== modified file 'l10n_ch_payment_slip/bank_view.xml'
--- l10n_ch_payment_slip/bank_view.xml	2013-02-22 10:52:59 +0000
+++ l10n_ch_payment_slip/bank_view.xml	2013-07-15 15:22:25 +0000
@@ -7,7 +7,7 @@
       <field name="inherit_id" ref="base.view_partner_bank_form"/>
       <field name="arch" type="xml">
         <group name="bank" position="after">
-          <group string="BVR options" attrs="{'invisible': [('state','not in',['bvr','bv'])]}" >
+          <group string="BVR options" attrs="{'invisible': ['|', ('state','not in',['bvr', 'bv']), ('company_id' ,'=', False)]}" >
             <field name="bvr_adherent_num" attrs="{'invisible': [('state','!=','bvr')]}"/>
             <field name="print_bank"/>
             <field name="print_account"/>
@@ -17,4 +17,4 @@
       </field>
     </record>
   </data>
-</openerp>
\ No newline at end of file
+</openerp>

=== modified file 'l10n_ch_payment_slip/company_view.xml'
--- l10n_ch_payment_slip/company_view.xml	2013-01-14 15:32:44 +0000
+++ l10n_ch_payment_slip/company_view.xml	2013-07-15 15:22:25 +0000
@@ -11,12 +11,12 @@
                         <group colspan="4">
                             <field name="bvr_delta_horz"/>
                             <field name="bvr_delta_vert"/>
+                            <field name="bvr_scan_line_horz"/>
                             <field name="bvr_scan_line_vert"/>
-                            <field name="bvr_scan_line_horz"/>
                             <field name="bvr_scan_line_font_size"/>
                             <field name="bvr_scan_line_letter_spacing"/>
+                            <field name="bvr_add_horz"/>
                             <field name="bvr_add_vert"/>
-                            <field name="bvr_add_horz"/>
                             <field name="bvr_background"/>
                         </group>
                     </page>

=== modified file 'l10n_ch_payment_slip/invoice.py'
--- l10n_ch_payment_slip/invoice.py	2013-04-05 06:44:43 +0000
+++ l10n_ch_payment_slip/invoice.py	2013-07-15 15:22:25 +0000
@@ -30,7 +30,6 @@
 
     _compile_get_ref = re.compile('[^0-9]')
 
-
     def _get_reference_type(self, cursor, user, context=None):
         """Function use by the function field reference_type in order to initalise available
         BVR Reference Types"""
@@ -39,7 +38,6 @@
         res.append(('bvr', 'BVR'))
         return res
 
-
     def _compute_full_bvr_name(self, cursor, uid, ids, field_names, arg, context=None):
         res = {}
         for inv in self.browse(cursor, uid, ids, context=context):
@@ -63,12 +61,16 @@
         if isinstance(inv_id, list):
             inv_id = inv_id[0]
         inv = self.browse(cursor, uid, inv_id, context=context)
+        ## We check if the type is bvr, if not we return false
+        if inv.partner_bank_id.state != 'bvr':
+            return ''
+        ##
         if inv.partner_bank_id.bvr_adherent_num:
             res = inv.partner_bank_id.bvr_adherent_num
         invoice_number = ''
         if inv.number:
             invoice_number = self._compile_get_ref.sub('', inv.number)
-        return mod10r(res + invoice_number.rjust(26-len(res), '0'))
+        return mod10r(res + invoice_number.rjust(26 - len(res), '0'))
 
     def _space(self, nbr, nbrspc=5):
         """Spaces * 5.
@@ -79,37 +81,33 @@
         """
         return ''.join([' '[(i - 2) % nbrspc:] + c for i, c in enumerate(nbr)])
 
-
     def action_number(self, cursor, uid, ids, context=None):
         res = super(AccountInvoice, self).action_number(cursor, uid, ids, context=context)
         for inv in self.browse(cursor, uid, ids, context=context):
-            if inv.type != 'out_invoice':
+            if inv.type != 'out_invoice' or inv.partner_bank_id.state != 'bvr':
                 continue
             ref = inv.get_bvr_ref()
-            inv.write({'reference': ref})
             move_id = inv.move_id
             if move_id:
-                cursor.execute('UPDATE account_move SET ref=%s ' \
-                               'WHERE id=%s',
-                               (ref, move_id.id))
-                cursor.execute('UPDATE account_move_line SET ref=%s ' \
-                                'WHERE move_id=%s',
-                                (ref, move_id.id))
-                cursor.execute('UPDATE account_analytic_line SET ref=%s ' \
-                                'FROM account_move_line ' \
-                                'WHERE account_move_line.move_id = %s ' \
-                                'AND account_analytic_line.move_id = account_move_line.id',
-                                (ref, move_id.id))
+                cursor.execute('UPDATE account_move SET ref=%s'
+                               '  WHERE id=%s',
+                               (ref, move_id.id))
+                cursor.execute('UPDATE account_move_line SET ref=%s'
+                               '  WHERE move_id=%s',
+                               (ref, move_id.id))
+                cursor.execute('UPDATE account_analytic_line SET ref=%s'
+                               '   FROM account_move_line '
+                               ' WHERE account_move_line.move_id = %s '
+                               '   AND account_analytic_line.move_id = account_move_line.id',
+                               (ref, move_id.id))
         return res
 
     def copy(self, cursor, uid, inv_id, default=None, context=None):
         default = default or {}
-        default.update({'reference' : False})
+        default.update({'reference': False})
         return super(AccountInvoice, self).copy(cursor, uid, inv_id, default, context)
 
 
-
-
 class AccountTaxCode(Model):
     """Inherit account tax code in order
     to add a Case code"""

=== modified file 'l10n_ch_payment_slip/report/bvr.mako'
--- l10n_ch_payment_slip/report/bvr.mako	2013-04-10 09:37:53 +0000
+++ l10n_ch_payment_slip/report/bvr.mako	2013-07-15 15:22:25 +0000
@@ -179,12 +179,12 @@
        <!--adresses + info block -->
         <table class="dest_address_bvr"  style="position:absolute;width:230px;word-wrap:break-word">
 
-               %if inv.partner_id.title:
-               <tr><td>${inv.partner_id.title.name}</tr></td>
-               %endif
-               %if inv.partner_id.name:
-               <tr><td>${inv.partner_id.name}</td></tr>
-               %endif
+                %if inv.partner_id.id != inv.commercial_partner_id.id:
+                <tr><td>${inv.commercial_partner_id.name or ''}</td></tr>
+                <tr><td>${inv.partner_id.title and inv.partner_id.title.name or ''} ${inv.partner_id.name }</td></tr>
+                %else:
+                <tr><td>${inv.partner_id.title and inv.partner_id.title.name or ''} ${inv.partner_id.name }</td></tr>
+                %endif
                <tr><td>${inv.partner_id.street or ''|entity}</td></tr>
                <tr><td>${inv.partner_id.street2 or ''|entity}</td></tr>
                <tr><td>${inv.partner_id.zip or ''|entity} ${inv.partner_id.city or ''|entity}</td></tr>
@@ -209,10 +209,11 @@
          <table class="slip_add">
            <tr><td>${_space(_get_ref(inv))}</td></tr>
            <tr><td>
-               %if title:
-               ${inv.partner_id.title.name or ''|entity}&nbsp;
-               %endif
-               ${inv.partner_id.name |entity}</td></tr>
+            %if inv.partner_id.id != inv.commercial_partner_id.id:
+                ${inv.commercial_partner_id.name or ''|entity}</td></tr>
+            %else:
+                ${inv.partner_id.name |entity}</td></tr>
+            %endif
            <tr><td>${inv.partner_id.street or ''|entity}</td></tr>
            <tr><td>${inv.partner_id.street2 or ''|entity}</td></tr>
            <tr><td>${inv.partner_id.zip or ''|entity} ${inv.partner_id.city or ''|entity}</td></tr>
@@ -226,7 +227,7 @@
        %endif
 
 
-       <div id="slip_bank_acc" class="slip_bank_acc">${inv.partner_bank_id.print_account and inv.partner_bank_id.acc_number or ''}</div>
+       <div id="slip_bank_acc" class="slip_bank_acc">${inv.partner_bank_id.print_account and inv.partner_bank_id.get_account_number() or ''}</div>
 
        <div id="slip_amount" class="slip_amount"><span >${"&nbsp;".join(_space(('%.2f' % inv.amount_total)[:-3], 1))}</span>  <span style="padding-left:6mm">${"&nbsp;".join(_space(('%.2f' % inv.amount_total)[-2:], 1))}</span></div>
 
@@ -247,10 +248,11 @@
        <div id="slip2_address_b" class="slip2_address_b">
            <table class="slip_add">
                <tr><td>
-                   %if title:
-                   ${inv.partner_id.title.name or ''|entity}
-                   %endif
-                   ${inv.partner_id.name |entity}</td></tr>
+                %if inv.partner_id.id != inv.commercial_partner_id.id:
+                    ${inv.commercial_partner_id.name or ''|entity}</td></tr>
+                %else:
+                    ${inv.partner_id.name |entity}</td></tr>
+                %endif
                <tr><td>${inv.partner_id.street or ''|entity}</td></tr>
                <tr><td>${inv.partner_id.street2 or ''|entity}</td></tr>
                <tr><td>${inv.partner_id.zip or ''|entity} ${inv.partner_id.city or ''|entity}</td></tr>
@@ -260,10 +262,11 @@
        %if inv.partner_bank_id.print_partner:
        <div id="slip2_comp" class="slip2_comp">
            <table class="slip_add">
-               <tr><td>${user.company_id.partner_id.name}</td></tr>
-               <tr><td>${user.company_id.partner_id.street}</td></tr>
-               <tr><td></td></tr>
-               <tr><td>${user.company_id.partner_id.city} ${user.company_id.partner_id.zip}</td></tr>
+               <tr><td>
+            <tr><td>${user.company_id.partner_id.name}</td></tr>
+            <tr><td>${user.company_id.partner_id.street}</td></tr>
+            <tr><td></td></tr>
+            <tr><td>${user.company_id.partner_id.city} ${user.company_id.partner_id.zip}</td></tr>
            </table>
        </div>
        %endif
@@ -275,7 +278,7 @@
          </div>
        %endif
 
-       <div id="slip2_bank_acc" class="slip2_bank_acc">${inv.partner_bank_id.print_account and inv.partner_bank_id.acc_number or ''}</div>
+       <div id="slip2_bank_acc" class="slip2_bank_acc">${inv.partner_bank_id.print_account and inv.partner_bank_id.get_account_number() or ''}</div>
     <!--- scaner code bar -->
   <div id="ocrbb">
     <%
@@ -286,7 +289,7 @@
        tt += [v for v in _get_ref(inv)]
        tt.append('+')
        tt.append('&nbsp;')
-       tt += [v for v in inv.partner_bank_id.acc_number.split('-')[0]+(str(inv.partner_bank_id.acc_number.split('-')[1])).rjust(6,'0')+inv.partner_bank_id.acc_number.split\
+       tt += [v for v in inv.partner_bank_id.get_account_number().split('-')[0]+(str(inv.partner_bank_id.get_account_number().split('-')[1])).rjust(6,'0')+inv.partner_bank_id.get_account_number().split\
 ('-')[2]]
        tt.append('&gt;')
     %>

=== modified file 'l10n_ch_payment_slip/report/report_webkit_html.py'
--- l10n_ch_payment_slip/report/report_webkit_html.py	2013-02-15 13:28:41 +0000
+++ l10n_ch_payment_slip/report/report_webkit_html.py	2013-07-15 15:22:25 +0000
@@ -112,7 +112,7 @@
                 raise except_osv(_('UserError'),
                                  _('No bank specified on invoice:\n%s' % (invoice_name)))
             if not self._compile_check_bvr.match(
-                    invoice.partner_bank_id.acc_number or ''):
+                    invoice.partner_bank_id.get_account_number() or ''):
                 raise except_osv(_('UserError'),
                                  _(('Your bank BVR number should be of the form 0X-XXX-X! '
                                     'Please check your company '

=== modified file 'l10n_ch_sepa/base_sepa/base_template/pain.001.001.03.xml.mako'
--- l10n_ch_sepa/base_sepa/base_template/pain.001.001.03.xml.mako	2011-11-04 10:40:59 +0000
+++ l10n_ch_sepa/base_sepa/base_template/pain.001.001.03.xml.mako	2013-07-15 15:22:25 +0000
@@ -18,7 +18,7 @@
     </GrpHdr>\
 <%doc>\
   for each payment in the payment order
-  line is saved in sepa_context in order to be available 
+  line is saved in sepa_context in order to be available
   in sub blocks and inheritages. Because, for now, only unamed
   blocks and def in mako can use a local for loop variable.
 </%doc>\
@@ -91,7 +91,7 @@
                   <IBAN>${bank_acc.iban}</IBAN>
                 % else:
                   <Othr>
-                    <Id>${bank_acc.acc_number}</Id>
+                    <Id>${bank_acc.get_account_number()}</Id>
                   </Othr>
                 % endif
               </Id>

=== modified file 'l10n_ch_sepa/base_sepa/pain_001.py'
--- l10n_ch_sepa/base_sepa/pain_001.py	2011-11-04 10:40:59 +0000
+++ l10n_ch_sepa/base_sepa/pain_001.py	2013-07-15 15:22:25 +0000
@@ -88,7 +88,7 @@
             raise osv.except_osv(_('ErrorCompanyBankBIC'),
                                  _('The selected company bank has no BIC number'))
         if not cp_bank_acc.iban and \
-           not cp_bank_acc.acc_number:
+           not cp_bank_acc.get_account_number():
             raise osv.except_osv(_('ErrorCompanyBankAccNumber'),
                                  _('The selected company bank has no IBAN and no Account number'))
 
@@ -102,7 +102,7 @@
                 raise osv.except_osv(_('ErrorCreditorBankBIC'),
                                      _('Creditor bank has no BIC number for invoice %s') %(line.name,))
             if not crd_bank_acc.iban and \
-               not crd_bank_acc.acc_number:
+               not crd_bank_acc.get_account_number():
                 raise osv.except_osv(_('ErrorCompanyBankAccNumber'),
                                      _('The selected company bank has no IBAN and no Account number'))