From a3dbfa2811279f4e8b0afee0655add16a1aabfd7 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 30 Nov 2012 18:09:21 +0530
Subject: [PATCH] [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
---
 addons/event_sale/event_sale_view.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index d3ddf04da16..cc00365c980 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -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>