[MERGE] event_sale: event field should be have label and appear near to product in sale order line

bzr revid: hmo@tinyerp.com-20121130123921-911rxlkewwat4u4w
This commit is contained in:
Harry (OpenERP) 2012-11-30 18:09:21 +05:30
parent ca668a8acb
commit a3dbfa2811
1 changed files with 2 additions and 5 deletions

View File

@ -21,11 +21,8 @@
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form" />
<field name="arch" type="xml">
<xpath expr="//div[@name='discount']" position="after">
<label for="event" string="Event"/>
<div name="event">
<field name="event_id" colspan="3" class="oe_inline" domain="[('type', 'in', list(set((event_type_id,False))))]" attrs="{'invisible': [('event_ok', '=', False)],'required': [('event_ok', '!=', False)]}"/>
</div>
<xpath expr="//field[@name='product_id']" position="after">
<field name="event_id" domain="['|', ('type','=', False),('type', '=', event_type_id)]" attrs="{'invisible': [('event_ok', '=', False)],'required': [('event_ok', '!=', False)]}"/>
<field name="event_type_id" invisible="1"/>
<field name="event_ok" invisible="1"/>
</xpath>