From f225b93634c2f82d67e2b46c62538eefc7152326 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Thu, 1 Mar 2012 17:25:13 +0100
Subject: [PATCH 1/5] [FIX] creating a module to solve conflict problem between
 sale_layout and event_sale and add a product event demo

bzr revid: mva@openerp.com-20120301162513-iixce1y7fasknb0y
---
 addons/event_sale/__openerp__.py              |  1 +
 addons/event_sale/event_demo.xml              | 12 ++++++
 addons/event_sale/event_sale_view.xml         |  4 +-
 addons/event_sale_layout/__init__.py          | 22 ++++++++++
 addons/event_sale_layout/__openerp__.py       | 40 +++++++++++++++++++
 .../event_sale_layout/event_sale_layout.xml   | 18 +++++++++
 6 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 addons/event_sale/event_demo.xml
 create mode 100644 addons/event_sale_layout/__init__.py
 create mode 100644 addons/event_sale_layout/__openerp__.py
 create mode 100644 addons/event_sale_layout/event_sale_layout.xml

diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index 1a72403b84b..f92a9eb5617 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -37,6 +37,7 @@ It defines a new kind of service products that offers you the possibility to cho
     'depends': ['event','sale','sale_crm'],
     'update_xml': [
         'event_sale_view.xml',
+        'event_demo.xml',
     ],
     'test':['test/confirm.yml'],
     'installable': True,
diff --git a/addons/event_sale/event_demo.xml b/addons/event_sale/event_demo.xml
new file mode 100644
index 00000000000..fe7833bf965
--- /dev/null
+++ b/addons/event_sale/event_demo.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+
+    <record id="event_product" model="product.product">
+        <field name="name">technical training</field>
+        <field name="event_ok">True</field>
+        <field name="event_type_id">2</field>
+    </record>
+    </data>
+</openerp>
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 4387e3a725a..81bdfabf765 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -24,8 +24,8 @@
              <field name="arch" type="xml">
                 <xpath expr="//field[@name='discount']" position="after">
                     <field name="event_id" colspan="3" domain="[('type', 'in', list(set((event_type_id,False))))]" attrs="{'invisible': [('event_ok', '=', False)],'required': [('event_ok', '!=', False)]}"/>
-                    <field name="event_type_id" invisible="1"/>
-                    <field name="event_ok" invisible="1"/>
+                    <field name="event_type_id" />
+                    <field name="event_ok"/>
                 </xpath>
              </field>
         </record>
diff --git a/addons/event_sale_layout/__init__.py b/addons/event_sale_layout/__init__.py
new file mode 100644
index 00000000000..0b00935d85e
--- /dev/null
+++ b/addons/event_sale_layout/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import event_sale_layout
diff --git a/addons/event_sale_layout/__openerp__.py b/addons/event_sale_layout/__openerp__.py
new file mode 100644
index 00000000000..0d882d1f0bc
--- /dev/null
+++ b/addons/event_sale_layout/__openerp__.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Events Sales layout',
+    'version': '0.1',
+    'category': 'Tools',
+    'complexity': "easy",
+    'description': """
+    change the layout to match with sale layout
+""",
+    'author': 'OpenERP SA',
+    'depends': ['event_sale','sale_layout'],
+    'update_xml': [
+        'event_sale_layout.xml',
+    ],
+    'installable': True,
+    'auto_install':True,
+    'category': 'Hidden',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event_sale_layout/event_sale_layout.xml b/addons/event_sale_layout/event_sale_layout.xml
new file mode 100644
index 00000000000..26ba71b1938
--- /dev/null
+++ b/addons/event_sale_layout/event_sale_layout.xml
@@ -0,0 +1,18 @@
+<openerp>
+<data>
+    <record model="ir.ui.view" id="view_order_form_inherit_1">
+      <field name="name">event.sale.order</field>
+      <field name="model">sale.order</field>
+      <field name="type">form</field>
+      <field name="priority">10000</field>
+      <field name="inherit_id" ref="sale.view_order_form" />
+      <field name="arch" type="xml">
+         <xpath expr="//field[@name='discount']" position="after">
+             <field name="event_id" colspan="3" domain="[('type', 'in', list(set((event_type_id,False))))]" attrs="{'invisible': [('event_ok', '=', False)],'required': [('event_ok', '!=', False)]}"/>
+             <field name="event_type_id" invisible='1'/>
+             <field name="event_ok" invisible='1'/>
+         </xpath>
+      </field>
+ </record>
+</data>
+</openerp>

From 9a5ad96b742e9830b5b735818a1c4b68aa248f9e Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Fri, 2 Mar 2012 08:52:12 +0100
Subject: [PATCH 2/5] [FIX] remove the import

bzr revid: mva@openerp.com-20120302075212-90ac7rvanqfg9z2z
---
 addons/event_sale_layout/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/event_sale_layout/__init__.py b/addons/event_sale_layout/__init__.py
index 0b00935d85e..26c654db9dd 100644
--- a/addons/event_sale_layout/__init__.py
+++ b/addons/event_sale_layout/__init__.py
@@ -19,4 +19,3 @@
 #
 ##############################################################################
 
-import event_sale_layout

From 6a5e210d490737bbf4cbc884920092e4378f545a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 12 Mar 2012 12:44:04 +0100
Subject: [PATCH 3/5] [IMP] event_sale: better demo data

bzr revid: qdp-launchpad@openerp.com-20120312114404-2ter4n11mkyy85gh
---
 addons/event_sale/event_demo.xml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/addons/event_sale/event_demo.xml b/addons/event_sale/event_demo.xml
index fe7833bf965..6dd696225a3 100644
--- a/addons/event_sale/event_demo.xml
+++ b/addons/event_sale/event_demo.xml
@@ -1,12 +1,25 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
+    <record id="event_technical_training" model="event.event">
+        <field name="name">Technical training in Grand-Rosiere</field>
+        <field eval="(DateTime.now() + timedelta(15)).strftime('%Y-%m-%d 7:00:00')" name="date_begin"/>
+        <field eval="(DateTime.now() + timedelta(20)).strftime('%Y-%m-%d 16:00:00')" name="date_end"/>
+        <field name="type" ref="event.event_type_4"/>
+        <field name="user_id" ref="base.user_root"/>
+    </record>
 
     <record id="event_product" model="product.product">
-        <field name="name">technical training</field>
+        <field name="name">Technical Training</field>
         <field name="event_ok">True</field>
-        <field name="event_type_id">2</field>
+        <field name="event_type_id" ref="event.event_type_4"/>
+        <field name="categ_id" ref="product.cat1"/>
+        <field name="type">service</field>
+        <field name="list_price">2500.0</field>
+        <field name="standard_price">1000.0</field>
+        <field name="supply_method">produce</field>
+        <field name="uom_id" ref="product.product_uom_unit"/>
+        <field name="uom_po_id" ref="product.product_uom_unit"/>
     </record>
     </data>
 </openerp>

From d0c2d2c45f42812eb45695fb1f31b0b81c9040ea Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 12 Mar 2012 12:46:02 +0100
Subject: [PATCH 4/5] [FIX] event_sale: fields set back to invisible on
 sale.order.line

bzr revid: qdp-launchpad@openerp.com-20120312114602-ckonmf9044u1m4ej
---
 addons/event_sale/event_sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 81bdfabf765..4387e3a725a 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -24,8 +24,8 @@
              <field name="arch" type="xml">
                 <xpath expr="//field[@name='discount']" position="after">
                     <field name="event_id" colspan="3" domain="[('type', 'in', list(set((event_type_id,False))))]" attrs="{'invisible': [('event_ok', '=', False)],'required': [('event_ok', '!=', False)]}"/>
-                    <field name="event_type_id" />
-                    <field name="event_ok"/>
+                    <field name="event_type_id" invisible="1"/>
+                    <field name="event_ok" invisible="1"/>
                 </xpath>
              </field>
         </record>

From 3dd0a4c334bc6bfc07f02f09c6bbf529e7d27071 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 12 Mar 2012 12:56:01 +0100
Subject: [PATCH 5/5] [IMP] event_sale_layout: better module description

bzr revid: qdp-launchpad@openerp.com-20120312115601-ne4dwkl76o6jeo8a
---
 addons/event_sale_layout/__openerp__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event_sale_layout/__openerp__.py b/addons/event_sale_layout/__openerp__.py
index 0d882d1f0bc..c81c4c83c7b 100644
--- a/addons/event_sale_layout/__openerp__.py
+++ b/addons/event_sale_layout/__openerp__.py
@@ -26,8 +26,8 @@
     'category': 'Tools',
     'complexity': "easy",
     'description': """
-    change the layout to match with sale layout
-""",
+    This module ensures the compatibility of the changes made on the sale.order.line form view in event_sale with the sale_layout module (that is replacing the whole field in the view by another one). Its installation is automatically triggered when both modules are installed.
+    """,
     'author': 'OpenERP SA',
     'depends': ['event_sale','sale_layout'],
     'update_xml': [