From e8b30b84fb368c45475a96708e95361c8ce5aca9 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 27 Jun 2012 14:29:11 +0530
Subject: [PATCH] [IMP] Change form view of Campaigns in marketing & remove all
 separator title

bzr revid: fka@tinyerp.com-20120627085911-q3fouh5wxw5ffl33
---
 .../marketing_campaign_view.xml               | 52 ++++++++++---------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index aa8ea08217e..f9393dc2adf 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -25,19 +25,18 @@
             </header>
             <sheet string="Campaign">
                 <group>
-                    <group string="Campaign">
+                    <group>
                         <field name="name"/>
                         <field name="mode"/>
+                        <field name="fixed_cost"/>
                     </group>
-                    <group string="Resource">
+                    <group>
                         <field name="object_id"/>
                         <field name="partner_field_id"/>
                         <field name="unique_field_id"/>
                     </group>
-                    <group string="Cost">
-                        <field name="fixed_cost"/>
-                    </group>
                 </group>
+                <separator string="Activities"/>
                 <field name="activity_ids" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" />
             </sheet>
             </form>
@@ -143,15 +142,15 @@
             </header>
             <sheet string="Segments" layout="auto">
                 <group>
-                    <group string="Segment">
+                    <group>
                         <field name="name"/>
                         <field name="campaign_id" on_change="onchange_campaign_id(campaign_id)"/>
                         <field name="object_id" invisible="1"/>
                     </group>
-                    <group string="Filter">
+                    <group>
                         <field name="ir_filter_id"/>
                     </group>
-                    <group string="Synchronization">
+                    <group>
                        <field name="sync_mode" required="True"/>
                        <label for="sync_last_date"/>
                        <div>
@@ -160,7 +159,7 @@
                        </div>
                        <field name="date_next_sync"/>
                     </group>
-                    <group string="History">
+                    <group>
                         <field name="date_run" readonly="1"/>
                         <field name="date_done" readonly="1"/>
                     </group>
@@ -243,32 +242,33 @@
         <field name="arch" type="xml">
             <form string="Activities" version="7.0">
                 <group>
-                    <group string="Activity">
+                    <group>
                         <field name="name"/>
                         <field name="signal" groups="base.group_no_one"/>
                         <field name="start"/>
                         <field name="object_id" invisible="1"/>
                         <field name="campaign_id" invisible="1"/>
                     </group>
-                    <group string="Cost / Revenue">
+                    <group>
                         <field name="variable_cost"/>
                         <field name="revenue"/>
                     </group>
                 </group>
-                <group string="Condition" col="4">
-                    <field name="condition" widget="char" colspan="4"/>
-                    <field name="keep_if_condition_not_met"/>
-                </group>
-                <group col="4">
-                    <separator string="Action" colspan="4"/>
-                    <field name="type"/>
-                    <field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
+                <group  col="4" colspan="4">
+                    <group colspan="2">
+                        <field name="condition" widget="char"/>
+                        <field name="keep_if_condition_not_met"/>
+                    </group>
+                    <group colspan="2">
+                        <field name="type"/>
+                        <field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
                            context="{'default_model_id':object_id}" />
-                    <field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]"/>
-                    <field name="report_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}" context="{'object_id':object_id}"/>
-                    <field name="report_directory_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}"/>
+                        <field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]"/>
+                        <field name="report_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}" context="{'object_id':object_id}"/>
+                        <field name="report_directory_id" attrs="{'required':[('type','=','report')],'invisible':[('type','!=','report')]}"/>
+                    </group>
                 </group>
-                <separator string="Transitions"/>
+                <separator string="Previous Activities"/>
                 <field name="from_ids" mode="tree,form" context="{'default_activity_to_id': active_id}">
                     <tree string="Incoming Transitions" editable="bottom">
                         <field name="activity_from_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
@@ -285,6 +285,7 @@
                         </group>
                     </form>
                 </field>
+                <separator string="Next Activities"/>
                 <field name="to_ids" nolabel="1" mode="tree,form" context="{'default_activity_from_id': active_id}" colspan="2">
                     <tree string="Outgoing Transitions" editable="bottom">
                         <field name="activity_to_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
@@ -363,12 +364,13 @@
             </header>
             <sheet>
                 <group>
-                    <group string="Campaign Step">
+                    <group>
                         <field name="campaign_id"/>
                         <field name="segment_id"/>
                         <field name="activity_id" context="{'segment_id':segment_id}"/>
                         <field name="date"/>
-                    </group><group string="Related Resource">
+                    </group>
+                    <group>
                         <field name="object_id" readonly="True"/>
                         <field name="res_name"/>
                         <field name="res_id"/>