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

[MERGE] Merged with server/trunk. 

bzr revid: tde@openerp.com-20120814183324-d2eza8ffbud1ewvn
This commit is contained in:
Thibault Delavallée 2012-08-14 20:33:24 +02:00
parent c8560f6029 7290d5880d
commit 594f5a4ffe
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openerp/addons/base/res/res_partner_demo.xml
View File

@ -6,7 +6,7 @@
-->
<record id="res_partner_category_0" model="res.partner.category">
<field name="name">Customer</field>
<field name="name">Partner</field>
</record>
<record id="res_partner_category_1" model="res.partner.category">
<field name="name">Supplier</field>
@ -18,15 +18,15 @@
<field name="name">Employee</field>
</record>
<record id="res_partner_category_4" model="res.partner.category">
<field name="name">Gold Partner</field>
<field name="name">Gold</field>
<field name="parent_id" ref="res_partner_category_0"/>
</record>
<record id="res_partner_category_5" model="res.partner.category">
<field name="name">Silver Partner</field>
<field name="name">Silver</field>
<field name="parent_id" ref="res_partner_category_0"/>
</record>
<record id="res_partner_category_6" model="res.partner.category">
<field name="name">Bronze Partner</field>
<field name="name">Bronze</field>
<field name="parent_id" ref="res_partner_category_0"/>
</record>
<record id="res_partner_category_7" model="res.partner.category">
@ -35,35 +35,27 @@
</record>
<record id="res_partner_category_8" model="res.partner.category">
<field name="name">Consultancy Services</field>
<field name="parent_id" ref="res_partner_category_0"/>
</record>
<record id="res_partner_category_9" model="res.partner.category">
<field name="name">Components Buyer</field>
<field name="parent_id" ref="res_partner_category_0"/>
</record>
<record id="res_partner_category_11" model="res.partner.category">
<field name="name">Services</field>
<field name="parent_id" ref="res_partner_category_1"/>
</record>
<record id="res_partner_category_12" model="res.partner.category">
<field name="name">Office Supplies</field>
<field name="parent_id" ref="res_partner_category_1"/>
</record>
<record id="res_partner_category_13" model="res.partner.category">
<field name="name">Distributor</field>
<field name="parent_id" ref="res_partner_category_1"/>
</record>
<record id="res_partner_category_14" model="res.partner.category">
<field name="name">Manufacturer</field>
<field name="parent_id" ref="res_partner_category_1"/>
</record>
<record id="res_partner_category_15" model="res.partner.category">
<field name="name">Wholesaler</field>
<field name="parent_id" ref="res_partner_category_1"/>
</record>
<record id="res_partner_category_16" model="res.partner.category">
<field name="name">Retailer</field>
<field name="parent_id" ref="res_partner_category_1"/>
</record>
<record id="res_partner_category_17" model="res.partner.category">
<field name="name">Company Contact</field>

16
openerp/addons/base/test/test_osv_expression.yml
View File

@ -2,22 +2,8 @@
Testing for hierarchical search in M2M
-
!python {model: res.partner }: |
ids = self.search(cr, uid, [('category_id', 'child_of','supplier')])
ids = self.search(cr, uid, [('category_id', 'child_of',ref('res_partner_category_0'))])
assert len(ids) >= 1, ids
-
Test hierarchical search in M2M with child ID1
-
!python {model: res.partner }: |
ids = self.search(cr, uid, [('category_id', 'child_of','Customer')])
assert len(ids) >= 1, ids
-
Test hierarchical search in M2M with child ID2
-
!python {model: res.partner }: |
ids = self.search(cr, uid, [('category_id', 'child_of','Manufacturer')])
assert len(ids) == 2, ids
-
"1.0 Setup test partner categories: parent root"
-