[ADD] event:added event config setting to install event_sale and website_event_track for event configuration

5 files changed, 68 insertions, 18 deletions

diff --git a/addons/event/__init__.py b/addons/event/__init__.py
index d653a6d4081..fc0009f7381 100644
--- a/addons/event/__init__.py
+++ b/addons/event/__init__.py
@@ -23,3 +23,4 @@ import event
 import wizard
 import report
 import res_partner
+import res_config
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index d31f408ab92..b5bcab082cf 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -47,6 +47,7 @@ Key Features
         'event_data.xml',
         'report/report_event_registration_view.xml',
         'res_partner_view.xml',
+        'res_config_view.xml',
         'email_template.xml',
         'views/event.xml',
     ],
diff --git a/addons/event/res_config.py b/addons/event/res_config.py
new file mode 100644
index 00000000000..215dc34f414
--- /dev/null
+++ b/addons/event/res_config.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from openerp.osv import fields, osv
+
+class event_config_settings(osv.TransientModel):
+    _name='marketing.config.settings'
+    _inherit='marketing.config.settings'
+    _columns = {
+        'module_event_sale': fields.boolean(
+            'Sale different type of ticket',
+            help='Install the event_sale module'),
+        'module_website_event_track': fields.boolean(
+            'Organize few days event with track,full agenda,own menu in website'),
+    }
+
diff --git a/addons/event/res_config_view.xml b/addons/event/res_config_view.xml
new file mode 100644
index 00000000000..fecb77cd42e
--- /dev/null
+++ b/addons/event/res_config_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+         <record id="view_event_configuration" model="ir.ui.view">
+            <field name="model">marketing.config.settings</field>
+            <field name="inherit_id" ref="marketing.view_marketing_configuration"/>
+            <field name="arch" type="xml">
+                <div name="config_setting" position="inside">                   
+                    <separator string="Event Features"/>
+                    <group>
+                        <label for="id" string="Settings"/>     
+                        <div>                        
+                            <div name="module_event_sale">    
+                                <field name="module_event_sale" class="oe_inline"/>
+                                <label for="module_event_sale"/>
+                            </div>
+                            <div name="module_website_event_track">
+                                <field name="module_website_event_track"/>
+                                <label for="module_website_event_track"/>
+                            </div>
+                        </div>
+                    </group>
+                </div>                  
+            </field>
+        </record>
+    </data>
+</openerp>
+                    
+                 
+       
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index 81db37cb53b..6d15ac883cf 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -12,26 +12,28 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <separator string="Mass Mailing"/>
-                    <group>
-                        <label for="id" string="Settings"/>
-                        <div>
-                            <div name="module_mass_mailing">
-                                <field name="module_mass_mailing" class="oe_inline"/>
-                                <label for="module_mass_mailing"/>
+                    <div name="config_setting">        
+                        <separator string="Mass Mailing"/>
+                        <group>
+                            <label for="id" string="Settings"/>
+                            <div>
+                                <div name="module_mass_mailing">
+                                    <field name="module_mass_mailing" class="oe_inline"/>
+                                    <label for="module_mass_mailing"/>
+                                </div>
                             </div>
-                        </div>
-                    </group>
-                    <separator string="Marketing Campaigns"/>
-                    <group>
-                        <label for="id" string="Settings"/>
-                        <div>
-                            <div name="module_marketing_campaign">
-                                <field name="module_marketing_campaign" class="oe_inline"/>
-                                <label for="module_marketing_campaign"/>
+                        </group>
+                        <separator string="Marketing Campaigns"/>
+                        <group>
+                            <label for="id" string="Settings"/>
+                            <div>
+                                <div name="module_marketing_campaign">
+                                    <field name="module_marketing_campaign" class="oe_inline"/>
+                                    <label for="module_marketing_campaign"/>
+                                </div>
                             </div>
-                        </div>
-                    </group>
+                        </group>
+                     </div>
                 </form>
             </field>
         </record>