[IMP] marketing_campaign: added group_by day for improved cross-analysis

bzr revid: odo@openerp.com-20100913004329-0fleqqugzyn5bxua
This commit is contained in:
Olivier Dony 2010-09-13 02:43:29 +02:00
parent 2f97ff0188
commit 27a92be325
2 changed files with 14 additions and 8 deletions

View File

@ -44,11 +44,12 @@ class campaign_analysis(osv.osv):
_columns = {
'res_id' : fields.integer('Resource', readonly=True),
'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),
'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),
'day': fields.char('Day', size=10, readonly=True),
'date': fields.date('Date', readonly=True),
'campaign_id': fields.many2one('marketing.campaign', 'Campaign',
readonly=True),
@ -63,6 +64,9 @@ class campaign_analysis(osv.osv):
type="float" ),
'revenue': fields.float('Revenue',digits=(16,2),readonly=True),
'count' : fields.integer('# of Actions', readonly=True),
'state': fields.selection([('todo', 'To Do'),
('exception', 'Exception'), ('done', 'Done'),
('cancelled', 'Cancelled')], 'State', readonly=True),
}
def init(self, cr):
tools.drop_view_if_exists(cr, 'campaign_analysis')
@ -73,6 +77,7 @@ class campaign_analysis(osv.osv):
min(wi.res_id) as res_id,
to_char(wi.date::date, 'YYYY') as year,
to_char(wi.date::date, 'MM') as month,
to_char(wi.date::date, 'YYYY-MM-DD') as day,
wi.date::date as date,
s.campaign_id as campaign_id,
wi.activity_id as activity_id,

View File

@ -9,6 +9,7 @@
<tree string="Marketing Reports">
<field name="year" invisible="1"/>
<field name="month" invisible="1"/>
<field name="day" invisible="1"/>
<field name="date" invisible="1"/>
<field name="campaign_id" invisible="1"/>
<field name="activity_id" invisible="1"/>
@ -28,7 +29,7 @@
<field name="model">campaign.analysis</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Marketing Reports">
<search string="Campaign Analysis">
<group>
<filter icon="terp-go-year"
string="This Year"
@ -66,7 +67,7 @@
<separator orientation="vertical"/>
<filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Date" icon="terp-go-today" context="{'group_by':'date'}"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
@ -75,7 +76,7 @@
</record>
<record id="action_campaign_analysis_all" model="ir.actions.act_window">
<field name="name">Campaigns</field>
<field name="name">Campaign Analysis</field>
<field name="res_model">campaign.analysis</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>