From 2b6f9d07950f12f1a5205c21ea6e5e182f472a36 Mon Sep 17 00:00:00 2001
From: "ssi (Open ERP)" <ssi@tinyerp.com>
Date: Mon, 17 May 2010 15:11:49 +0530
Subject: [PATCH 1/2] [IMP] modified diagram view for campaign in
 marketing_campaign

bzr revid: ssi@tinyerp.com-20100517094149-l8fny164dpj439i7
---
 addons/marketing_campaign/marketing_campaign.py  | 11 ++++++++---
 .../marketing_campaign_view.xml                  | 16 +++++++++++-----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 1af4d4daf40..0222fef5cfa 100755
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -48,7 +48,9 @@ class marketing_campaign(osv.osv): #{{{
                                    ('done', 'Done'),
                                    ('cancelled', 'Cancelled'),],
                                    'State',
-                                   readonly=True),                                    
+                                   readonly=True), 
+        'activity_ids': fields.one2many('marketing.campaign.activity', 
+                                       'campaign_id', 'Activities'),
         
     }
 
@@ -103,8 +105,11 @@ class marketing_campaign_activity(osv.osv): #{{{
         'report_directory_id': fields.many2one('document.directory', 'Directory'),
         'server_action_id': fields.many2one('ir.actions.server', string='Action'),
         'to_ids': fields.one2many('marketing.campaign.transition',
-                                                   'activity_from_id',
-                                                   'Next Activities'),
+                                            'activity_to_id',
+                                            'Next Activities'),
+        'from_ids': fields.one2many('marketing.campaign.transition',
+                                            'activity_from_id',
+                                            'Previous Activities'), 
         'subcampaign_id' :fields.many2one('marketing.campaign', 'Sub-Campaign'),
         'subcampaign_segment_id' :fields.many2one('marketing.campaign.segment',
                                                    'Sub Campaign Segment'),
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index bb64d28240d..34ce4051ead 100755
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -20,8 +20,10 @@
                     <field name="object_id" select="1"/>
                     <field name="mode"/>
                 </group>
-                <separator string="Status" colspan="4" />
-                <field name="state" nolabel = "1" colspan="4"/>
+               <field name="activity_ids" nolabel = "1" colspan="4"/>
+               <separator string="Status" colspan="4" />
+               <field name="state" nolabel = "1" colspan="4"/>
+               <field name="state" nolabel = "1" />
             </form>
         </field>
     </record>
@@ -40,7 +42,8 @@
         </field>
     </record>
 
-    <!--record id="view_marketing_campaign_diagram" model="ir.ui.view">
+
+    <record id="view_marketing_campaign_diagram" model="ir.ui.view">
         <field name="name">marketing.campaign.diagram</field>
         <field name="model">marketing.campaign</field>
         <field name="type">diagram</field>
@@ -49,15 +52,18 @@
 			  <node object="marketing.campaign.activity" shape="rectangle:type!='subcampaign'" bgcolor="gray:start==True">
 			    <field name="name"/>
 			    <field name="type"/>
-                <field name="start" invisible="1"/> 
+                <field name="start" invisible="1"/>
+                <field name="condition"/> 
 			  </node>
 			  <arrow object="marketing.campaign.transition" source="activity_from_id" destination="activity_to_id">
 			    <field name="activity_from_id"/>
 			    <field name="activity_to_id"/>
+			    <field name="interval_nbr"/>
+     			<field name="interval_type"/>
 			  </arrow>
 			</diagram>
         </field>
-    </record-->
+    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_form">
         <field name="name">All Campaigns</field>

From 098e168f32bb3b190c859a7d2a830021e3a9e7b7 Mon Sep 17 00:00:00 2001
From: "DSH (Open ERP)" <dsh@tinyerp.com>
Date: Mon, 17 May 2010 15:35:41 +0530
Subject: [PATCH 2/2] [FIX] read method of ir.model in base calendar

bzr revid: dsh@tinyerp.com-20100517100541-lzprzavlbns5q8i9
---
 addons/base_calendar/base_calendar.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index fd1d60914d1..5546a0e345e 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1618,6 +1618,9 @@ class ir_model(osv.osv):
         @param context: A standard dictionary for contextual values 
         """
 
+        if isinstance(ids, (str, int, long)):
+            ids = [ids]
+
         data = super(ir_model, self).read(cr, uid, ids, fields=fields, \
                         context=context, load=load)
         if data: