pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP]report_crm: remove field and start report_crm

Browse Source 
bzr revid: sbh@tinyerp.com-20100119133130-x9tvb7ag2d1jnkqx
This commit is contained in:
sbh (Open ERP)
2010-01-19 19:01:30 +05:30
parent a3a7df6d6f
commit 9353314ca9
4 changed files with 19 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/board_crm_configuration/__terp__.py
+1 -1
View File
@@ -37,7 +37,7 @@ This module implements a dashboard for CRM that includes:
'depends': ['board', 'crm', 'report_crm'],
'update_xml': ['board_crm_statistical_view.xml', 'board_crm_view.xml'],
'demo_xml': ['board_crm_demo.xml'],
'installable': True,
'installable': False,
'active': False,
'certificate': '0071599098909',
}
addons/report_crm/__terp__.py
+1 -1
View File
@@ -32,7 +32,7 @@
'init_xml': [],
'update_xml': ['security/ir.model.access.csv', 'report_crm_view.xml'],
'demo_xml': [],
'installable': False, #TODO : After fixed problems , set True
'installable': True, #TODO : After fixed problems , set True
'active': False,
'certificate': '0030422968285',
}
addons/report_crm/report_crm.py
+13 -53
View File
@@ -37,18 +37,13 @@ class report_crm_case_user(osv.osv):
_columns = {
'name': fields.char('Year',size=64,required=False, readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
'amount_revenue': fields.float('Est.Revenue', readonly=True),
'amount_costs': fields.float('Est.Cost', readonly=True),
'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
'nbr': fields.integer('# of Cases', readonly=True),
'probability': fields.float('Avg. Probability', readonly=True),
'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
'delay_close': fields.char('Delay to close', size=20, 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),
}
_order = 'name desc, user_id, section_id'
_order = 'name desc, user_id'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_crm_case_user')
cr.execute("""
@@ -59,16 +54,10 @@ class report_crm_case_user(osv.osv):
to_char(c.create_date, 'MM') as month,
c.state,
c.user_id,
c.section_id,
count(*) as nbr,
sum(planned_revenue) as amount_revenue,
sum(planned_cost) as amount_costs,
sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
avg(probability)::decimal(16,2) as probability,
to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
count(*) as nbr
from
crm_case c
group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id, c.section_id
group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id
)""")
report_crm_case_user()
@@ -78,19 +67,12 @@ class report_crm_case_categ(osv.osv):
_auto = False
_columns = {
'name': fields.char('Year',size=64,required=False, readonly=True),
'categ_id':fields.many2one('crm.case.categ', 'Category', readonly=True),
'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
'amount_revenue': fields.float('Est.Revenue', readonly=True),
'amount_costs': fields.float('Est.Cost', readonly=True),
'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
'nbr': fields.integer('# of Cases', readonly=True),
'probability': fields.float('Avg. Probability', readonly=True),
'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
'delay_close': fields.char('Delay Close', size=20, 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),
}
_order = 'name desc, categ_id, section_id'
_order = 'name desc'
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_crm_case_categ')
cr.execute("""
@@ -100,17 +82,10 @@ class report_crm_case_categ(osv.osv):
to_char(c.create_date, 'YYYY') as name,
to_char(c.create_date, 'MM') as month,
c.state,
c.categ_id,
c.section_id,
count(*) as nbr,
sum(planned_revenue) as amount_revenue,
sum(planned_cost) as amount_costs,
sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
avg(probability)::decimal(16,2) as probability,
to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
count(*) as nbr
from
crm_case c
group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.categ_id, c.section_id
group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state
)""")
report_crm_case_categ()
@@ -145,12 +120,10 @@ class report_crm_case_section(osv.osv):
_columns = {
'name': fields.char('Year',size=64,required=False, readonly=True),
# 'user_id':fields.many2one('res.users', 'User', readonly=True),
'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
'nbr_cases': fields.integer('# of Cases', readonly=True),
'avg_answers': fields.function(_get_data,string='Avg. Answers', method=True,type="integer"),
'perc_done': fields.function(_get_data,string='%Done', method=True,type="float"),
'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"),
'delay_close': fields.char('Delay to close', size=20, readonly=True),
# 'perc_done': fields.function(_get_data,string='%Done', method=True,type="float"),
# 'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"),
'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),
}
@@ -163,12 +136,10 @@ class report_crm_case_section(osv.osv):
min(c.id) as id,
to_char(c.create_date, 'YYYY') as name,
to_char(c.create_date, 'MM') as month,
c.section_id as section_id,
count(*) as nbr_cases,
0 as avg_answers,
0.0 as perc_done,
0.0 as perc_cancel,
to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
0.0 as perc_cancel
from
crm_case c
group by to_char(c.create_date, 'YYYY'),to_char(c.create_date, 'MM'),c.section_id
@@ -183,13 +154,8 @@ class report_crm_case_service_dashboard(osv.osv):
'date': fields.datetime('Date', readonly=True),
'date_deadline': fields.datetime('Deadline', readonly=True),
'name': fields.char('Description', size=64, readonly=True),
'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
'user_id': fields.many2one('res.users', 'Responsible', readonly=True),
'priority': fields.char('Priority', size=64, readonly=True),
'planned_revenue': fields.float('Planned Revenue', readonly=True),
'planned_cost': fields.float('Planned Costs', readonly=True),
'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
'date_closed' : fields.datetime('Date Closed', readonly=True),
'create_date' : fields.datetime('Create Date', readonly=True)
}
_order = 'date_closed, create_date'
@@ -198,19 +164,13 @@ class report_crm_case_service_dashboard(osv.osv):
cr.execute("""create or replace view report_crm_case_service_dashboard as (
select
cse.id as id, cse.date as date, cse.date_deadline as date_deadline,
cse.name as name, cse.partner_id as partner_id, cse.user_id as user_id,
cse.priority as priority, cse.planned_revenue as planned_revenue,
cse.planned_cost as planned_cost, cse.state as state,
cse.date_closed as date_closed, cse.create_date as create_date
cse.name as name, cse.user_id as user_id,
cse.state as state,
cse.create_date as create_date
from
crm_case cse
where
((to_date(to_char(cse.date_closed, 'YYYY-MM-dd'),'YYYY-MM-dd') <= CURRENT_DATE)
AND
(to_date(to_char(cse.date_closed, 'YYYY-MM-dd'),'YYYY-MM-dd') > (CURRENT_DATE-15))
AND
cse.state='done')
(cse.state='done')
OR
((to_date(to_char(cse.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') <= CURRENT_DATE)
addons/report_crm/report_crm_view.xml
+4 -38
View File
@@ -15,13 +15,7 @@
<field name="name" />
<field name="month"/>
<field name="user_id"/>
<field name="section_id"/>
<field name="nbr"/>
<field name="delay_close"/>
<field name="amount_revenue"/>
<field name="amount_costs"/>
<field name="amount_revenue_prob"/>
<field name="probability"/>
<field name="state"/>
</tree>
</field>
@@ -35,7 +29,6 @@
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="user_id" select="1"/>
<field name="section_id" select="1" widget="selection"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
</form>
@@ -70,7 +63,6 @@
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="user_id" select="1"/>
<field name="section_id" select="1" widget="selection"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
</group>
@@ -78,8 +70,8 @@
</field>
</record>
<!-- <menuitem id="crm.next_id_64" name="Reporting" parent="crm.menu_crm" sequence="50"/>-->
<!-- <menuitem id="crm.next_id_52" name="All Cases" parent="crm.next_id_64" sequence="0"/>-->
<menuitem id="crm.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="50"/>
<menuitem id="crm.next_id_52" name="Cases" parent="crm.next_id_64" sequence="0"/>
<record id="action_report_crm_case_user_tree" model="ir.actions.act_window">
<field name="name">Cases by User and Section</field>
@@ -88,7 +80,7 @@
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_crm_case_user_filter"/>
</record>
<!-- <menuitem action="action_report_crm_case_user_tree" id="menu_crm_case_user_tree" parent="crm.next_id_64"/>-->
<menuitem action="action_report_crm_case_user_tree" id="menu_crm_case_user_tree" parent="crm.next_id_52"/>
<!-- # Cases by section and categoryof case -->
@@ -100,14 +92,7 @@
<tree string="Cases by User and Section">
<field name="name"/>
<field name="month"/>
<field name="categ_id"/>
<field name="section_id"/>
<field name="nbr"/>
<field name="delay_close"/>
<field name="amount_revenue"/>
<field name="amount_costs"/>
<field name="amount_revenue_prob"/>
<field name="probability"/>
<field name="state"/>
</tree>
</field>
@@ -120,8 +105,6 @@
<form string="Cases by User and Section">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="categ_id" select="1"/>
<field name="section_id" select="1" widget="selection"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
</form>
@@ -139,9 +122,6 @@
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="categ_id" select="1"/>
<field name="section_id" select="1" widget="selection"/>
<field name="nbr" select="1"/>
<field name="state" select="1"/>
</group>
@@ -156,7 +136,7 @@
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_crm_case_categ_filter"/>
</record>
<!-- <menuitem action="action_report_crm_case_categ_tree" id="menu_crm_case_categ_tree" parent="crm.next_id_64"/>-->
<menuitem action="action_report_crm_case_categ_tree" id="menu_crm_case_categ_tree" parent="crm.next_id_52"/>
<act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_report_crm_case_user" name="Monthly cases" res_model="report.crm.case.user" src_model="res.users"/>
@@ -177,12 +157,8 @@
<tree string="Cases by Section">
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="section_id" select="1"/>
<field name="nbr_cases" select="1"/>
<field name="avg_answers"/>
<field name="perc_done" select="2"/>
<field name="perc_cancel" select="2"/>
<field name="delay_close"/>
</tree>
</field>
</record>
@@ -211,7 +187,6 @@
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="month" select="1"/>
<field name="section_id" select="1"/>
<field name="nbr_cases" select="1"/>
</group>
</search>
@@ -239,11 +214,7 @@
<field name="date" select="1"/>
<field name="date_deadline"/>
<field name="name" select="1"/>
<field name="partner_id" select="2"/>
<field name="user_id" select="2"/>
<field name="priority"/>
<field name="planned_revenue" sum="Planned revenue"/>
<field name="planned_cost" sum="Planned costs"/>
<field name="state" />
</tree>
</field>
@@ -257,13 +228,8 @@
<tree string="CRM Cases">
<field name="date_closed" select="1"/>
<field name="date"/>
<field name="date_deadline"/>
<field name="name"/>
<field name="partner_id" select="2"/>
<field name="user_id" select="2"/>
<field name="priority"/>
<field name="planned_revenue" sum="Planned revenue"/>
<field name="planned_cost" sum="Planned costs"/>
<field name="state" />
</tree>
</field>