diff --git a/addons/crm/report/crm_report.py b/addons/crm/report/crm_report.py index 91ad7269351..2781768abf8 100644 --- a/addons/crm/report/crm_report.py +++ b/addons/crm/report/crm_report.py @@ -30,8 +30,8 @@ AVAILABLE_STATES = [ ('pending','Pending') ] -class report_crm_case(osv.osv): - _name = "report.crm.case" +class crm_case_report(osv.osv): + _name = "crm.case.report" _description = "Cases and section" _auto = False @@ -78,9 +78,9 @@ class report_crm_case(osv.osv): } _order = 'name desc, user_id' def init(self, cr): - tools.drop_view_if_exists(cr, 'report_crm_case') + tools.drop_view_if_exists(cr, 'crm_case_report') cr.execute(""" - create or replace view report_crm_case as ( + create or replace view crm_case_report as ( select min(c.id) as id, to_char(c.create_date, 'YYYY') as name, @@ -94,7 +94,7 @@ class report_crm_case(osv.osv): 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,c.company_id )""") -report_crm_case() +crm_case_report() class report_crm_case_service_dashboard(osv.osv): _name = "report.crm.case.service.dashboard" diff --git a/addons/crm/report/crm_report_claim.py b/addons/crm/report/crm_report_claim.py index 5ec1cf05849..cd814e7e2fb 100644 --- a/addons/crm/report/crm_report_claim.py +++ b/addons/crm/report/crm_report_claim.py @@ -1,10 +1,10 @@ from osv import fields,osv import tools -class report_crm_claim(osv.osv): - _name = "report.crm.claim" +class crm_claim_report(osv.osv): + _name = "crm.claim.report" _auto = False - _inherit = "report.crm.case" + _inherit = "crm.case.report" _columns = { 'delay_close': fields.char('Delay to close', size=20, readonly=True), 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]", readonly=True), @@ -13,9 +13,9 @@ class report_crm_claim(osv.osv): 'company_id': fields.many2one('res.company','Company',readonly=True), } def init(self, cr): - tools.drop_view_if_exists(cr, 'report_crm_claim') + tools.drop_view_if_exists(cr, 'crm_claim_report') cr.execute(""" - create or replace view report_crm_claim as ( + create or replace view crm_claim_report as ( select min(c.id) as id, to_char(c.create_date, 'YYYY') as name, @@ -36,6 +36,6 @@ class report_crm_claim(osv.osv): crm_claim c group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id, c.stage_id,c.categ_id,c.partner_id,c.company_id )""") -report_crm_claim() +crm_claim_report() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/report/crm_report_claim_view.xml b/addons/crm/report/crm_report_claim_view.xml index 99a715be840..8d20a6c605d 100644 --- a/addons/crm/report/crm_report_claim_view.xml +++ b/addons/crm/report/crm_report_claim_view.xml @@ -3,8 +3,8 @@ - report.crm.claim.tree - report.crm.claim + crm.claim.report.tree + crm.claim.report tree @@ -23,8 +23,8 @@ - report.crm.claim.form - report.crm.claim + crm.claim.report.form + crm.claim.report form @@ -39,8 +39,8 @@ - report.crm.claim.graph - report.crm.claim + crm.claim.report.graph + crm.claim.report graph @@ -52,8 +52,8 @@ - report.crm.claim.select - report.crm.claim + crm.claim.report.select + crm.claim.report search @@ -66,7 +66,7 @@ Claims - report.crm.claim + crm.claim.report form tree,graph diff --git a/addons/crm/report/crm_report_fundraising.py b/addons/crm/report/crm_report_fundraising.py index 70497a71c31..a778223ca0c 100644 --- a/addons/crm/report/crm_report_fundraising.py +++ b/addons/crm/report/crm_report_fundraising.py @@ -1,10 +1,10 @@ from osv import fields,osv import tools -class report_crm_fundraising(osv.osv): - _name = "report.crm.fundraising" +class crm_fundraising_report(osv.osv): + _name = "crm.fundraising.report" _auto = False - _inherit = "report.crm.case" + _inherit = "crm.case.report" _columns = { 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.fundraising')]"), 'probability': fields.float('Avg. Probability', readonly=True), @@ -15,9 +15,9 @@ class report_crm_fundraising(osv.osv): 'company_id': fields.many2one('res.company','Company'), } def init(self, cr): - tools.drop_view_if_exists(cr, 'report_crm_fundraising') + tools.drop_view_if_exists(cr, 'crm_fundraising_report') cr.execute(""" - create or replace view report_crm_fundraising as ( + create or replace view crm_fundraising_report as ( select min(c.id) as id, to_char(c.create_date, 'YYYY') as name, @@ -40,5 +40,5 @@ class report_crm_fundraising(osv.osv): 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.partner_id,c.company_id )""") -report_crm_fundraising() +crm_fundraising_report() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/report/crm_report_fundraising_view.xml b/addons/crm/report/crm_report_fundraising_view.xml index 0861cd58a2b..6dc5e07363e 100644 --- a/addons/crm/report/crm_report_fundraising_view.xml +++ b/addons/crm/report/crm_report_fundraising_view.xml @@ -6,8 +6,8 @@ --> - report.crm.fundraising.tree - report.crm.fundraising + crm.fundraising.report.tree + crm.fundraising.report tree @@ -29,8 +29,8 @@ - report.crm.fundraising.form - report.crm.fundraising + crm.fundraising.report.form + crm.fundraising.report form @@ -44,8 +44,8 @@ - report.crm.fundraising.graph - report.crm.fundraising + crm.fundraising.report.graph + crm.fundraising.report graph @@ -57,8 +57,8 @@ - report.crm.fundraising.select - report.crm.fundraising + crm.fundraising.report.select + crm.fundraising.report search @@ -69,7 +69,7 @@ Fundraising - report.crm.fundraising + crm.fundraising.report form tree,graph diff --git a/addons/crm/report/crm_report_lead.py b/addons/crm/report/crm_report_lead.py index e9c79ed772d..b0911553981 100644 --- a/addons/crm/report/crm_report_lead.py +++ b/addons/crm/report/crm_report_lead.py @@ -1,10 +1,10 @@ from osv import fields,osv import tools -class report_crm_lead(osv.osv): - _name = "report.crm.lead" +class crm_lead_report(osv.osv): + _name = "crm.lead.report" _auto = False - _inherit = "report.crm.case" + _inherit = "crm.case.report" _columns = { 'delay_close': fields.char('Delay to close', size=20, readonly=True), 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]" ,readonly=True), @@ -13,9 +13,9 @@ class report_crm_lead(osv.osv): 'company_id': fields.many2one('res.company','Company',readonly=True), } def init(self, cr): - tools.drop_view_if_exists(cr, 'report_crm_lead') + tools.drop_view_if_exists(cr, 'crm_lead_report') cr.execute(""" - create or replace view report_crm_lead as ( + create or replace view crm_lead_report as ( select min(c.id) as id, to_char(c.create_date, 'YYYY') as name, @@ -36,5 +36,5 @@ class report_crm_lead(osv.osv): crm_lead c group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.stage_id,categ_id,c.partner_id,c.company_id )""") -report_crm_lead() +crm_lead_report() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/report/crm_report_lead_view.xml b/addons/crm/report/crm_report_lead_view.xml index fd7e56a0317..78d4b8f8af9 100644 --- a/addons/crm/report/crm_report_lead_view.xml +++ b/addons/crm/report/crm_report_lead_view.xml @@ -6,8 +6,8 @@ --> - report.crm.lead.tree - report.crm.lead + crm.lead.report.tree + crm.lead.report tree @@ -26,8 +26,8 @@ - report.crm.lead.form - report.crm.lead + crm.lead.report.form + crm.lead.report form @@ -39,8 +39,8 @@ - report.crm.lead.graph - report.crm.lead + crm.lead.report.graph + crm.lead.report graph @@ -52,8 +52,8 @@ - report.crm.lead.select - report.crm.lead + crm.lead.report.select + crm.lead.report search @@ -66,7 +66,7 @@ Leads - report.crm.lead + crm.lead.report form tree,graph diff --git a/addons/crm/report/crm_report_opportunity.py b/addons/crm/report/crm_report_opportunity.py index 2ded021a71e..5aa2a91e555 100644 --- a/addons/crm/report/crm_report_opportunity.py +++ b/addons/crm/report/crm_report_opportunity.py @@ -1,10 +1,10 @@ from osv import fields,osv import tools -class report_crm_opportunity(osv.osv): - _name = "report.crm.opportunity" +class crm_opportunity_report(osv.osv): + _name = "crm.opportunity.report" _auto = False - _inherit = "report.crm.case" + _inherit = "crm.case.report" _columns = { 'probability': fields.float('Avg. Probability', readonly=True), @@ -17,9 +17,9 @@ class report_crm_opportunity(osv.osv): 'company_id': fields.many2one('res.company', 'Company',readonly=True), } def init(self, cr): - tools.drop_view_if_exists(cr, 'report_crm_opportunity') + tools.drop_view_if_exists(cr, 'crm_opportunity_report') cr.execute(""" - create or replace view report_crm_opportunity as ( + create or replace view crm_opportunity_report as ( select min(c.id) as id, to_char(c.create_date, 'YYYY') as name, @@ -43,5 +43,5 @@ class report_crm_opportunity(osv.osv): crm_opportunity c group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.stage_id,c.categ_id,c.partner_id,company_id )""") -report_crm_opportunity() +crm_opportunity_report() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/report/crm_report_opportunity_view.xml b/addons/crm/report/crm_report_opportunity_view.xml index 8dfe91c4031..b999da95aa5 100644 --- a/addons/crm/report/crm_report_opportunity_view.xml +++ b/addons/crm/report/crm_report_opportunity_view.xml @@ -6,8 +6,8 @@ --> - report.crm.opportunity.tree - report.crm.opportunity + crm.opportunity.report.tree + crm.opportunity.report tree @@ -29,8 +29,8 @@ - report.crm.opportunity.form - report.crm.opportunity + crm.opportunity.report.form + crm.opportunity.report form @@ -45,8 +45,8 @@ - report.crm.opportunity.graph - report.crm.opportunity + crm.opportunity.report.graph + crm.opportunity.report graph @@ -58,8 +58,8 @@ - report.crm.opportunity.select - report.crm.opportunity + crm.opportunity.report.select + crm.opportunity.report search @@ -73,7 +73,7 @@ Opportunities - report.crm.opportunity + crm.opportunity.report form tree,graph diff --git a/addons/crm/report/crm_report_phonecall.py b/addons/crm/report/crm_report_phonecall.py index f89af4b1d15..327094ebb8e 100644 --- a/addons/crm/report/crm_report_phonecall.py +++ b/addons/crm/report/crm_report_phonecall.py @@ -1,11 +1,11 @@ from osv import fields,osv import tools -class report_crm_phonecall(osv.osv): - _name = "report.crm.phonecall" +class crm_phonecall_report(osv.osv): + _name = "crm.phonecall.report" _description = "Phone calls by user and section" _auto = False - _inherit = "report.crm.case" + _inherit = "crm.case.report" _columns = { 'delay_close': fields.char('Delay to close', size=20, readonly=True), 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.phonecall')]"), @@ -13,9 +13,9 @@ class report_crm_phonecall(osv.osv): 'company_id': fields.many2one('res.company','Company',readonly=True), } def init(self, cr): - tools.drop_view_if_exists(cr, 'report_crm_phonecall') + tools.drop_view_if_exists(cr, 'crm_phonecall_report') cr.execute(""" - create or replace view report_crm_phonecall as ( + create or replace view crm_phonecall_report as ( select min(c.id) as id, to_char(c.create_date, 'YYYY') as name, @@ -35,5 +35,5 @@ class report_crm_phonecall(osv.osv): crm_phonecall 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.partner_id,c.company_id )""") -report_crm_phonecall() +crm_phonecall_report() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/report/crm_report_phonecall_view.xml b/addons/crm/report/crm_report_phonecall_view.xml index 71889fb994c..371385afd38 100644 --- a/addons/crm/report/crm_report_phonecall_view.xml +++ b/addons/crm/report/crm_report_phonecall_view.xml @@ -6,8 +6,8 @@ --> - report.crm.phonecall.tree - report.crm.phonecall + crm.phonecall.report.tree + crm.phonecall.report tree @@ -25,8 +25,8 @@ - report.crm.phonecall.form - report.crm.phonecall + crm.phonecall.report.form + crm.phonecall.report form @@ -40,8 +40,8 @@ - report.crm.phonecall.graph - report.crm.phonecall + crm.phonecall.report.graph + crm.phonecall.report graph @@ -52,8 +52,8 @@ - report.crm.phonecall.select - report.crm.phonecall + crm.phonecall.report.select + crm.phonecall.report search @@ -64,7 +64,7 @@ Phone Calls - report.crm.phonecall + crm.phonecall.report form tree,graph diff --git a/addons/crm/report/crm_report_view.xml b/addons/crm/report/crm_report_view.xml index 0c19032a6bc..6ecdcfb755a 100644 --- a/addons/crm/report/crm_report_view.xml +++ b/addons/crm/report/crm_report_view.xml @@ -3,8 +3,8 @@ - report.crm.case.tree - report.crm.case + crm.case.report.tree + crm.case.report tree @@ -19,8 +19,8 @@ - report.crm.case.form - report.crm.case + crm.case.report.form + >crm.case.report form
@@ -35,8 +35,8 @@ - report.crm.case.graph - report.crm.case + crm.case.report + crm.case.report graph @@ -48,8 +48,8 @@ - report.crm.case.select - report.crm.case + crm.case.report.select + crm.case.report search @@ -97,7 +97,7 @@ Cases - report.crm.case + crm.case.report form tree,graph @@ -106,11 +106,11 @@ --> - + - + - +