From 133eae16facd90d5243ffaea07989e86520e12a4 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 3 Mar 2010 13:05:30 +0530 Subject: [PATCH 1/7] [Fix] report_crm: Fix action name bzr revid: sbh@tinyerp.com-20100303073530-ay4e8x2p40c011rd --- addons/report_crm/report_crm_claim_view.xml | 2 +- addons/report_crm/report_crm_lead_view.xml | 2 +- addons/report_crm/report_crm_opportunity_view.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/report_crm/report_crm_claim_view.xml b/addons/report_crm/report_crm_claim_view.xml index 013650abcef..269d3f8cb1e 100644 --- a/addons/report_crm/report_crm_claim_view.xml +++ b/addons/report_crm/report_crm_claim_view.xml @@ -64,7 +64,7 @@ - + Claim report.crm.claim form diff --git a/addons/report_crm/report_crm_lead_view.xml b/addons/report_crm/report_crm_lead_view.xml index 1278942532d..c19b16f8774 100644 --- a/addons/report_crm/report_crm_lead_view.xml +++ b/addons/report_crm/report_crm_lead_view.xml @@ -62,7 +62,7 @@ - + Leads report.crm.lead form diff --git a/addons/report_crm/report_crm_opportunity_view.xml b/addons/report_crm/report_crm_opportunity_view.xml index bc53df1ed39..95ed4dc529c 100644 --- a/addons/report_crm/report_crm_opportunity_view.xml +++ b/addons/report_crm/report_crm_opportunity_view.xml @@ -65,7 +65,7 @@ - + Opportunity report.crm.opportunity form From 17c075a4be5e5f75e825e5a47e93aa1d078ee382 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 3 Mar 2010 13:39:52 +0530 Subject: [PATCH 2/7] [IMP] report_crm: changed the menu name and remove the unused code bzr revid: sbh@tinyerp.com-20100303080952-02gsv4sb2m3c8fls --- addons/report_crm/report_crm_claim_view.xml | 4 +- .../report_crm_fundraising_view.xml | 6 +- addons/report_crm/report_crm_lead_view.xml | 54 +----------------- .../report_crm_opportunity_view.xml | 52 ------------------ .../report_crm/report_crm_phonecall_view.xml | 55 +------------------ 5 files changed, 8 insertions(+), 163 deletions(-) diff --git a/addons/report_crm/report_crm_claim_view.xml b/addons/report_crm/report_crm_claim_view.xml index 269d3f8cb1e..d870d9d446b 100644 --- a/addons/report_crm/report_crm_claim_view.xml +++ b/addons/report_crm/report_crm_claim_view.xml @@ -89,8 +89,8 @@ - - + + diff --git a/addons/report_crm/report_crm_fundraising_view.xml b/addons/report_crm/report_crm_fundraising_view.xml index e3c19a2def1..3b421c48334 100644 --- a/addons/report_crm/report_crm_fundraising_view.xml +++ b/addons/report_crm/report_crm_fundraising_view.xml @@ -67,7 +67,7 @@ - Fundraising by User and Section + Fundraising report.crm.fundraising form graph,tree @@ -82,8 +82,8 @@ - - + + diff --git a/addons/report_crm/report_crm_lead_view.xml b/addons/report_crm/report_crm_lead_view.xml index c19b16f8774..2fece1dea34 100644 --- a/addons/report_crm/report_crm_lead_view.xml +++ b/addons/report_crm/report_crm_lead_view.xml @@ -69,6 +69,7 @@ graph,tree + @@ -86,59 +87,6 @@ - - - - diff --git a/addons/report_crm/report_crm_opportunity_view.xml b/addons/report_crm/report_crm_opportunity_view.xml index 95ed4dc529c..69fa142d65d 100644 --- a/addons/report_crm/report_crm_opportunity_view.xml +++ b/addons/report_crm/report_crm_opportunity_view.xml @@ -79,58 +79,6 @@ - - - diff --git a/addons/report_crm/report_crm_phonecall_view.xml b/addons/report_crm/report_crm_phonecall_view.xml index 99dfc654a11..d1264f10ff1 100644 --- a/addons/report_crm/report_crm_phonecall_view.xml +++ b/addons/report_crm/report_crm_phonecall_view.xml @@ -82,7 +82,7 @@ - Phone calls by User and Section + Phone calls report.crm.phonecall form graph,tree @@ -96,59 +96,8 @@ - - - ---> + From 31880d19b8740d7c877dcaafdb35e8690f01f180 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 3 Mar 2010 13:42:48 +0530 Subject: [PATCH 3/7] [Fix] report_crm: Set the search view in lead report bzr revid: sbh@tinyerp.com-20100303081248-owvx7k7pdllx7n62 --- addons/report_crm/report_crm_lead_view.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/report_crm/report_crm_lead_view.xml b/addons/report_crm/report_crm_lead_view.xml index 2fece1dea34..6b027929002 100644 --- a/addons/report_crm/report_crm_lead_view.xml +++ b/addons/report_crm/report_crm_lead_view.xml @@ -55,9 +55,7 @@ search - - From 7b2affe88b2758a4fa14502296dc8a1582699c2e Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 3 Mar 2010 14:16:16 +0530 Subject: [PATCH 4/7] [IMP] report_crm,crm_project: modify the search view and object bzr revid: sbh@tinyerp.com-20100303084616-4fbdf15a6mumgy8j --- .../report/report_crm_project_bug.py | 107 +--------- .../report_crm_project_bug_view.xml | 185 ++++-------------- .../crm_project/security/ir.model.access.csv | 4 +- .../report_crm_opportunity_view.xml | 2 +- 4 files changed, 52 insertions(+), 246 deletions(-) diff --git a/addons/crm_project/report/report_crm_project_bug.py b/addons/crm_project/report/report_crm_project_bug.py index 25ef06db7cd..51a589a46fb 100644 --- a/addons/crm_project/report/report_crm_project_bug.py +++ b/addons/crm_project/report/report_crm_project_bug.py @@ -1,12 +1,14 @@ from osv import fields,osv import tools -class report_crm_project_bug_user(osv.osv): - _name = "report.crm.project.bug.user" +class report_crm_project_bug(osv.osv): + _name = "report.crm.project.bug" _description = "Project Bug by user and section" _auto = False - _inherit = "report.crm.case.user" + _inherit = "report.crm.case" _columns = { + 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.bug')]"), + 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'crm.project.bug')]"), 'probability': fields.float('Avg. Probability', readonly=True), 'amount_revenue': fields.float('Est.Revenue', readonly=True), 'amount_costs': fields.float('Est.Cost', readonly=True), @@ -14,9 +16,9 @@ class report_crm_project_bug_user(osv.osv): 'delay_close': fields.char('Delay to close', size=20, readonly=True), } def init(self, cr): - tools.drop_view_if_exists(cr, 'report_crm_project_bug_user') + tools.drop_view_if_exists(cr, 'report_crm_project_bug') cr.execute(""" - create or replace view report_crm_project_bug_user as ( + create or replace view report_crm_project_bug as ( select min(c.id) as id, to_char(c.create_date, 'YYYY') as name, @@ -24,43 +26,8 @@ class report_crm_project_bug_user(osv.osv): 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 - from - crm_project_bug c - group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id - )""") -report_crm_project_bug_user() - -class report_crm_project_bug_categ(osv.osv): - _name = "report.crm.project.bug.categ" - _description = "Project Bug by section and category" - _auto = False - _inherit = "report.crm.case.categ" - _columns = { - 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.bug')]"), - '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), - 'probability': fields.float('Avg. Probability', readonly=True), - 'delay_close': fields.char('Delay Close', size=20, readonly=True), - } - - def init(self, cr): - tools.drop_view_if_exists(cr, 'report_crm_project_bug_categ') - cr.execute(""" - create or replace view report_crm_project_bug_categ as ( - select - min(c.id) as id, - to_char(c.create_date, 'YYYY') as name, - to_char(c.create_date, 'MM') as month, c.categ_id, - c.state, - c.section_id, + c.stage_id, count(*) as nbr, sum(planned_revenue) as amount_revenue, sum(planned_cost) as amount_costs, @@ -69,63 +36,9 @@ class report_crm_project_bug_categ(osv.osv): to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close from crm_project_bug c - group by c.categ_id,to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state,c.section_id + group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.categ_id,c.stage_id )""") -report_crm_project_bug_categ() +report_crm_project_bug() -class report_crm_project_bug_section(osv.osv): - _name = "report.crm.project.bug.section" - _description = "Project bug by Section" - _auto = False - _inherit = "report.crm.case.section" - - def _get_data(self, cr, uid, ids, field_name, arg, context={}): - res = {} - state_perc = 0.0 - avg_ans = 0.0 - - for case in self.browse(cr, uid, ids, context): - if field_name != 'avg_answers': - state = field_name[5:] - cr.execute("select count(*) from crm_project_bug where section_id =%s and state='%s'"%(case.section_id.id,state)) - state_cases = cr.fetchone()[0] - perc_state = (state_cases / float(case.nbr_cases) ) * 100 - - res[case.id] = perc_state - else: - cr.execute('select count(*) from crm_case_log l where l.section_id=%s'%(case.section_id.id)) - logs = cr.fetchone()[0] - - avg_ans = logs / case.nbr_cases - res[case.id] = avg_ans - - return res - - _columns = { - '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), - } - _order = 'name desc, section_id' - def init(self, cr): - tools.drop_view_if_exists(cr, 'report_crm_project_bug_section') - cr.execute(""" - create or replace view report_crm_project_bug_section as ( - select - min(c.id) as id, - to_char(c.create_date, 'YYYY') as name, - to_char(c.create_date, 'MM') as month, - count(*) as nbr_cases, - c.section_id as section_id, - 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 - from - crm_project_bug c - group by to_char(c.create_date, 'YYYY'),to_char(c.create_date, 'MM'),c.section_id - )""") -report_crm_project_bug_section() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/crm_project/report_crm_project_bug_view.xml b/addons/crm_project/report_crm_project_bug_view.xml index 4c6ea353ec7..dea4776d9d9 100644 --- a/addons/crm_project/report_crm_project_bug_view.xml +++ b/addons/crm_project/report_crm_project_bug_view.xml @@ -2,28 +2,32 @@ - - report.crm.project.bug.user.tree - report.crm.project.bug.user - + + report.crm.project.bug.tree + report.crm.project.bug tree - - + + + + - - - + + + + + + - - report.crm.project.bug.user.form - report.crm.project.bug.user - + + report.crm.project.bug.form + report.crm.project.bug + form @@ -36,12 +40,12 @@ - - report.crm.project.bug.user.graph - report.crm.project.bug.user + + report.crm.project.bug.graph + report.crm.project.bug graph - + @@ -49,10 +53,10 @@ - - report.crm.project.bug.user.select - report.crm.project.bug.user - + + report.crm.project.bug.select + report.crm.project.bug + search @@ -60,134 +64,25 @@ - - Project Bug by User and Section - report.crm.project.bug.user + + Project Bug + report.crm.project.bug form graph,tree - - + + + + + + + tree + + + - - - - - - report.crm.project.bug.categ.tree - report.crm.project.bug.categ - - tree - - - - - - - - - - - - report.crm.project.bug.categ.form - report.crm.project.bug.categ - - form - - - - - - - - - - - - - report.crm.project.bug.categ.graph - report.crm.project.bug.categ - graph - - - - - - - - - - - report.crm.project.bug.categ.select - report.crm.project.bug.categ - - search - - - - - - - - Project Bugs by Categories and Section - report.crm.project.bug.categ - form - graph,tree - - - - - - - - - report.crm.project.bug.section.tree - report.crm.project.bug.section - - tree - - - - - - - - - - - - report.crm.project.bug.section.graph - report.crm.project.bug.section - graph - - - - - - - - - - report.crm.project.bug.section.select - report.crm.project.bug.section - - search - - - - - - - - Project Bugs by Section - report.crm.project.bug.section - form - graph,tree - - - - + diff --git a/addons/crm_project/security/ir.model.access.csv b/addons/crm_project/security/ir.model.access.csv index a29e29c027b..e483f2ccc20 100644 --- a/addons/crm_project/security/ir.model.access.csv +++ b/addons/crm_project/security/ir.model.access.csv @@ -1,5 +1,3 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "access_crm_project_bug","crm.project.bug","model_crm_project_bug","crm.group_crm_manager",1,1,1,1 -"access_report_crm_project_bug_user","report.crm.project.bug.user","model_report_crm_project_bug_user","crm.group_crm_manager",1,0,0,0 -"access_report_crm_project_bug_categ","report.crm.project.bug.categ","model_report_crm_project_bug_categ","crm.group_crm_manager",1,0,0,0 -"access_repor_crm_project_bug_section","report.crm.project.bug.section","model_report_crm_project_bug_section","crm.group_crm_manager",1,0,0,0 +"access_report_crm_project_bug","report.crm.project.bug","model_report_crm_project_bug","crm.group_crm_manager",1,0,0,0 diff --git a/addons/report_crm/report_crm_opportunity_view.xml b/addons/report_crm/report_crm_opportunity_view.xml index 69fa142d65d..68a5c352f9a 100644 --- a/addons/report_crm/report_crm_opportunity_view.xml +++ b/addons/report_crm/report_crm_opportunity_view.xml @@ -79,6 +79,6 @@ - + From 1c6ae71f9c8b3da2e37a04c4ef050e025e795fa6 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 3 Mar 2010 14:24:42 +0530 Subject: [PATCH 5/7] [IMP] report_crm: Imporve the tree view of claim bzr revid: sbh@tinyerp.com-20100303085442-3k6tkop4v624zphk --- addons/report_crm/report_crm_claim_view.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/report_crm/report_crm_claim_view.xml b/addons/report_crm/report_crm_claim_view.xml index d870d9d446b..9fabf3a01df 100644 --- a/addons/report_crm/report_crm_claim_view.xml +++ b/addons/report_crm/report_crm_claim_view.xml @@ -10,14 +10,15 @@ report.crm.claim tree - + - - + + + From 92fd279cdb7b9bcbd1b576a8f911b162fb8d875e Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 3 Mar 2010 14:37:24 +0530 Subject: [PATCH 6/7] [IMP]report_crm: add the filter in search view bzr revid: sbh@tinyerp.com-20100303090724-fichs3xe63ddfdt2 --- addons/report_crm/report_crm_opportunity_view.xml | 5 +---- addons/report_crm/report_crm_view.xml | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/report_crm/report_crm_opportunity_view.xml b/addons/report_crm/report_crm_opportunity_view.xml index 8ddd83a4120..a31adbbe6b7 100644 --- a/addons/report_crm/report_crm_opportunity_view.xml +++ b/addons/report_crm/report_crm_opportunity_view.xml @@ -78,9 +78,6 @@ tree -<<<<<<< TREE - -======= @@ -88,7 +85,7 @@ ->>>>>>> MERGE-SOURCE + diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml index 33e855beea7..4dafe212dc3 100644 --- a/addons/report_crm/report_crm_view.xml +++ b/addons/report_crm/report_crm_view.xml @@ -57,6 +57,7 @@ + From 3e1b0d4d18276ad6ace9d31740c58247a287e427 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 3 Mar 2010 14:39:43 +0530 Subject: [PATCH 7/7] [IMP]report_crm: Improve the view of report_crm_opportunity bzr revid: sbh@tinyerp.com-20100303090943-n5gxl03e0ly4u3rc --- addons/report_crm/report_crm_opportunity_view.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/report_crm/report_crm_opportunity_view.xml b/addons/report_crm/report_crm_opportunity_view.xml index a31adbbe6b7..6e18a16fee7 100644 --- a/addons/report_crm/report_crm_opportunity_view.xml +++ b/addons/report_crm/report_crm_opportunity_view.xml @@ -14,11 +14,12 @@ - - - + + + +