odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[Fix]base/res: res.parnter.address inherit compatiblity and open the address view 

bzr revid: sbh@tinyerp.com-20120309065422-2wz5ch29x9qs8lf3
This commit is contained in:
Bhumika (OpenERP) 2012-03-09 12:24:22 +05:30
parent ae33341a64
commit a3a2c698ab
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openerp/addons/base/res/res_partner_view.xml
View File

@ -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>
<!--
=======================

5
openerp/osv/orm.py
View File

@ -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')