From 1400413c128a094105886de960b99a654016c6f2 Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Wed, 3 Mar 2010 16:56:40 +0530 Subject: [PATCH 01/30] [IMP]:improved the menu of Resources in project_long_term and mrp bzr revid: rvo@tinyerp.co.in-20100303112640-ye7j3c0j0u31zzx6 --- addons/mrp/mrp_view.xml | 45 ++++++++++--------- addons/mrp/mrp_wizard.xml | 2 +- addons/mrp_operations/mrp_operations_view.xml | 2 +- addons/project_long_term/__terp__.py | 1 + addons/project_long_term/project_wizard.xml | 1 + addons/report_mrp/report_mrp_view.xml | 2 +- addons/resource/resource_view.xml | 22 +++++---- 7 files changed, 41 insertions(+), 34 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index d47311f543e..fde53d537fe 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -2,15 +2,15 @@ - - + - + diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index 36f15124b9d..b42cf310b98 100755 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -1,9 +1,6 @@ - - - resource.calendar.form resource.calendar @@ -24,7 +21,6 @@ form - resource.calendar.week.tree @@ -65,7 +61,6 @@ - - resource.resource.form resource.resource @@ -120,8 +114,6 @@ tree,form - - resource.calendar.leaves.form resource.calendar.leaves @@ -158,7 +150,19 @@ tree,form,calendar - + + + + + + + + + + + + + From 07cbe5aca598ebb4148c425c6732a58ee0a391ae Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Wed, 3 Mar 2010 17:13:50 +0530 Subject: [PATCH 02/30] [IMP]:menu changes bzr revid: rvo@tinyerp.co.in-20100303114350-si24bf7gtg5p0r2v --- addons/mrp/mrp_view.xml | 7 +++++++ addons/project_long_term/project_view.xml | 7 +++++++ addons/resource/resource_view.xml | 14 -------------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index fde53d537fe..a94d12f23e3 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -1038,5 +1038,12 @@ res_model="mrp.bom" src_model="product.product"/> + + + + + + + diff --git a/addons/project_long_term/project_view.xml b/addons/project_long_term/project_view.xml index be7b8de5977..e2f0c0207f2 100644 --- a/addons/project_long_term/project_view.xml +++ b/addons/project_long_term/project_view.xml @@ -160,6 +160,13 @@ + + + + + + + diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index b42cf310b98..ece75a4cb54 100755 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -150,19 +150,5 @@ tree,form,calendar - - - - - - - - - - - - - - From 873461674a47bb6b6ba76ff07eab79b2c802c835 Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Wed, 3 Mar 2010 19:46:20 +0530 Subject: [PATCH 03/30] [ADD]:added search views on resource module bzr revid: rvo@tinyerp.co.in-20100303141620-qjnk3hlbaip8x3vj --- addons/mrp/mrp_view.xml | 6 +- addons/project/project_view.xml | 21 ++----- addons/project_long_term/project_view.xml | 7 +-- addons/resource/resource_view.xml | 72 ++++++++++++++++++++++- 4 files changed, 83 insertions(+), 23 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index a94d12f23e3..3d58d595ac5 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -1041,9 +1041,9 @@ - - - + + + diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 73249f58384..749222a2275 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -505,15 +505,6 @@ - - - + res.company.task.config res.company form diff --git a/addons/project_long_term/project_view.xml b/addons/project_long_term/project_view.xml index e2f0c0207f2..9977933238e 100644 --- a/addons/project_long_term/project_view.xml +++ b/addons/project_long_term/project_view.xml @@ -163,10 +163,9 @@ - - - - + + + diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index ece75a4cb54..bd2f63d5853 100755 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -15,11 +15,27 @@ + + + resource.calendar.tree + resource.calendar + tree + + + + + + + + + Resource Calendar resource.calendar form + tree,form + @@ -98,7 +114,7 @@ resource.resource tree - + @@ -112,6 +128,7 @@ Resources resource.resource tree,form + @@ -148,6 +165,59 @@ Resource Leaves resource.calendar.leaves tree,form,calendar + + + + + + + + resource.resource.search + resource.resource + search + + + + + + + + + + + + + + + + resource.calendar.search + resource.calendar + search + + + + + + + + + + + + + resource.calendar.leaves.search + resource.calendar.leaves + search + + + + + + + + + + From 3e6ae1128103ab483bc211d6da800091e1b63776 Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Thu, 4 Mar 2010 10:40:05 +0530 Subject: [PATCH 04/30] [IMP]:search views on resource bzr revid: rvo@tinyerp.co.in-20100304051005-65ouresjg24w247u --- addons/resource/resource_view.xml | 100 +++++++++++++++--------------- 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index bd2f63d5853..c3092cb7697 100755 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -1,6 +1,57 @@ + + + + + resource.resource.search + resource.resource + search + + + + + + + + + + + + + + + + resource.calendar.search + resource.calendar + search + + + + + + + + + + + + + resource.calendar.leaves.search + resource.calendar.leaves + search + + + + + + + + + + + resource.calendar.form resource.calendar @@ -169,56 +220,7 @@ - - - resource.resource.search - resource.resource - search - - - - - - - - - - - - - - - - resource.calendar.search - resource.calendar - search - - - - - - - - - - - - - resource.calendar.leaves.search - resource.calendar.leaves - search - - - - - - - - - - - From 80ea4bb587a0a33643a9d09386f3c19498d8b0d7 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Thu, 4 Mar 2010 10:46:01 +0530 Subject: [PATCH 05/30] [Add] report_crm: add the search view of phonecall bzr revid: sbh@tinyerp.com-20100304051601-9plgk16vijizm25i --- .../report_crm/report_crm_phonecall_view.xml | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/addons/report_crm/report_crm_phonecall_view.xml b/addons/report_crm/report_crm_phonecall_view.xml index 27f9ceda835..e74a2d05fe4 100644 --- a/addons/report_crm/report_crm_phonecall_view.xml +++ b/addons/report_crm/report_crm_phonecall_view.xml @@ -49,15 +49,44 @@ - report.crm.phonecall.select report.crm.phonecall - search - - + + + + + + + + + + + + + + + + + + + + + + + + + + From 4ababa7f00c12cff6ce974747d650419aa4e6ada Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Thu, 4 Mar 2010 11:04:20 +0530 Subject: [PATCH 06/30] [IMP]:removed the phase relate button from project/project_view.xml to project_long_term/project_view.xml bzr revid: rvo@tinyerp.co.in-20100304053420-isz3yaega0v5y9ne --- addons/project/project_view.xml | 9 --------- addons/project_long_term/project_view.xml | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 749222a2275..92c90ba9e2b 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -514,15 +514,6 @@ view_mode="tree,form,calendar,graph" view_type="form"/> - - res.company.task.config res.company diff --git a/addons/project_long_term/project_view.xml b/addons/project_long_term/project_view.xml index 9977933238e..d8f6cfe697f 100644 --- a/addons/project_long_term/project_view.xml +++ b/addons/project_long_term/project_view.xml @@ -158,6 +158,15 @@ view_mode="tree,form" domain="[('phase_id','=',active_id)]"/> + + From 30c239414fe282ec5d6bf5c7c50dc9a3f64ada6c Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Thu, 4 Mar 2010 12:09:08 +0530 Subject: [PATCH 07/30] [Fix]report_crm: Fix the field name in report_crm_case bzr revid: sbh@tinyerp.com-20100304063908-gym80r62yxym78ad --- addons/report_crm/report_crm.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/report_crm/report_crm.py b/addons/report_crm/report_crm.py index c9e22dc3af8..da9ba2e9ba3 100644 --- a/addons/report_crm/report_crm.py +++ b/addons/report_crm/report_crm.py @@ -45,7 +45,7 @@ class report_crm_case(osv.osv): state = field_name[5:] cr.execute("select count(*) from crm_opportunity 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 + perc_state = (state_cases / float(case.nbr) ) * 100 res[case.id] = perc_state else: @@ -58,7 +58,7 @@ class report_crm_case(osv.osv): cr.execute("select count(*) from crm_case_log l, ir_model m where l.model_id=m.id and m.model = '%s'" , model_name) logs = cr.fetchone()[0] - avg_ans = logs / case.nbr_cases + avg_ans = logs / case.nbr res[case.id] = avg_ans return res @@ -68,7 +68,7 @@ class report_crm_case(osv.osv): 'user_id':fields.many2one('res.users', 'User', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True), - 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True), + 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, 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"), From 1e8b7312302761e11c11e9b8747d7ac12db84339 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Thu, 4 Mar 2010 12:15:06 +0530 Subject: [PATCH 08/30] [REM]report_crm: remove the field of amount_cost bzr revid: sbh@tinyerp.com-20100304064506-ox1pvvqgf7bo9gr5 --- addons/report_crm/report_crm_fundraising.py | 1 - addons/report_crm/report_crm_fundraising_view.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/addons/report_crm/report_crm_fundraising.py b/addons/report_crm/report_crm_fundraising.py index ef01c5246e5..1adb47651e4 100644 --- a/addons/report_crm/report_crm_fundraising.py +++ b/addons/report_crm/report_crm_fundraising.py @@ -10,7 +10,6 @@ class report_crm_fundraising(osv.osv): 'stage_id':fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.fundraising')]", readonly=True), 'probability': fields.float('Avg. Probability', 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), 'delay_close': fields.char('Delay to close', size=20, readonly=True), } diff --git a/addons/report_crm/report_crm_fundraising_view.xml b/addons/report_crm/report_crm_fundraising_view.xml index 633023d3b4c..db63d023d0b 100644 --- a/addons/report_crm/report_crm_fundraising_view.xml +++ b/addons/report_crm/report_crm_fundraising_view.xml @@ -36,7 +36,6 @@ - From 1d02bbc21b4cc52c03178cf2bdc0dc428ea74cc4 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Thu, 4 Mar 2010 12:43:09 +0530 Subject: [PATCH 09/30] [Fix] report_crm: Fix the problem report_crm_fundraising report bzr revid: sbh@tinyerp.com-20100304071309-x8bbl2zqwfzagt1y --- addons/crm/crm_fundraising.py | 1 + addons/report_crm/report_crm_fundraising.py | 4 +--- addons/report_crm/report_crm_fundraising_view.xml | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/crm/crm_fundraising.py b/addons/crm/crm_fundraising.py index c5ed7b19d67..df30ac8385f 100644 --- a/addons/crm/crm_fundraising.py +++ b/addons/crm/crm_fundraising.py @@ -53,6 +53,7 @@ class crm_fundraising(osv.osv): _defaults = { 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], + 'probability':lambda *a:0.0, } crm_fundraising() diff --git a/addons/report_crm/report_crm_fundraising.py b/addons/report_crm/report_crm_fundraising.py index 1adb47651e4..397a50896bc 100644 --- a/addons/report_crm/report_crm_fundraising.py +++ b/addons/report_crm/report_crm_fundraising.py @@ -7,7 +7,6 @@ class report_crm_fundraising(osv.osv): _inherit = "report.crm.case" _columns = { 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.fundraising')]"), - 'stage_id':fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.fundraising')]", readonly=True), 'probability': fields.float('Avg. Probability', readonly=True), 'amount_revenue': fields.float('Est.Revenue', readonly=True), 'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True), @@ -25,7 +24,6 @@ class report_crm_fundraising(osv.osv): c.user_id, c.section_id, c.categ_id, - c.stage_id, count(*) as nbr, 0 as avg_answers, 0.0 as perc_done, @@ -36,7 +34,7 @@ class report_crm_fundraising(osv.osv): to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close from crm_fundraising c - 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 + 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 )""") report_crm_fundraising() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_crm/report_crm_fundraising_view.xml b/addons/report_crm/report_crm_fundraising_view.xml index db63d023d0b..1bdba2fb4a4 100644 --- a/addons/report_crm/report_crm_fundraising_view.xml +++ b/addons/report_crm/report_crm_fundraising_view.xml @@ -21,7 +21,6 @@ - From 48afffbd859fe5956d5f74c38efc40ee891e9129 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Thu, 4 Mar 2010 13:00:14 +0530 Subject: [PATCH 10/30] [Fix] report_crm:Fix the problem of group by in fundrising report bzr revid: sbh@tinyerp.com-20100304073014-3xv4ksfd7lncp803 --- addons/crm/crm_fundraising.py | 5 ++++- addons/crm_project/crm_bugs_view.xml | 2 +- addons/crm_project/crm_project_bug.py | 8 ++++++++ addons/crm_project/report_crm_project_bug_view.xml | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/addons/crm/crm_fundraising.py b/addons/crm/crm_fundraising.py index df30ac8385f..9bfbd10a6b8 100644 --- a/addons/crm/crm_fundraising.py +++ b/addons/crm/crm_fundraising.py @@ -53,7 +53,10 @@ class crm_fundraising(osv.osv): _defaults = { 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], - 'probability':lambda *a:0.0, + 'probability':lambda *a:0.0, + 'planned_cost':lambda *a:0.0, + 'planned_revenue':lambda *a:0.0, + } crm_fundraising() diff --git a/addons/crm_project/crm_bugs_view.xml b/addons/crm_project/crm_bugs_view.xml index 6d89beb2f48..4179aa06cf5 100644 --- a/addons/crm_project/crm_bugs_view.xml +++ b/addons/crm_project/crm_bugs_view.xml @@ -73,7 +73,7 @@