diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py index ec083dd91b1..cb88f55aef0 100644 --- a/addons/crm/__init__.py +++ b/addons/crm/__init__.py @@ -31,7 +31,7 @@ import crm_claim import crm_fundraising import crm_helpdesk - +import crm_report #import report import wizard diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py index 8302d67f0a9..691a668f32b 100644 --- a/addons/crm/__terp__.py +++ b/addons/crm/__terp__.py @@ -88,7 +88,15 @@ between mails and Open ERP.""", 'security/crm_security.xml', 'security/ir.model.access.csv', - 'process/crm_configuration_process.xml' + 'crm_report/crm_report_view.xml', + 'crm_report/crm_report_claim_view.xml', + 'crm_report/crm_report_lead_view.xml', + 'crm_report/crm_report_fundraising_view.xml', + 'crm_report/crm_report_opportunity_view.xml' , + 'crm_report/crm_report_phonecall_view.xml', + + 'process/crm_configuration_process.xml', + ], 'demo_xml': [ 'crm_demo.xml', diff --git a/addons/report_crm/__init__.py b/addons/crm/crm_report/__init__.py similarity index 87% rename from addons/report_crm/__init__.py rename to addons/crm/crm_report/__init__.py index 7a050fae5a7..b54ed4e6ae8 100644 --- a/addons/report_crm/__init__.py +++ b/addons/crm/crm_report/__init__.py @@ -19,12 +19,12 @@ # ############################################################################## -import report_crm -import report_crm_lead -import report_crm_claim -import report_crm_opportunity -import report_crm_fundraising -import report_crm_phonecall +import crm_report +import crm_report_crm_lead +import crm_report_claim +import crm_report_opportunity +import crm_report_fundraising +import crm_report_phonecall # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_crm/__terp__.py b/addons/crm/crm_report/__terp__.py similarity index 100% rename from addons/report_crm/__terp__.py rename to addons/crm/crm_report/__terp__.py diff --git a/addons/report_crm/report_crm.py b/addons/crm/crm_report/crm_report.py similarity index 100% rename from addons/report_crm/report_crm.py rename to addons/crm/crm_report/crm_report.py diff --git a/addons/report_crm/report_crm_claim.py b/addons/crm/crm_report/crm_report_claim.py similarity index 100% rename from addons/report_crm/report_crm_claim.py rename to addons/crm/crm_report/crm_report_claim.py diff --git a/addons/report_crm/report_crm_claim_view.xml b/addons/crm/crm_report/crm_report_claim_view.xml similarity index 100% rename from addons/report_crm/report_crm_claim_view.xml rename to addons/crm/crm_report/crm_report_claim_view.xml diff --git a/addons/report_crm/report_crm_lead.py b/addons/crm/crm_report/crm_report_crm_lead.py similarity index 100% rename from addons/report_crm/report_crm_lead.py rename to addons/crm/crm_report/crm_report_crm_lead.py diff --git a/addons/report_crm/report_crm_fundraising.py b/addons/crm/crm_report/crm_report_fundraising.py similarity index 100% rename from addons/report_crm/report_crm_fundraising.py rename to addons/crm/crm_report/crm_report_fundraising.py diff --git a/addons/report_crm/report_crm_fundraising_view.xml b/addons/crm/crm_report/crm_report_fundraising_view.xml similarity index 100% rename from addons/report_crm/report_crm_fundraising_view.xml rename to addons/crm/crm_report/crm_report_fundraising_view.xml diff --git a/addons/report_crm/report_crm_lead_view.xml b/addons/crm/crm_report/crm_report_lead_view.xml similarity index 100% rename from addons/report_crm/report_crm_lead_view.xml rename to addons/crm/crm_report/crm_report_lead_view.xml diff --git a/addons/report_crm/report_crm_opportunity.py b/addons/crm/crm_report/crm_report_opportunity.py similarity index 100% rename from addons/report_crm/report_crm_opportunity.py rename to addons/crm/crm_report/crm_report_opportunity.py diff --git a/addons/report_crm/report_crm_opportunity_view.xml b/addons/crm/crm_report/crm_report_opportunity_view.xml similarity index 100% rename from addons/report_crm/report_crm_opportunity_view.xml rename to addons/crm/crm_report/crm_report_opportunity_view.xml diff --git a/addons/report_crm/report_crm_phonecall.py b/addons/crm/crm_report/crm_report_phonecall.py similarity index 100% rename from addons/report_crm/report_crm_phonecall.py rename to addons/crm/crm_report/crm_report_phonecall.py diff --git a/addons/report_crm/report_crm_phonecall_view.xml b/addons/crm/crm_report/crm_report_phonecall_view.xml similarity index 100% rename from addons/report_crm/report_crm_phonecall_view.xml rename to addons/crm/crm_report/crm_report_phonecall_view.xml diff --git a/addons/report_crm/report_crm_view.xml b/addons/crm/crm_report/crm_report_view.xml similarity index 100% rename from addons/report_crm/report_crm_view.xml rename to addons/crm/crm_report/crm_report_view.xml diff --git a/addons/report_crm/i18n/ar.po b/addons/crm/crm_report/i18n/ar.po similarity index 100% rename from addons/report_crm/i18n/ar.po rename to addons/crm/crm_report/i18n/ar.po diff --git a/addons/report_crm/i18n/bg.po b/addons/crm/crm_report/i18n/bg.po similarity index 100% rename from addons/report_crm/i18n/bg.po rename to addons/crm/crm_report/i18n/bg.po diff --git a/addons/report_crm/i18n/bs.po b/addons/crm/crm_report/i18n/bs.po similarity index 100% rename from addons/report_crm/i18n/bs.po rename to addons/crm/crm_report/i18n/bs.po diff --git a/addons/report_crm/i18n/ca.po b/addons/crm/crm_report/i18n/ca.po similarity index 100% rename from addons/report_crm/i18n/ca.po rename to addons/crm/crm_report/i18n/ca.po diff --git a/addons/report_crm/i18n/cs.po b/addons/crm/crm_report/i18n/cs.po similarity index 100% rename from addons/report_crm/i18n/cs.po rename to addons/crm/crm_report/i18n/cs.po diff --git a/addons/report_crm/i18n/de.po b/addons/crm/crm_report/i18n/de.po similarity index 100% rename from addons/report_crm/i18n/de.po rename to addons/crm/crm_report/i18n/de.po diff --git a/addons/report_crm/i18n/el.po b/addons/crm/crm_report/i18n/el.po similarity index 100% rename from addons/report_crm/i18n/el.po rename to addons/crm/crm_report/i18n/el.po diff --git a/addons/report_crm/i18n/es.po b/addons/crm/crm_report/i18n/es.po similarity index 100% rename from addons/report_crm/i18n/es.po rename to addons/crm/crm_report/i18n/es.po diff --git a/addons/report_crm/i18n/es_AR.po b/addons/crm/crm_report/i18n/es_AR.po similarity index 100% rename from addons/report_crm/i18n/es_AR.po rename to addons/crm/crm_report/i18n/es_AR.po diff --git a/addons/report_crm/i18n/et.po b/addons/crm/crm_report/i18n/et.po similarity index 100% rename from addons/report_crm/i18n/et.po rename to addons/crm/crm_report/i18n/et.po diff --git a/addons/report_crm/i18n/fr.po b/addons/crm/crm_report/i18n/fr.po similarity index 100% rename from addons/report_crm/i18n/fr.po rename to addons/crm/crm_report/i18n/fr.po diff --git a/addons/report_crm/i18n/hr.po b/addons/crm/crm_report/i18n/hr.po similarity index 100% rename from addons/report_crm/i18n/hr.po rename to addons/crm/crm_report/i18n/hr.po diff --git a/addons/report_crm/i18n/hu.po b/addons/crm/crm_report/i18n/hu.po similarity index 100% rename from addons/report_crm/i18n/hu.po rename to addons/crm/crm_report/i18n/hu.po diff --git a/addons/report_crm/i18n/id.po b/addons/crm/crm_report/i18n/id.po similarity index 100% rename from addons/report_crm/i18n/id.po rename to addons/crm/crm_report/i18n/id.po diff --git a/addons/report_crm/i18n/it.po b/addons/crm/crm_report/i18n/it.po similarity index 100% rename from addons/report_crm/i18n/it.po rename to addons/crm/crm_report/i18n/it.po diff --git a/addons/report_crm/i18n/ko.po b/addons/crm/crm_report/i18n/ko.po similarity index 100% rename from addons/report_crm/i18n/ko.po rename to addons/crm/crm_report/i18n/ko.po diff --git a/addons/report_crm/i18n/ko_KO.po b/addons/crm/crm_report/i18n/ko_KO.po similarity index 100% rename from addons/report_crm/i18n/ko_KO.po rename to addons/crm/crm_report/i18n/ko_KO.po diff --git a/addons/report_crm/i18n/lt.po b/addons/crm/crm_report/i18n/lt.po similarity index 100% rename from addons/report_crm/i18n/lt.po rename to addons/crm/crm_report/i18n/lt.po diff --git a/addons/report_crm/i18n/nl.po b/addons/crm/crm_report/i18n/nl.po similarity index 100% rename from addons/report_crm/i18n/nl.po rename to addons/crm/crm_report/i18n/nl.po diff --git a/addons/report_crm/i18n/nl_BE.po b/addons/crm/crm_report/i18n/nl_BE.po similarity index 100% rename from addons/report_crm/i18n/nl_BE.po rename to addons/crm/crm_report/i18n/nl_BE.po diff --git a/addons/report_crm/i18n/pl.po b/addons/crm/crm_report/i18n/pl.po similarity index 100% rename from addons/report_crm/i18n/pl.po rename to addons/crm/crm_report/i18n/pl.po diff --git a/addons/report_crm/i18n/pt.po b/addons/crm/crm_report/i18n/pt.po similarity index 100% rename from addons/report_crm/i18n/pt.po rename to addons/crm/crm_report/i18n/pt.po diff --git a/addons/report_crm/i18n/pt_BR.po b/addons/crm/crm_report/i18n/pt_BR.po similarity index 100% rename from addons/report_crm/i18n/pt_BR.po rename to addons/crm/crm_report/i18n/pt_BR.po diff --git a/addons/report_crm/i18n/report_crm.pot b/addons/crm/crm_report/i18n/report_crm.pot similarity index 100% rename from addons/report_crm/i18n/report_crm.pot rename to addons/crm/crm_report/i18n/report_crm.pot diff --git a/addons/report_crm/i18n/ro.po b/addons/crm/crm_report/i18n/ro.po similarity index 100% rename from addons/report_crm/i18n/ro.po rename to addons/crm/crm_report/i18n/ro.po diff --git a/addons/report_crm/i18n/ru.po b/addons/crm/crm_report/i18n/ru.po similarity index 100% rename from addons/report_crm/i18n/ru.po rename to addons/crm/crm_report/i18n/ru.po diff --git a/addons/report_crm/i18n/sk.po b/addons/crm/crm_report/i18n/sk.po similarity index 100% rename from addons/report_crm/i18n/sk.po rename to addons/crm/crm_report/i18n/sk.po diff --git a/addons/report_crm/i18n/sl.po b/addons/crm/crm_report/i18n/sl.po similarity index 100% rename from addons/report_crm/i18n/sl.po rename to addons/crm/crm_report/i18n/sl.po diff --git a/addons/report_crm/i18n/sq.po b/addons/crm/crm_report/i18n/sq.po similarity index 100% rename from addons/report_crm/i18n/sq.po rename to addons/crm/crm_report/i18n/sq.po diff --git a/addons/report_crm/i18n/sv.po b/addons/crm/crm_report/i18n/sv.po similarity index 100% rename from addons/report_crm/i18n/sv.po rename to addons/crm/crm_report/i18n/sv.po diff --git a/addons/report_crm/i18n/tlh.po b/addons/crm/crm_report/i18n/tlh.po similarity index 100% rename from addons/report_crm/i18n/tlh.po rename to addons/crm/crm_report/i18n/tlh.po diff --git a/addons/report_crm/i18n/tr.po b/addons/crm/crm_report/i18n/tr.po similarity index 100% rename from addons/report_crm/i18n/tr.po rename to addons/crm/crm_report/i18n/tr.po diff --git a/addons/report_crm/i18n/uk.po b/addons/crm/crm_report/i18n/uk.po similarity index 100% rename from addons/report_crm/i18n/uk.po rename to addons/crm/crm_report/i18n/uk.po diff --git a/addons/report_crm/i18n/vi.po b/addons/crm/crm_report/i18n/vi.po similarity index 100% rename from addons/report_crm/i18n/vi.po rename to addons/crm/crm_report/i18n/vi.po diff --git a/addons/report_crm/i18n/zh_CN.po b/addons/crm/crm_report/i18n/zh_CN.po similarity index 100% rename from addons/report_crm/i18n/zh_CN.po rename to addons/crm/crm_report/i18n/zh_CN.po diff --git a/addons/report_crm/i18n/zh_TW.po b/addons/crm/crm_report/i18n/zh_TW.po similarity index 100% rename from addons/report_crm/i18n/zh_TW.po rename to addons/crm/crm_report/i18n/zh_TW.po diff --git a/addons/report_crm/security/ir.model.access.csv b/addons/crm/crm_report/security/ir.model.access.csv similarity index 100% rename from addons/report_crm/security/ir.model.access.csv rename to addons/crm/crm_report/security/ir.model.access.csv