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

[MERGE] merged the kjo branch with bugfix related to the merge of res.partner and res.partner.address 

bzr revid: qdp-launchpad@openerp.com-20120321092714-245sbeu3ufmnrmn1
This commit is contained in:
Quentin (OpenERP) 2012-03-21 10:27:14 +01:00
parent 07fc0be0ec 98238da50e
commit 4a83c5e3ac
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/delivery/delivery_demo.xml
View File

@ -7,11 +7,6 @@
<record id="delivery_partner" model="res.partner">
<field name="name">The Poste</field>
</record>
<record id="delivery_partner_address" model="res.partner.address">
<field name="type">default</field>
<field name="partner_id" ref="delivery_partner"/>
</record>
<!-- Create a service product -->
<record id="delivery_product" model="product.product">

2
addons/membership/membership_view.xml
View File

@ -215,7 +215,7 @@
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_tree"/>
<field name="arch" type="xml">
<tree string="Partners">
<tree string="Contacts">
<field name="category_id" position="after"/>
<field name="membership_state"/>
</tree>