[MERGE] merged trunk-dev-framework: rng changes

bzr revid: odo@openerp.com-20100408123642-pj2t7l086glx19bj
This commit is contained in:
Olivier Dony
2010-04-08 14:36:42 +02:00
2 changed files with 2 additions and 3 deletions
+2 -2
View File
@@ -346,8 +346,7 @@
<filter string="My Partners" icon="terp-partner" domain="[('user_id','=',uid)]"/>
<separator orientation="vertical"/>
<filter string="Customers" icon="terp-partner" domain="[('customer','=',1)]" help="Customer Partners"/>
<filter string="Suppliers" icon="terp-partner" domain="[('supplier','=',1)]" help="Supplier Partners"
default="context.get('default_supplier',False)"/>
<filter string="Suppliers" icon="terp-partner" domain="[('supplier','=',1)]" help="Supplier Partners" name='supplier'/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="address" select="1"/>
@@ -364,6 +363,7 @@
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.partner</field>
<field name="view_type">form</field>
<field name="context">{"search_default_supplier":supplier}</field>
<field name="search_view_id" ref="view_res_partner_filter"/>
</record>
<record id="action_partner_form_view1" model="ir.actions.act_window.view">
-1
View File
@@ -552,7 +552,6 @@
<rng:optional><rng:attribute name="context"/></rng:optional>
<rng:optional><rng:attribute name="help"/></rng:optional>
<rng:optional><rng:attribute name="domain"/></rng:optional>
<rng:optional><rng:attribute name="default"/></rng:optional>
<rng:zeroOrMore>
<rng:choice>
<rng:ref name="form" />