Merge lp:~banking-addons-team/banking-addons/ba70-mig_account_iban_preserve_domestic into lp:banking-addons

[Stefan Rijnhart (Opener)]

[MIG] account_iban_preserve_domestic 7.0

The new series lp:banking-addons/banking-addons-70 is a copy of lp:banking-addons/6.1, but set to uninstallable. This simple module is the first to be migrated to OpenERP 7.0.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve (code review, no test)

=== modified file 'account_iban_preserve_domestic/__openerp__.py'
--- account_iban_preserve_domestic/__openerp__.py	2013-02-26 21:06:36 +0000
+++ account_iban_preserve_domestic/__openerp__.py	2013-02-26 21:20:32 +0000
@@ -1,61 +1,53 @@
 ##############################################################################
 #
-#    Copyright (C) 2012 Therp BV (<http://therp.nl>).
+#    Copyright (C) 2012 - 2013 Therp BV (<http://therp.nl>).
 #            
 #    All other contributions are (C) by their respective contributors
 #
 #    All Rights Reserved
 #
-#    WARNING: This program as such is intended to be used by professional
-#    programmers who take the whole responsability of assessing all potential
-#    consequences resulting from its eventual inadequacies and bugs
-#    End users who are looking for a ready-to-use solution with commercial
-#    garantees and support are strongly adviced to contract EduSense BV
-#
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 {
     'name': 'Domestic bank account number',
-    'version': '0.1.134',
+    'version': '0.1.163',
     'license': 'AGPL-3',
     'author': 'Therp BV',
     'website': 'https://launchpad.net/banking-addons',
     'category': 'Banking addons',
-    'depends': ['base_iban','account'],
-    'init_xml': [],
-    'update_xml': [
+    'depends': [
+        'base_iban',
+        'account',
+        ],
+    'data': [
         'res_partner_bank_view.xml'
         ],
-    'demo_xml': [],
     'description': '''
-This module is compatible with OpenERP 6.1.
+This module is compatible with OpenERP 7.0.
 
-The IBAN module in OpenERP 6.1 registers the IBAN
+The IBAN module in OpenERP 6.1/7.0 registers the IBAN
 on the same field as the domestic account number, 
 instead of keeping both on separate fields as is the
 case in 6.0.
 
 This module adds a field to register the domestic account
-number on IBANs, while the domestic account number is
-still widely in use in certain regions.
-
-Note that an upgrade to OpenERP 6.1 makes you lose the
-domestic account numbers on IBANs that were already in 
-your system, unless you installed the 6.0 version of this
-module prior to the upgrade to OpenERP 6.1. 
+number on IBANs, as the domestic account number is
+still in use in certain regions. This should make for a
+smoother migration to SEPA.
     ''',
     'active': False,
-    'installable': False,
+    'installable': True,
 }

=== modified file 'account_iban_preserve_domestic/res_partner_bank.py'
--- account_iban_preserve_domestic/res_partner_bank.py	2012-04-14 08:58:58 +0000
+++ account_iban_preserve_domestic/res_partner_bank.py	2013-02-26 21:20:32 +0000
@@ -1,5 +1,28 @@
-from osv import fields,osv
-class res_partner_bank(osv.osv):
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2012 - 2013 Therp BV (<http://therp.nl>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, orm
+
+
+class res_partner_bank(orm.Model):
     ''' Adds a field for domestic account numbers '''
     _inherit = "res.partner.bank"
 

=== modified file 'account_iban_preserve_domestic/res_partner_bank_view.xml'
--- account_iban_preserve_domestic/res_partner_bank_view.xml	2012-02-19 21:10:20 +0000
+++ account_iban_preserve_domestic/res_partner_bank_view.xml	2013-02-26 21:20:32 +0000
@@ -18,20 +18,5 @@
             </field>
         </record>
 
-        <!-- add the field to the partner form, as defined in 
-        the account module -->
-        <record id="view_partner_account_form" model="ir.ui.view">
-            <field name="name">res.partner.account.form</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="account.view_partner_property_form"/>
-            <field name="arch" type="xml">
-                <field name="acc_number" position="after">
-                    <newline/>
-                    <field name="acc_number_domestic"
-                           attrs="{'invisible': [('state', '!=', 'iban')]}"
-                           />
-                </field>
-            </field>
-        </record>
     </data>
 </openerp>