From ce79826dd30556819278d7693490f690a8d09fb2 Mon Sep 17 00:00:00 2001
From: htr-odoo <htr@openerp.com>
Date: Fri, 29 Jul 2016 12:03:34 +0200
Subject: [PATCH 1/2] [MOV] base_iban: Restructure directory according to new
 API guidelines

---
 addons/base_iban/__init__.py                                  | 2 +-
 addons/base_iban/__openerp__.py                               | 2 +-
 .../{demo/iban_demo.xml => data/res_partner_bank_demo.xml}    | 0
 addons/base_iban/models/__init__.py                           | 4 ++++
 addons/base_iban/{base_iban.py => models/res_partner_bank.py} | 0
 5 files changed, 6 insertions(+), 2 deletions(-)
 rename addons/base_iban/{demo/iban_demo.xml => data/res_partner_bank_demo.xml} (100%)
 create mode 100644 addons/base_iban/models/__init__.py
 rename addons/base_iban/{base_iban.py => models/res_partner_bank.py} (100%)

diff --git a/addons/base_iban/__init__.py b/addons/base_iban/__init__.py
index f32b77fa221..81fc81d29c9 100644
--- a/addons/base_iban/__init__.py
+++ b/addons/base_iban/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import base_iban
+import models
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index c8c43cbfc52..171bad27eaa 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -12,7 +12,7 @@ The ability to extract the correctly represented local accounts from IBAN accoun
 with a single statement.
     """,
     'depends': ['account'],
-    'demo': ['demo/iban_demo.xml'],
+    'demo': ['data/res_partner_bank_demo.xml'],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/base_iban/demo/iban_demo.xml b/addons/base_iban/data/res_partner_bank_demo.xml
similarity index 100%
rename from addons/base_iban/demo/iban_demo.xml
rename to addons/base_iban/data/res_partner_bank_demo.xml
diff --git a/addons/base_iban/models/__init__.py b/addons/base_iban/models/__init__.py
new file mode 100644
index 00000000000..a0f7ed9a8c1
--- /dev/null
+++ b/addons/base_iban/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import res_parter_bank
\ No newline at end of file
diff --git a/addons/base_iban/base_iban.py b/addons/base_iban/models/res_partner_bank.py
similarity index 100%
rename from addons/base_iban/base_iban.py
rename to addons/base_iban/models/res_partner_bank.py

From 1b94ff054c2918b4b3c8a71f625027b8798c5455 Mon Sep 17 00:00:00 2001
From: htr-odoo <htr@openerp.com>
Date: Fri, 29 Jul 2016 12:08:53 +0200
Subject: [PATCH 2/2] [MIG] base_iban: Migrate to new API

---
 addons/base_iban/__openerp__.py                 | 3 ---
 addons/base_iban/data/res_partner_bank_demo.xml | 4 ++--
 addons/base_iban/models/__init__.py             | 2 +-
 addons/base_iban/models/res_partner_bank.py     | 6 +++---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index 171bad27eaa..8ad6b44c6e7 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -2,7 +2,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'IBAN Bank Accounts',
-    'version': '1.0',
     'category': 'Extra Tools',
     'description': """
 This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for it's validity.
@@ -13,6 +12,4 @@ with a single statement.
     """,
     'depends': ['account'],
     'demo': ['data/res_partner_bank_demo.xml'],
-    'installable': True,
-    'auto_install': False,
 }
diff --git a/addons/base_iban/data/res_partner_bank_demo.xml b/addons/base_iban/data/res_partner_bank_demo.xml
index 4e1e247f410..86ab1c60687 100644
--- a/addons/base_iban/data/res_partner_bank_demo.xml
+++ b/addons/base_iban/data/res_partner_bank_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
+<odoo>
     <data noupdate="1">
 
         <record id="bank_iban_asustek" model="res.partner.bank">
@@ -24,4 +24,4 @@
         </record>
 
     </data>
-</openerp>
+</odoo>
diff --git a/addons/base_iban/models/__init__.py b/addons/base_iban/models/__init__.py
index a0f7ed9a8c1..873ec945880 100644
--- a/addons/base_iban/models/__init__.py
+++ b/addons/base_iban/models/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import res_parter_bank
\ No newline at end of file
+import res_partner_bank
\ No newline at end of file
diff --git a/addons/base_iban/models/res_partner_bank.py b/addons/base_iban/models/res_partner_bank.py
index 0877c264333..d1f6d8d9221 100644
--- a/addons/base_iban/models/res_partner_bank.py
+++ b/addons/base_iban/models/res_partner_bank.py
@@ -2,8 +2,8 @@
 
 import re
 
-from openerp import api, fields, models, _
-from openerp.exceptions import UserError, ValidationError
+from odoo import api, models, _
+from odoo.exceptions import UserError, ValidationError
 
 
 def normalize_iban(iban):
@@ -31,7 +31,7 @@ def validate_iban(iban):
 
     iban_template = _map_iban_template[country_code]
     if len(iban) != len(iban_template.replace(' ', '')):
-        raise ValidationError(_("The IBAN does not seem to be correct. You should have entered something like this %s\n"\
+        raise ValidationError(_("The IBAN does not seem to be correct. You should have entered something like this %s\n"
             "Where B = National bank code, S = Branch code, C = Account No, k = Check digit") % iban_template)
 
     check_chars = iban[4:] + iban[:4]