From a3a2c698ab727ecde4e7cb7f55dde82ec616cc16 Mon Sep 17 00:00:00 2001
From: "Bhumika (OpenERP)" <sbh@tinyerp.com>
Date: Fri, 9 Mar 2012 12:24:22 +0530
Subject: [PATCH] [Fix]base/res: res.parnter.address inherit  compatiblity and
 open the address view

bzr revid: sbh@tinyerp.com-20120309065422-2wz5ch29x9qs8lf3
---
 openerp/addons/base/res/res_partner_view.xml | 8 ++++----
 openerp/osv/orm.py                           | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index a7e8728da95..07e70044934 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -20,7 +20,7 @@
           =====================
         -->
 
-        <!--record id="view_res_partner_address_filter" model="ir.ui.view">
+        <record id="view_res_partner_address_filter" model="ir.ui.view">
             <field name="name">res.partner.address.select</field>
             <field name="model">res.partner.address</field>
             <field name="type">search</field>
@@ -200,14 +200,14 @@
         </record>
         <menuitem action="action_partner_address_form" id="menu_partner_address_form"
             groups="base.group_extended" name="Contacts"
-            parent="base.menu_address_book" sequence="30"/-->
+            parent="base.menu_address_book" sequence="30"/>
 
         <!--
           =========================================
           the short form used in the partner form
           =========================================
         -->
-        <!--record id="view_partner_address_form2" model="ir.ui.view">
+        <record id="view_partner_address_form2" model="ir.ui.view">
             <field name="name">res.partner.address.form2</field>
             <field name="model">res.partner.address</field>
             <field name="type">form</field>
@@ -234,7 +234,7 @@
                     <field name="email" widget="email"/>
                 </form>
             </field>
-        </record-->
+        </record>
 
         <!--
           =======================
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 8901cf5ed87..680eb034a50 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -866,7 +866,10 @@ class BaseModel(object):
                 parent_names = [parent_names]
             else:
                 name = cls._name
-
+            # for res.parnter.address compatiblity ,should be remove in v7
+            if 'res.partner.address' in parent_names:
+                parent_names.pop(parent_names.index('res.partner.address'))
+                parent_names.append('res.partner')
             if not name:
                 raise TypeError('_name is mandatory in case of multiple inheritance')