Merge lp:~numerigraphe/openobject-server/trunk-bank-bzr-history into lp:openobject-server

[Numérigraphe]

[MERGE] fix the bazaar history of res_bank.py and res_bank_view.xml, unproperly moved at revno 3541.

The bzr history for res_bank.py and res_bank_view.xml has been broken when these two files were renamed during development for v6.1.
This makes it unnecessarily hard to find differences between 6.0 and trunk, making it harder to port community modules.
This branch fixes the mistake by forking at revno 3541, doing the file move the right way, and successively merging all the changes to those files.

[Olivier Dony (Odoo) (odo-openerp)]

Thanks for trying to restore the proper history of the res_bank* files, that is very appreciated.
The history almost looks right when I merge you branch, however the blame is all messed up: most changes to the res_bank files are credited to you revision 3540.1.1 revid:<email address hidden> unfortunately.

I'll do a quick test of branching off rev.3540, renaming the files and then pulling trunk in it to see if I can get it right.

review: Needs Fixing

[Olivier Dony (Odoo) (odo-openerp)]

Update: I tried to do the same thing you did, except I also preserved the commit and author for the very first merge ("bank account management reviewed..." by fp). I think that was the problem for the blame in your branch, and accounted for a large part of the new res_bank.py file.

My branch is at lp:~openerp-dev/openobject-server/trunk-bug-892054

Sorry for not merging your branch directly, but as you can imagine it would be a mess to fix, and I won't ask you to do the whole boring history fix once more from scratch ;-)

I will credit the final merge to you of course, as you did the whole work, even if technically I'm not merging your branch. Let's also mark this merge prop as Merged, even if it was not technically merged either ;-)

[Numérigraphe (numerigraphe)]

Dear Olivier,
Thanks for your support. My branch was a bit of a mess indeed, so I'm glad you found a way to do it more properly.
Please, would you care to give a step by step procedure I can follow if I stumble upon a similar problem later on?
This one had few changes but I imagine doing this for 100s of revisions, it would need to be scripted.
Lionel.

review: Needs Information

[Olivier Dony (Odoo) (odo-openerp)]

On 11/23/2011 09:27 AM, Numérigraphe wrote:
> Thanks for your support. My branch was a bit of a mess indeed, so I'm glad you found a way to do it more properly.
> Please, would you care to give a step by step procedure I can follow if I stumble upon a similar problem later on?
> This one had few changes but I imagine doing this for 100s of revisions, it would need to be scripted.

Sure, though I imagine I did something very similar to what you did.

Let's say file F was moved to G at revision R, without preserving
history. Here's what I did:

0. Check the commit history on file G to see when it moved and how it
was changed afterwards.
 $ bzr log --line --show-ids trunk/<G>

1. Branch off the revision before the one that broke the history
 $ bzr branch -r <R-1> trunk trunk-fix-history
 $ cd trunk-fix-history

2. Merge rev R and before committing, use `bzr mv --after` to perform
the renaming correctly:
 $ bzr merge ../trunk -r <R>
 $ bzr mv --after <F> <G>
 $ bzr ci -m '<rev.R commit msg>' --author '<rev.R author>'

3. Then, every subsequent revision that touches G in trunk will cause a
conflict, and will result in a diff in the "blame" history, so we need
to merge them one by one to preserve commit message and author.
Repeat for each subsequent revision S that touches G on trunk:
 $ bzr merge ../trunk -r <S>
 # here you get a conflict on G, just copy over the new file
 $ mv <G-conflicting-file> <G>
 $ bzr resolve <G> # force resolve
 $ bzr ci -m '<rev.S commit msg>' --author '<rev.S author>'

4. When you're done merging the tip of trunk, you can merge back the
fixed branch to restore history, after double-checking that the files
are now identical:
 $ diff <G> ../trunk/<G> # should be empty!
 $ cd ../trunk
 $ bzr merge ../trunk-fix-history
 # It looks like you're removing and adding <G> again, this is normal
 # because you're removing the old file w/o history, and adding the
 # new one with the fixed history.
 $ bzr ci -m '[MERGE] Fixed history of <G>, broken at rev.<R>'

Conflicts in step 3 and how to resolve them will probably depend on how
much renaming happened to <G>. Here it was more complicated because the
file had been renamed back and forth.

I hope there's a better way to do this, but this was quick enough in
this case.

Of course, it goes without saying that the best way to fix this is to
never break the history in the first place! ;-)

=== added file 'openerp/addons/base/res/res_bank.py'
--- openerp/addons/base/res/res_bank.py	1970-01-01 00:00:00 +0000
+++ openerp/addons/base/res/res_bank.py	2011-11-18 15:47:33 +0000
@@ -0,0 +1,227 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    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 osv import fields, osv
+
+class Bank(osv.osv):
+    _description='Bank'
+    _name = 'res.bank'
+    _order = 'name'
+    _columns = {
+        'name': fields.char('Name', size=128, required=True),
+        'street': fields.char('Street', size=128),
+        'street2': fields.char('Street2', size=128),
+        'zip': fields.char('Zip', change_default=True, size=24),
+        'city': fields.char('City', size=128),
+        'state': fields.many2one("res.country.state", 'State',
+            domain="[('country_id', '=', country)]"),
+        'country': fields.many2one('res.country', 'Country'),
+        'email': fields.char('E-Mail', size=64),
+        'phone': fields.char('Phone', size=64),
+        'fax': fields.char('Fax', size=64),
+        'active': fields.boolean('Active'),
+        'bic': fields.char('Bank Identifier Code', size=64,
+            help="Sometimes called BIC or Swift."),
+    }
+    _defaults = {
+        'active': lambda *a: 1,
+    }
+    def name_get(self, cr, uid, ids, context=None):
+        result = []
+        for bank in self.browse(cr, uid, ids, context):
+            result.append((bank.id, (bank.bic and (bank.bic + ' - ') or '') + bank.name))
+        return result
+
+Bank()
+
+
+class res_partner_bank_type(osv.osv):
+    _description='Bank Account Type'
+    _name = 'res.partner.bank.type'
+    _order = 'name'
+    _columns = {
+        'name': fields.char('Name', size=64, required=True, translate=True),
+        'code': fields.char('Code', size=64, required=True),
+        'field_ids': fields.one2many('res.partner.bank.type.field', 'bank_type_id', 'Type fields'),
+        'format_layout': fields.text('Format Layout', translate=True)
+    }
+    _defaults = {
+        'format_layout': lambda *args: "%(bank_name)s: %(acc_number)s"
+    }
+res_partner_bank_type()
+
+class res_partner_bank_type_fields(osv.osv):
+    _description='Bank type fields'
+    _name = 'res.partner.bank.type.field'
+    _order = 'name'
+    _columns = {
+        'name': fields.char('Field Name', size=64, required=True, translate=True),
+        'bank_type_id': fields.many2one('res.partner.bank.type', 'Bank Type', required=True, ondelete='cascade'),
+        'required': fields.boolean('Required'),
+        'readonly': fields.boolean('Readonly'),
+        'size': fields.integer('Max. Size'),
+    }
+res_partner_bank_type_fields()
+
+
+class res_partner_bank(osv.osv):
+    '''Bank Accounts'''
+    _name = "res.partner.bank"
+    _rec_name = "acc_number"
+    _description = __doc__
+    _order = 'sequence'
+
+    def _bank_type_get(self, cr, uid, context=None):
+        bank_type_obj = self.pool.get('res.partner.bank.type')
+
+        result = []
+        type_ids = bank_type_obj.search(cr, uid, [])
+        bank_types = bank_type_obj.browse(cr, uid, type_ids, context=context)
+        for bank_type in bank_types:
+            result.append((bank_type.code, bank_type.name))
+        return result
+
+    def _default_value(self, cursor, user, field, context=None):
+        if context is None: context = {}
+        if field in ('country_id', 'state_id'):
+            value = False
+        else:
+            value = ''
+        if not context.get('address'):
+            return value
+
+        for address in self.pool.get('res.partner').resolve_o2m_commands_to_record_dicts(
+            cursor, user, 'address', context['address'], ['type', field], context=context):
+
+            if address.get('type') == 'default':
+                return address.get(field, value)
+            elif not address.get('type'):
+                value = address.get(field, value)
+        return value
+
+    _rec_name = 'acc_number'
+    _columns = {
+        'name': fields.char('Bank Account', size=64), # to be removed in v6.2 ?
+        'acc_number': fields.char('Account Number', size=64, required=True),
+        'bank': fields.many2one('res.bank', 'Bank'),
+        'bank_bic': fields.char('Bank Identifier Code', size=16),
+        'bank_name': fields.char('Bank Name', size=32),
+        'owner_name': fields.char('Account Owner Name', size=64),
+        'street': fields.char('Street', size=128),
+        'zip': fields.char('Zip', change_default=True, size=24),
+        'city': fields.char('City', size=128),
+        'country_id': fields.many2one('res.country', 'Country',
+            change_default=True),
+        'state_id': fields.many2one("res.country.state", 'State',
+            change_default=True, domain="[('country_id','=',country_id)]"),
+        'company_id': fields.many2one('res.company', 'Company',
+            ondelete='cascade', help="Only if this bank account belong to your company"),
+        'partner_id': fields.many2one('res.partner', 'Account Owner', required=True,
+            ondelete='cascade', select=True),
+        'state': fields.selection(_bank_type_get, 'Bank Account Type', required=True,
+            change_default=True),
+        'sequence': fields.integer('Sequence'),
+        'footer': fields.boolean("Display on Reports")
+    }
+    _defaults = {
+        'owner_name': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'name', context=context),
+        'street': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'street', context=context),
+        'city': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'city', context=context),
+        'zip': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'zip', context=context),
+        'country_id': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'country_id', context=context),
+        'state_id': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'state_id', context=context),
+        'name': lambda *args: '/'
+    }
+
+    def fields_get(self, cr, uid, fields=None, context=None):
+        res = super(res_partner_bank, self).fields_get(cr, uid, fields, context)
+        bank_type_obj = self.pool.get('res.partner.bank.type')
+        type_ids = bank_type_obj.search(cr, uid, [])
+        types = bank_type_obj.browse(cr, uid, type_ids)
+        for type in types:
+            for field in type.field_ids:
+                if field.name in res:
+                    res[field.name].setdefault('states', {})
+                    res[field.name]['states'][type.code] = [
+                            ('readonly', field.readonly),
+                            ('required', field.required)]
+        return res
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not len(ids):
+            return []
+        bank_type_obj = self.pool.get('res.partner.bank.type')
+        res = []
+        for val in self.browse(cr, uid, ids, context=context):
+            result = val.acc_number
+            if val.state:
+                type_ids = bank_type_obj.search(cr, uid, [('code','=',val.state)])
+                if type_ids:
+                    t = bank_type_obj.browse(cr, uid, type_ids[0], context=context)
+                    try:
+                        result = t.format_layout % val._data[val.id]
+                    except:
+                        result += ' [Formating Error]'
+                        raise
+            res.append((val.id, result))
+        return res
+
+    def onchange_company_id(self, cr, uid, ids, company_id, context={}):
+        result = {}
+        if company_id:
+            c = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
+            if c.partner_id:
+                r = self.onchange_partner_id(cr, uid, ids, c.partner_id.id, context=context)
+                r['value']['partner_id'] = c.partner_id.id
+                r['value']['footer'] = 1
+                result = r
+        return result
+
+    def onchange_bank_id(self, cr, uid, ids, bank_id, context={}):
+        result = {}
+        if bank_id:
+            bank = self.pool.get('res.bank').browse(cr, uid, bank_id, context=context)
+            result['bank_name'] = bank.name
+            result['bank_bic'] = bank.bic
+        return {'value': result}
+
+
+    def onchange_partner_id(self, cr, uid, id, partner_id, context={}):
+        result = {}
+        if partner_id:
+            part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+            result['owner_name'] = part.name
+            result['street'] = part.address and part.address[0].street or False
+            result['city'] = part.address and part.address[0].city or False
+            result['zip'] =  part.address and part.address[0].zip or False
+            result['country_id'] =  part.address and part.address[0].country_id and part.address[0].country_id.id or False
+            result['state_id'] = part.address and part.address[0].state_id and part.address[0].state_id.id or False
+        return {'value': result}
+
+res_partner_bank()
+
+

=== removed file 'openerp/addons/base/res/res_bank.py'
--- openerp/addons/base/res/res_bank.py	2011-10-11 08:03:38 +0000
+++ openerp/addons/base/res/res_bank.py	1970-01-01 00:00:00 +0000
@@ -1,227 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    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 osv import fields, osv
-
-class Bank(osv.osv):
-    _description='Bank'
-    _name = 'res.bank'
-    _order = 'name'
-    _columns = {
-        'name': fields.char('Name', size=128, required=True),
-        'street': fields.char('Street', size=128),
-        'street2': fields.char('Street2', size=128),
-        'zip': fields.char('Zip', change_default=True, size=24),
-        'city': fields.char('City', size=128),
-        'state': fields.many2one("res.country.state", 'State',
-            domain="[('country_id', '=', country)]"),
-        'country': fields.many2one('res.country', 'Country'),
-        'email': fields.char('E-Mail', size=64),
-        'phone': fields.char('Phone', size=64),
-        'fax': fields.char('Fax', size=64),
-        'active': fields.boolean('Active'),
-        'bic': fields.char('Bank Identifier Code', size=64,
-            help="Sometimes called BIC or Swift."),
-    }
-    _defaults = {
-        'active': lambda *a: 1,
-    }
-    def name_get(self, cr, uid, ids, context=None):
-        result = []
-        for bank in self.browse(cr, uid, ids, context):
-            result.append((bank.id, (bank.bic and (bank.bic + ' - ') or '') + bank.name))
-        return result
-
-Bank()
-
-
-class res_partner_bank_type(osv.osv):
-    _description='Bank Account Type'
-    _name = 'res.partner.bank.type'
-    _order = 'name'
-    _columns = {
-        'name': fields.char('Name', size=64, required=True, translate=True),
-        'code': fields.char('Code', size=64, required=True),
-        'field_ids': fields.one2many('res.partner.bank.type.field', 'bank_type_id', 'Type fields'),
-        'format_layout': fields.text('Format Layout', translate=True)
-    }
-    _defaults = {
-        'format_layout': lambda *args: "%(bank_name)s: %(acc_number)s"
-    }
-res_partner_bank_type()
-
-class res_partner_bank_type_fields(osv.osv):
-    _description='Bank type fields'
-    _name = 'res.partner.bank.type.field'
-    _order = 'name'
-    _columns = {
-        'name': fields.char('Field Name', size=64, required=True, translate=True),
-        'bank_type_id': fields.many2one('res.partner.bank.type', 'Bank Type', required=True, ondelete='cascade'),
-        'required': fields.boolean('Required'),
-        'readonly': fields.boolean('Readonly'),
-        'size': fields.integer('Max. Size'),
-    }
-res_partner_bank_type_fields()
-
-
-class res_partner_bank(osv.osv):
-    '''Bank Accounts'''
-    _name = "res.partner.bank"
-    _rec_name = "acc_number"
-    _description = __doc__
-    _order = 'sequence'
-
-    def _bank_type_get(self, cr, uid, context=None):
-        bank_type_obj = self.pool.get('res.partner.bank.type')
-
-        result = []
-        type_ids = bank_type_obj.search(cr, uid, [])
-        bank_types = bank_type_obj.browse(cr, uid, type_ids, context=context)
-        for bank_type in bank_types:
-            result.append((bank_type.code, bank_type.name))
-        return result
-
-    def _default_value(self, cursor, user, field, context=None):
-        if context is None: context = {}
-        if field in ('country_id', 'state_id'):
-            value = False
-        else:
-            value = ''
-        if not context.get('address'):
-            return value
-
-        for address in self.pool.get('res.partner').resolve_o2m_commands_to_record_dicts(
-            cursor, user, 'address', context['address'], ['type', field], context=context):
-
-            if address.get('type') == 'default':
-                return address.get(field, value)
-            elif not address.get('type'):
-                value = address.get(field, value)
-        return value
-
-    _rec_name = 'acc_number'
-    _columns = {
-        'name': fields.char('Bank Account', size=64), # to be removed in v6.2 ?
-        'acc_number': fields.char('Account Number', size=64, required=True),
-        'bank': fields.many2one('res.bank', 'Bank'),
-        'bank_bic': fields.char('Bank Identifier Code', size=16),
-        'bank_name': fields.char('Bank Name', size=32),
-        'owner_name': fields.char('Account Owner Name', size=64),
-        'street': fields.char('Street', size=128),
-        'zip': fields.char('Zip', change_default=True, size=24),
-        'city': fields.char('City', size=128),
-        'country_id': fields.many2one('res.country', 'Country',
-            change_default=True),
-        'state_id': fields.many2one("res.country.state", 'State',
-            change_default=True, domain="[('country_id','=',country_id)]"),
-        'company_id': fields.many2one('res.company', 'Company',
-            ondelete='cascade', help="Only if this bank account belong to your company"),
-        'partner_id': fields.many2one('res.partner', 'Account Owner', required=True,
-            ondelete='cascade', select=True),
-        'state': fields.selection(_bank_type_get, 'Bank Account Type', required=True,
-            change_default=True),
-        'sequence': fields.integer('Sequence'),
-        'footer': fields.boolean("Display on Reports")
-    }
-    _defaults = {
-        'owner_name': lambda obj, cursor, user, context: obj._default_value(
-            cursor, user, 'name', context=context),
-        'street': lambda obj, cursor, user, context: obj._default_value(
-            cursor, user, 'street', context=context),
-        'city': lambda obj, cursor, user, context: obj._default_value(
-            cursor, user, 'city', context=context),
-        'zip': lambda obj, cursor, user, context: obj._default_value(
-            cursor, user, 'zip', context=context),
-        'country_id': lambda obj, cursor, user, context: obj._default_value(
-            cursor, user, 'country_id', context=context),
-        'state_id': lambda obj, cursor, user, context: obj._default_value(
-            cursor, user, 'state_id', context=context),
-        'name': lambda *args: '/'
-    }
-
-    def fields_get(self, cr, uid, fields=None, context=None):
-        res = super(res_partner_bank, self).fields_get(cr, uid, fields, context)
-        bank_type_obj = self.pool.get('res.partner.bank.type')
-        type_ids = bank_type_obj.search(cr, uid, [])
-        types = bank_type_obj.browse(cr, uid, type_ids)
-        for type in types:
-            for field in type.field_ids:
-                if field.name in res:
-                    res[field.name].setdefault('states', {})
-                    res[field.name]['states'][type.code] = [
-                            ('readonly', field.readonly),
-                            ('required', field.required)]
-        return res
-
-    def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
-            return []
-        bank_type_obj = self.pool.get('res.partner.bank.type')
-        res = []
-        for val in self.browse(cr, uid, ids, context=context):
-            result = val.acc_number
-            if val.state:
-                type_ids = bank_type_obj.search(cr, uid, [('code','=',val.state)])
-                if type_ids:
-                    t = bank_type_obj.browse(cr, uid, type_ids[0], context=context)
-                    try:
-                        result = t.format_layout % val._data[val.id]
-                    except:
-                        result += ' [Formating Error]'
-                        raise
-            res.append((val.id, result))
-        return res
-
-    def onchange_company_id(self, cr, uid, ids, company_id, context={}):
-        result = {}
-        if company_id:
-            c = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
-            if c.partner_id:
-                r = self.onchange_partner_id(cr, uid, ids, c.partner_id.id, context=context)
-                r['value']['partner_id'] = c.partner_id.id
-                r['value']['footer'] = 1
-                result = r
-        return result
-
-    def onchange_bank_id(self, cr, uid, ids, bank_id, context={}):
-        result = {}
-        if bank_id:
-            bank = self.pool.get('res.bank').browse(cr, uid, bank_id, context=context)
-            result['bank_name'] = bank.name
-            result['bank_bic'] = bank.bic
-        return {'value': result}
-
-
-    def onchange_partner_id(self, cr, uid, id, partner_id, context={}):
-        result = {}
-        if partner_id:
-            part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
-            result['owner_name'] = part.name
-            result['street'] = part.address and part.address[0].street or False
-            result['city'] = part.address and part.address[0].city or False
-            result['zip'] =  part.address and part.address[0].zip or False
-            result['country_id'] =  part.address and part.address[0].country_id and part.address[0].country_id.id or False
-            result['state_id'] = part.address and part.address[0].state_id and part.address[0].state_id.id or False
-        return {'value': result}
-
-res_partner_bank()
-
-

=== added file 'openerp/addons/base/res/res_bank_view.xml'
--- openerp/addons/base/res/res_bank_view.xml	1970-01-01 00:00:00 +0000
+++ openerp/addons/base/res/res_bank_view.xml	2011-11-18 15:47:33 +0000
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    <!-- Banks -->
+
+        <record id="view_res_bank_form" model="ir.ui.view">
+            <field name="name">res.bank.form</field>
+            <field name="model">res.bank</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Bank">
+                    <group colspan="4" col="6">
+                        <field name="name" select="1"/>
+                        <field name="bic" select="1"/>
+                        <field name="active" select="2"/>
+                    </group>
+                    <newline/>
+                    <group  colspan="2" col="4">
+                        <separator string="Address" colspan="4"/>
+                        <field name="street" select="2"/>
+                        <field name="street2" select="2"/>
+                        <field name="zip"/>
+                        <field name="city"/>
+                        <field name="country" select="2"/>
+                        <field name="state" select="2"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="Communication" colspan="2"/>
+                        <field name="phone"/>
+                        <field name="fax"/>
+                        <field name="email" widget="email"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_res_bank_tree" model="ir.ui.view">
+            <field name="name">res.bank.tree</field>
+            <field name="model">res.bank</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Banks">
+                    <field name="name"/>
+                    <field name="bic"/>
+                    <field name="country"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="action_res_bank_form" model="ir.actions.act_window">
+            <field name="name">Banks</field>
+            <field name="res_model">res.bank</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help">Manage bank records you want to be used in the system.</field>
+        </record>
+
+        <menuitem action="action_res_bank_form" id="menu_action_res_bank_form"
+            parent="base.menu_config_address_book" sequence="11"
+	    groups="base.group_no_one"/>
+
+
+
+        <record id="view_partner_bank_type_form" model="ir.ui.view">
+            <field name="name">res.partner.bank.type.form</field>
+            <field name="model">res.partner.bank.type</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Bank Account Type">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="field_ids" colspan="4"/>
+                    <field name="format_layout" colspan="4"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_partner_bank_type_tree" model="ir.ui.view">
+            <field name="name">res.partner.bank.type.tree</field>
+            <field name="model">res.partner.bank.type</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Bank Account Type">
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                </tree>
+            </field>
+        </record>
+
+
+        <record id="view_partner_bank_form" model="ir.ui.view">
+            <field name="name">res.partner.bank.form</field>
+            <field name="model">res.partner.bank</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Bank account">
+                    <group colspan="4" col="6">
+                        <field name="state"/>
+                        <field name="company_id" on_change="onchange_company_id(company_id)" invisible="context.get('company_hide', True)" widget="selection"/>
+			<field name="footer" attrs="{'invisible': [('company_id','=',False)]}"/>
+                        <newline/>
+                        <field name="acc_number"/>
+                    </group>
+                    <group name="owner" colspan="2" col="2">
+                        <separator colspan="4" string="Bank Account Owner"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                        <field name="owner_name"/>
+                        <field name="street"/>
+                        <field name="city"/>
+                        <field name="zip"/>
+                        <field name="state_id"/>
+                        <field name="country_id"/>
+                    </group>
+                    <group name="bank" colspan="2" col="2">
+                        <separator colspan="2" string="Information About the Bank"/>
+                        <field name="bank" on_change="onchange_bank_id(bank)" groups="base.group_extended"/>
+                        <field name="bank_name" attrs="{'required': [('company_id','&lt;&gt;',False)]}"/>
+                        <field name="bank_bic"/>
+                    </group>
+
+                </form>
+            </field>
+        </record>
+
+        <record id="view_partner_bank_search" model="ir.ui.view">
+            <field name="name">res.partner.bank.search</field>
+            <field name="model">res.partner.bank</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Bank Accounts">
+		    <filter name="my_bank" icon="terp-check" string="My Banks" domain="[('company_id','&lt;&gt;',False)]" help="Bank accounts belonging to one of your companies"/>
+                    <separator orientation="vertical"/>
+                    <field name="acc_number"/>
+		    <field name="company_id" invisible="context.get('company_hide', True)"/>
+                    <field name="partner_id"/>
+                    <field name="bank_name"/>
+                </search>
+            </field>
+        </record>
+
+
+        <record id="view_partner_bank_tree" model="ir.ui.view">
+            <field name="name">res.partner.bank.tree</field>
+            <field name="model">res.partner.bank</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Bank Accounts">
+                    <field name="sequence" invisible="1"/>
+                    <field name="acc_number"/>
+                    <field name="bank_name"/>
+		    <field name="company_id" invisible="context.get('company_hide', True)"/>
+		    <field name="footer" invisible="context.get('company_hide', True)"/>
+                    <field name="partner_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="action_res_partner_bank_account_form" model="ir.actions.act_window">
+            <field name="name">Bank Accounts</field>
+            <field name="res_model">res.partner.bank</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem action="action_res_partner_bank_account_form"
+            id="menu_action_res_partner_bank_form"
+            parent="base.menu_config_address_book"
+            groups="base.group_no_one"
+            sequence="9"/>
+
+
+        <record id="action_res_partner_bank_type_form" model="ir.actions.act_window">
+            <field name="name">Bank Account Types</field>
+            <field name="res_model">res.partner.bank.type</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem action="action_res_partner_bank_type_form"
+            id="menu_action_res_partner_bank_typeform"
+            parent="base.menu_config_address_book"
+	    groups="base.group_no_one"
+            sequence="15"/>
+
+
+
+    </data>
+</openerp>
+

=== removed file 'openerp/addons/base/res/res_bank_view.xml'
--- openerp/addons/base/res/res_bank_view.xml	2011-08-28 00:13:14 +0000
+++ openerp/addons/base/res/res_bank_view.xml	1970-01-01 00:00:00 +0000
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    <!-- Banks -->
-
-        <record id="view_res_bank_form" model="ir.ui.view">
-            <field name="name">res.bank.form</field>
-            <field name="model">res.bank</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Bank">
-                    <group colspan="4" col="6">
-                        <field name="name" select="1"/>
-                        <field name="bic" select="1"/>
-                        <field name="active" select="2"/>
-                    </group>
-                    <newline/>
-                    <group  colspan="2" col="4">
-                        <separator string="Address" colspan="4"/>
-                        <field name="street" select="2"/>
-                        <field name="street2" select="2"/>
-                        <field name="zip"/>
-                        <field name="city"/>
-                        <field name="country" select="2"/>
-                        <field name="state" select="2"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Communication" colspan="2"/>
-                        <field name="phone"/>
-                        <field name="fax"/>
-                        <field name="email" widget="email"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="view_res_bank_tree" model="ir.ui.view">
-            <field name="name">res.bank.tree</field>
-            <field name="model">res.bank</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Banks">
-                    <field name="name"/>
-                    <field name="bic"/>
-                    <field name="country"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="action_res_bank_form" model="ir.actions.act_window">
-            <field name="name">Banks</field>
-            <field name="res_model">res.bank</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="help">Manage bank records you want to be used in the system.</field>
-        </record>
-
-        <menuitem action="action_res_bank_form" id="menu_action_res_bank_form"
-            parent="base.menu_config_address_book" sequence="11"
-	    groups="base.group_no_one"/>
-
-
-
-        <record id="view_partner_bank_type_form" model="ir.ui.view">
-            <field name="name">res.partner.bank.type.form</field>
-            <field name="model">res.partner.bank.type</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Bank Account Type">
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="field_ids" colspan="4"/>
-                    <field name="format_layout" colspan="4"/>
-                </form>
-            </field>
-        </record>
-
-        <record id="view_partner_bank_type_tree" model="ir.ui.view">
-            <field name="name">res.partner.bank.type.tree</field>
-            <field name="model">res.partner.bank.type</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Bank Account Type">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                </tree>
-            </field>
-        </record>
-
-
-        <record id="view_partner_bank_form" model="ir.ui.view">
-            <field name="name">res.partner.bank.form</field>
-            <field name="model">res.partner.bank</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Bank account">
-                    <group colspan="4" col="6">
-                        <field name="state"/>
-                        <field name="company_id" on_change="onchange_company_id(company_id)" invisible="context.get('company_hide', True)" widget="selection"/>
-			<field name="footer" attrs="{'invisible': [('company_id','=',False)]}"/>
-                        <newline/>
-                        <field name="acc_number"/>
-                    </group>
-                    <group name="owner" colspan="2" col="2">
-                        <separator colspan="4" string="Bank Account Owner"/>
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                        <field name="owner_name"/>
-                        <field name="street"/>
-                        <field name="city"/>
-                        <field name="zip"/>
-                        <field name="state_id"/>
-                        <field name="country_id"/>
-                    </group>
-                    <group name="bank" colspan="2" col="2">
-                        <separator colspan="2" string="Information About the Bank"/>
-                        <field name="bank" on_change="onchange_bank_id(bank)" groups="base.group_extended"/>
-                        <field name="bank_name" attrs="{'required': [('company_id','&lt;&gt;',False)]}"/>
-                        <field name="bank_bic"/>
-                    </group>
-
-                </form>
-            </field>
-        </record>
-
-        <record id="view_partner_bank_search" model="ir.ui.view">
-            <field name="name">res.partner.bank.search</field>
-            <field name="model">res.partner.bank</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Bank Accounts">
-		    <filter name="my_bank" icon="terp-check" string="My Banks" domain="[('company_id','&lt;&gt;',False)]" help="Bank accounts belonging to one of your companies"/>
-                    <separator orientation="vertical"/>
-                    <field name="acc_number"/>
-		    <field name="company_id" invisible="context.get('company_hide', True)"/>
-                    <field name="partner_id"/>
-                    <field name="bank_name"/>
-                </search>
-            </field>
-        </record>
-
-
-        <record id="view_partner_bank_tree" model="ir.ui.view">
-            <field name="name">res.partner.bank.tree</field>
-            <field name="model">res.partner.bank</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Bank Accounts">
-                    <field name="sequence" invisible="1"/>
-                    <field name="acc_number"/>
-                    <field name="bank_name"/>
-		    <field name="company_id" invisible="context.get('company_hide', True)"/>
-		    <field name="footer" invisible="context.get('company_hide', True)"/>
-                    <field name="partner_id"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="action_res_partner_bank_account_form" model="ir.actions.act_window">
-            <field name="name">Bank Accounts</field>
-            <field name="res_model">res.partner.bank</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <menuitem action="action_res_partner_bank_account_form"
-            id="menu_action_res_partner_bank_form"
-            parent="base.menu_config_address_book"
-            groups="base.group_no_one"
-            sequence="9"/>
-
-
-        <record id="action_res_partner_bank_type_form" model="ir.actions.act_window">
-            <field name="name">Bank Account Types</field>
-            <field name="res_model">res.partner.bank.type</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <menuitem action="action_res_partner_bank_type_form"
-            id="menu_action_res_partner_bank_typeform"
-            parent="base.menu_config_address_book"
-	    groups="base.group_no_one"
-            sequence="15"/>
-
-
-
-    </data>
-</openerp>
-