diff --git a/addons/marketing_campaign/__init__.py b/addons/marketing_campaign/__init__.py
index 94c40dc8a26..d37d8604380 100755
--- a/addons/marketing_campaign/__init__.py
+++ b/addons/marketing_campaign/__init__.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import marketing_campaign
+import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index a4945e53362..90b7d9f07ab 100755
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -36,6 +36,7 @@
     'init_xml': [],
     'update_xml': [
         'marketing_campaign_view.xml',
+        'report/campaign_analysis_view.xml',
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 7c0dfcc13d5..07a0ef3e252 100755
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -47,10 +47,10 @@ class marketing_campaign(osv.osv): #{{{
                                    ('running', 'Running'),
                                    ('done', 'Done'),
                                    ('cancelled', 'Cancelled'),],
-                                   'State',
-                                   readonly=True), 
+                                   'State',), 
         'activity_ids': fields.one2many('marketing.campaign.activity', 
                                        'campaign_id', 'Activities'),
+        'fixed_cost': fields.float('Fixed Cost'),                                       
         
     }
 
@@ -76,8 +76,7 @@ class marketing_campaign_segment(osv.osv): #{{{
                                    ('running', 'Running'),
                                    ('done', 'Done'),
                                    ('cancelled', 'Cancelled')],
-                                   'State',
-                                   readonly=True), 
+                                   'State',), 
         'date_run': fields.datetime('Running'),
         'date_done': fields.datetime('Done'),
     }
@@ -114,7 +113,8 @@ class marketing_campaign_activity(osv.osv): #{{{
         'subcampaign_id' :fields.many2one('marketing.campaign', 'Sub-Campaign'),
         'subcampaign_segment_id' :fields.many2one('marketing.campaign.segment',
                                                    'Sub Campaign Segment'),
-
+        'variable_cost': fields.float('Variable Cost'),
+        'revenue': fields.float('Revenue')
         }
     def search(self, cr, uid, args, offset=0, limit=None, order=None, 
                                         context=None, count=False):
@@ -146,7 +146,7 @@ class marketing_campaign_transition(osv.osv): #{{{
                                            ('months', 'Months'),
                                             ('years','Years')],'Interval Type')
         }
-    
+
 marketing_campaign_transition() #}}}
 
 class marketing_campaign_workitem(osv.osv): #{{{
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index eefffcf7ff1..f0d7ef032d1 100755
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -2,7 +2,6 @@
 <openerp>
 	<data>
 		<menuitem name="Direct Marketing" id="menu_marketing" parent="base.menu_base_partner"/>
-	
 	<!--
     ======================
     Marketing Campaign
@@ -17,8 +16,9 @@
             <form string="Campaign">
                <group colspan="4">
                     <field name="name" select="1"/>
-                    <field name="object_id" readonly="True" select="1"/>
+                    <field name="object_id" select="1"/>
                     <field name="mode"/>
+                    <field name="fixed_cost"/>
                 </group>
                <field name="activity_ids" nolabel = "1" colspan="4">
                		<form string="Activities">
@@ -26,7 +26,7 @@
 	                <field name="object_id" readonly="True"/>  
 	                 <field name="start"/>              
 	                <field name="condition" colspan="4"/>
-	                <newline/>
+                    <field name="variable_cost" select="1"/>	                
 	                <field name="type"/>
 	                <group colspan="4" attrs="{'invisible':[('type','!=','email')]}" >                
 	                    <field name="email_template_id" attrs="{'required':[('type','=','email')]}" />
@@ -56,6 +56,7 @@
                 <field name="object_id"/>
                 <field name="start"/>
                 <field name="condition"/>
+                <field name="variable_cost" select="1"/>	                
                 <field name="type"/>
                 <field name="report_id"/>
                  <field name="to_ids"/>
@@ -64,7 +65,7 @@
             </tree>
 		    </field>    
             	<separator string="Status" colspan="4" />
-            	<field name="state" nolabel = "1" colspan="4"/>
+            	<field name="state" nolabel = "1" colspan="4" readonly="True"/>
             </form>
         </field>
     </record>
@@ -78,6 +79,7 @@
                 <field name="name" select="1"/>
                 <field name="object_id" select="1"/>
                 <field name="mode"/>
+                <field name="fixed_cost"/>
                 <field name="state"/>
             </tree>
         </field>
@@ -130,7 +132,7 @@
         <field name="arch" type="xml">
             <form string="Segments">
             <group colspan="4">
-                <field name="name" select="1"/>
+                <field name="name" select="1" colspan="4"/>
                 <newline/>
                 <field name="campaign_id" select="1"/>
                 <field name="object_id" select="1" readonly="True"/>
@@ -144,7 +146,7 @@
                 <field name="sync_mode"/>
             </group>
                 <separator string="Status" colspan="4" />
-                <field name="state" nolabel = "1" colspan="4"/>
+                <field name="state" nolabel = "1" colspan="4" readonly="1"/>
             </form>
         </field>
     </record>
@@ -162,7 +164,7 @@
                 <field name="date_done"/>
                 <field name="sync_last_date" string="Sync Date"/>
                 <field name="sync_mode" string="Sync Mode"/>
-                <field name="state"/>
+                <field name="state" />
             </tree>
         </field>
     </record>
@@ -193,7 +195,7 @@
                 <field name="name" select="1" />
                 <field name="start"/>
                 <field name="campaign_id" select="1"/>
-                <field name="object_id"/>                
+                <field name="object_id" readonly="True"/>                
                 <field name="condition" colspan="4"/>
                 <newline/>
                 <field name="type"/>
@@ -306,6 +308,6 @@
     </record>
 
     <menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing" action="action_marketing_campaign_workitem" sequence="30" groups="base.group_extended"/>
-		
+    
 	</data>
 </openerp>
diff --git a/addons/marketing_campaign/report/__init__.py b/addons/marketing_campaign/report/__init__.py
new file mode 100644
index 00000000000..83740cf759b
--- /dev/null
+++ b/addons/marketing_campaign/report/__init__.py
@@ -0,0 +1,24 @@
+# -*- 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 campaign_analysis
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py
new file mode 100644
index 00000000000..428d24673cd
--- /dev/null
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -0,0 +1,99 @@
+# -*- 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/>.
+#
+##############################################################################
+
+from osv import fields, osv
+import tools
+
+class campaign_analysis(osv.osv): #{{{
+    _name = "campaign.analysis"
+    _description = "Campaign Analysis"
+    _auto = False
+    _rec_name = 'date'
+  
+    
+    def _total_cost(self, cr, uid, ids, field_name, arg, context={}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of case and section Data’s IDs
+            @param context: A standard dictionary for contextual values """
+        result = {}
+        for ca_obj in self.browse(cr, uid, ids, context):
+            wi_ids = self.pool.get('marketing.campaign.workitem').search(cr, uid,
+                                    [('segment_id.campaign_id', '=', ca_obj.campaign_id.id)])
+            total_cost = ca_obj.activity_id.variable_cost + \
+                                (ca_obj.campaign_id.fixed_cost / len(wi_ids))
+            result[ca_obj.id] = total_cost
+        return result
+            
+    _columns = {
+        'year': fields.char('Year', size=4, readonly=True),
+        'month':fields.selection([('01','January'), ('02','February'), 
+                    ('03','March'), ('04','April'),('05','May'), ('06','June'), 
+                    ('07','July'), ('08','August'), ('09','September'),
+                    ('10','October'), ('11','November'), ('12','December')], 
+                    'Month', readonly=True),
+        'date': fields.date('Date', readonly=True),
+        'campaign_id': fields.many2one('marketing.campaign', 'Campaign', 
+                                                                readonly=True),
+        'activity_id': fields.many2one('marketing.campaign.activity', 'Activity',
+                                                                 readonly=True),
+        'segment_id': fields.many2one('marketing.campaign.segment', 'Segment', 
+                                                                readonly=True),
+        'partner_id' : fields.many2one('res.partner', 'Partner', readonly=True),
+        'country_id' : fields.related('partner_id','address', 'country_id', type='many2one', 
+                                      relation='res.country', string='Country'),
+#        'case_id': fields.many2one('crm.lead', 'Opportunity', readonly=True),
+#       'count' : fields.integer('Count', readonly=True),
+        'total_cost' : fields.function(_total_cost, string='Cost', method=True, 
+                                                                type="float"),
+        'revenue' : fields.float('Revenue',readonly=True),
+
+    }
+    
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'campaign_analysis')
+        
+        cr.execute("""
+                create or replace view campaign_analysis as (
+                select
+                    wi.id as id,
+                    to_char(wi.date, 'YYYY') as year,
+                    to_char(wi.date, 'MM') as month,
+                    wi.date as date,
+                    s.campaign_id as campaign_id,
+                    wi.activity_id as activity_id,
+                    wi.segment_id as segment_id,
+                    wi.partner_id as partner_id ,
+                    act.revenue as revenue
+                from
+                    marketing_campaign_workitem wi
+                    left join res_partner p on (p.id=wi.partner_id)
+                    left join marketing_campaign_segment s on (s.id=wi.segment_id)
+                    left join marketing_campaign_activity act on (act.id= wi.activity_id),
+                group by
+                    to_char(wi.date, 'YYYY'),to_char(wi.date, 'MM'),
+                    s.campaign_id,wi.activity_id,wi.segment_id,wi.partner_id,revenue,
+                    wi.date,wi.id
+                )
+            """)
+    
+campaign_analysis() #}}}
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
new file mode 100644
index 00000000000..46d57f05efb
--- /dev/null
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+	<record id="view_campaign_analysis_tree" model="ir.ui.view">
+        <field name="name">campaign.analysis.tree</field>
+        <field name="model">campaign.analysis</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Marketing Reports">
+				<field name="month"/>
+                <field name="year"/>
+				<field name="date"/>
+            	<field name="campaign_id"/>
+            	<field name="activity_id"/>
+                <field name="segment_id"/>
+                <field name="partner_id"/>
+                <field name="country_id" />
+                <!--field name="case_id"/-->
+                <!--field name="count"/-->
+                <field name="total_cost"/>
+                <field name="revenue"/>
+            </tree>
+        </field>
+    </record>
+
+	<record id="view_campaign_analysis_search" model="ir.ui.view">
+        <field name="name">campaign.analysis.search</field>
+        <field name="model">campaign.analysis</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Marketing Reports">
+            	<group>
+	                <filter icon="terp-account"
+	                    	string="This Year"
+	                    	domain="[('year','=',time.strftime('%%Y'))]"/>
+	                <filter icon="terp-account"
+	                    	string="This Month"
+	                    	domain="[('month','=',time.strftime('%%m'))]"/>
+	                <separator orientation="vertical"/>
+		            <filter string="Date" icon="terp-account" domain="[('date','=',time.strftime('%%Y/%%m/%%d'))]"/>
+	                <separator orientation="vertical"/>
+					<field name="campaign_id"/>
+					<field name="activity_id"/>
+					<field name="segment_id"/>
+	                <field name="partner_id"/>
+					<field name="country_id"/>
+					<!--field name="case_id"/-->
+                </group>
+            </search>
+        </field>
+    </record>
+
+	<record id="action_campaign_analysis_all" model="ir.actions.act_window">
+        <field name="name">Marketing Report</field>
+        <field name="res_model">campaign.analysis</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="context">{'group_by': [], 'search_default_group_campaign': 1, 'search_default_group_segment': 1}</field>
+        <field name="search_view_id" ref="view_campaign_analysis_search"/>
+    </record>
+
+    <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="menu_marketing" sequence="40"/>
+
+		
+	</data>
+</openerp>