diff --git a/addons/board_crm_configuration/__init__.py b/addons/board_crm/__init__.py similarity index 100% rename from addons/board_crm_configuration/__init__.py rename to addons/board_crm/__init__.py diff --git a/addons/board_crm_configuration/__terp__.py b/addons/board_crm/__terp__.py similarity index 95% rename from addons/board_crm_configuration/__terp__.py rename to addons/board_crm/__terp__.py index 09bd6e25bc1..1742a491009 100644 --- a/addons/board_crm_configuration/__terp__.py +++ b/addons/board_crm/__terp__.py @@ -21,7 +21,7 @@ { - 'name': 'Dashboard for CRM Configuration', + 'name': 'Dashboard for CRM', 'version': '1.0', 'category': 'Board/CRM', 'description': """ @@ -31,7 +31,7 @@ This module implements a dashboard for CRM that includes: * My Meetings (list) * Sales Pipeline by Stage (graph) * My Cases (list) - * Jobs Tracking (graph) + * Leads of the month by user (list) """, 'author': 'Tiny', 'depends': ['board', 'crm'], diff --git a/addons/board_crm_configuration/board_crm_demo.xml b/addons/board_crm/board_crm_demo.xml similarity index 100% rename from addons/board_crm_configuration/board_crm_demo.xml rename to addons/board_crm/board_crm_demo.xml diff --git a/addons/board_crm_configuration/board_crm_statistical_view.xml b/addons/board_crm/board_crm_statistical_view.xml similarity index 96% rename from addons/board_crm_configuration/board_crm_statistical_view.xml rename to addons/board_crm/board_crm_statistical_view.xml index d6dd5b6d65b..9d738721821 100644 --- a/addons/board_crm_configuration/board_crm_statistical_view.xml +++ b/addons/board_crm/board_crm_statistical_view.xml @@ -12,7 +12,6 @@ - @@ -25,7 +24,6 @@ - @@ -100,7 +98,7 @@ - CRM Configuration + CRM diff --git a/addons/board_crm_configuration/i18n/ar.po b/addons/board_crm/i18n/ar.po similarity index 100% rename from addons/board_crm_configuration/i18n/ar.po rename to addons/board_crm/i18n/ar.po diff --git a/addons/board_crm_configuration/i18n/bg.po b/addons/board_crm/i18n/bg.po similarity index 100% rename from addons/board_crm_configuration/i18n/bg.po rename to addons/board_crm/i18n/bg.po diff --git a/addons/board_crm_configuration/i18n/board_crm_configuration.pot b/addons/board_crm/i18n/board_crm_configuration.pot similarity index 100% rename from addons/board_crm_configuration/i18n/board_crm_configuration.pot rename to addons/board_crm/i18n/board_crm_configuration.pot diff --git a/addons/board_crm_configuration/i18n/bs.po b/addons/board_crm/i18n/bs.po similarity index 100% rename from addons/board_crm_configuration/i18n/bs.po rename to addons/board_crm/i18n/bs.po diff --git a/addons/board_crm_configuration/i18n/ca.po b/addons/board_crm/i18n/ca.po similarity index 100% rename from addons/board_crm_configuration/i18n/ca.po rename to addons/board_crm/i18n/ca.po diff --git a/addons/board_crm_configuration/i18n/cs.po b/addons/board_crm/i18n/cs.po similarity index 100% rename from addons/board_crm_configuration/i18n/cs.po rename to addons/board_crm/i18n/cs.po diff --git a/addons/board_crm_configuration/i18n/de.po b/addons/board_crm/i18n/de.po similarity index 100% rename from addons/board_crm_configuration/i18n/de.po rename to addons/board_crm/i18n/de.po diff --git a/addons/board_crm_configuration/i18n/el.po b/addons/board_crm/i18n/el.po similarity index 100% rename from addons/board_crm_configuration/i18n/el.po rename to addons/board_crm/i18n/el.po diff --git a/addons/board_crm_configuration/i18n/es.po b/addons/board_crm/i18n/es.po similarity index 100% rename from addons/board_crm_configuration/i18n/es.po rename to addons/board_crm/i18n/es.po diff --git a/addons/board_crm_configuration/i18n/es_AR.po b/addons/board_crm/i18n/es_AR.po similarity index 100% rename from addons/board_crm_configuration/i18n/es_AR.po rename to addons/board_crm/i18n/es_AR.po diff --git a/addons/board_crm_configuration/i18n/et.po b/addons/board_crm/i18n/et.po similarity index 100% rename from addons/board_crm_configuration/i18n/et.po rename to addons/board_crm/i18n/et.po diff --git a/addons/board_crm_configuration/i18n/fr.po b/addons/board_crm/i18n/fr.po similarity index 100% rename from addons/board_crm_configuration/i18n/fr.po rename to addons/board_crm/i18n/fr.po diff --git a/addons/board_crm_configuration/i18n/hr.po b/addons/board_crm/i18n/hr.po similarity index 100% rename from addons/board_crm_configuration/i18n/hr.po rename to addons/board_crm/i18n/hr.po diff --git a/addons/board_crm_configuration/i18n/hu.po b/addons/board_crm/i18n/hu.po similarity index 100% rename from addons/board_crm_configuration/i18n/hu.po rename to addons/board_crm/i18n/hu.po diff --git a/addons/board_crm_configuration/i18n/id.po b/addons/board_crm/i18n/id.po similarity index 100% rename from addons/board_crm_configuration/i18n/id.po rename to addons/board_crm/i18n/id.po diff --git a/addons/board_crm_configuration/i18n/it.po b/addons/board_crm/i18n/it.po similarity index 100% rename from addons/board_crm_configuration/i18n/it.po rename to addons/board_crm/i18n/it.po diff --git a/addons/board_crm_configuration/i18n/ko.po b/addons/board_crm/i18n/ko.po similarity index 100% rename from addons/board_crm_configuration/i18n/ko.po rename to addons/board_crm/i18n/ko.po diff --git a/addons/board_crm_configuration/i18n/lt.po b/addons/board_crm/i18n/lt.po similarity index 100% rename from addons/board_crm_configuration/i18n/lt.po rename to addons/board_crm/i18n/lt.po diff --git a/addons/board_crm_configuration/i18n/nl.po b/addons/board_crm/i18n/nl.po similarity index 100% rename from addons/board_crm_configuration/i18n/nl.po rename to addons/board_crm/i18n/nl.po diff --git a/addons/board_crm_configuration/i18n/nl_BE.po b/addons/board_crm/i18n/nl_BE.po similarity index 100% rename from addons/board_crm_configuration/i18n/nl_BE.po rename to addons/board_crm/i18n/nl_BE.po diff --git a/addons/board_crm_configuration/i18n/pl.po b/addons/board_crm/i18n/pl.po similarity index 100% rename from addons/board_crm_configuration/i18n/pl.po rename to addons/board_crm/i18n/pl.po diff --git a/addons/board_crm_configuration/i18n/pt.po b/addons/board_crm/i18n/pt.po similarity index 100% rename from addons/board_crm_configuration/i18n/pt.po rename to addons/board_crm/i18n/pt.po diff --git a/addons/board_crm_configuration/i18n/pt_BR.po b/addons/board_crm/i18n/pt_BR.po similarity index 100% rename from addons/board_crm_configuration/i18n/pt_BR.po rename to addons/board_crm/i18n/pt_BR.po diff --git a/addons/board_crm_configuration/i18n/ro.po b/addons/board_crm/i18n/ro.po similarity index 100% rename from addons/board_crm_configuration/i18n/ro.po rename to addons/board_crm/i18n/ro.po diff --git a/addons/board_crm_configuration/i18n/ru.po b/addons/board_crm/i18n/ru.po similarity index 100% rename from addons/board_crm_configuration/i18n/ru.po rename to addons/board_crm/i18n/ru.po diff --git a/addons/board_crm_configuration/i18n/sk.po b/addons/board_crm/i18n/sk.po similarity index 100% rename from addons/board_crm_configuration/i18n/sk.po rename to addons/board_crm/i18n/sk.po diff --git a/addons/board_crm_configuration/i18n/sl.po b/addons/board_crm/i18n/sl.po similarity index 100% rename from addons/board_crm_configuration/i18n/sl.po rename to addons/board_crm/i18n/sl.po diff --git a/addons/board_crm_configuration/i18n/sq.po b/addons/board_crm/i18n/sq.po similarity index 100% rename from addons/board_crm_configuration/i18n/sq.po rename to addons/board_crm/i18n/sq.po diff --git a/addons/board_crm_configuration/i18n/sv.po b/addons/board_crm/i18n/sv.po similarity index 100% rename from addons/board_crm_configuration/i18n/sv.po rename to addons/board_crm/i18n/sv.po diff --git a/addons/board_crm_configuration/i18n/tlh.po b/addons/board_crm/i18n/tlh.po similarity index 100% rename from addons/board_crm_configuration/i18n/tlh.po rename to addons/board_crm/i18n/tlh.po diff --git a/addons/board_crm_configuration/i18n/tr.po b/addons/board_crm/i18n/tr.po similarity index 100% rename from addons/board_crm_configuration/i18n/tr.po rename to addons/board_crm/i18n/tr.po diff --git a/addons/board_crm_configuration/i18n/uk.po b/addons/board_crm/i18n/uk.po similarity index 100% rename from addons/board_crm_configuration/i18n/uk.po rename to addons/board_crm/i18n/uk.po diff --git a/addons/board_crm_configuration/i18n/vi.po b/addons/board_crm/i18n/vi.po similarity index 100% rename from addons/board_crm_configuration/i18n/vi.po rename to addons/board_crm/i18n/vi.po diff --git a/addons/board_crm_configuration/i18n/zh_CN.po b/addons/board_crm/i18n/zh_CN.po similarity index 100% rename from addons/board_crm_configuration/i18n/zh_CN.po rename to addons/board_crm/i18n/zh_CN.po diff --git a/addons/board_crm_configuration/i18n/zh_TW.po b/addons/board_crm/i18n/zh_TW.po similarity index 100% rename from addons/board_crm_configuration/i18n/zh_TW.po rename to addons/board_crm/i18n/zh_TW.po diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py index 5aa2a91e555..d6d3fb8a95b 100644 --- a/addons/crm/report/crm_opportunity_report.py +++ b/addons/crm/report/crm_opportunity_report.py @@ -14,7 +14,8 @@ class crm_opportunity_report(osv.osv): 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]", readonly=True), 'stage_id':fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]", readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner',readonly=True), - 'company_id': fields.many2one('res.company', 'Company',readonly=True), + 'company_id': fields.many2one('res.company', 'Company',readonly=True), + 'user_id':fields.many2one('res.users', 'User', readonly=True), } def init(self, cr): tools.drop_view_if_exists(cr, 'crm_opportunity_report')