From 56f657ec94abc23bb1c22714cca6a80a67de19ca Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 9 Mar 2010 16:52:51 +0530
Subject: [PATCH] [IMP, FIX] board_crm: (1) Renamed 'board_crm_configuration'
 to 'board_crm'. (2) Rename menu 'Dashboards > CRM Configuration' with
 'Dashboards > CRM'. (3) Fixed error of field.

bzr revid: uco@tinyerp.co.in-20100309112251-q5z0ikltbxzyvnnw
---
 addons/{board_crm_configuration => board_crm}/__init__.py     | 0
 addons/{board_crm_configuration => board_crm}/__terp__.py     | 4 ++--
 .../{board_crm_configuration => board_crm}/board_crm_demo.xml | 0
 .../board_crm_statistical_view.xml                            | 4 +---
 .../{board_crm_configuration => board_crm}/board_crm_view.xml | 2 +-
 addons/{board_crm_configuration => board_crm}/i18n/ar.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/bg.po      | 0
 .../i18n/board_crm_configuration.pot                          | 0
 addons/{board_crm_configuration => board_crm}/i18n/bs.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/ca.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/cs.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/de.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/el.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/es.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/es_AR.po   | 0
 addons/{board_crm_configuration => board_crm}/i18n/et.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/fr.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/hr.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/hu.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/id.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/it.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/ko.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/lt.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/nl.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/nl_BE.po   | 0
 addons/{board_crm_configuration => board_crm}/i18n/pl.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/pt.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/pt_BR.po   | 0
 addons/{board_crm_configuration => board_crm}/i18n/ro.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/ru.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/sk.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/sl.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/sq.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/sv.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/tlh.po     | 0
 addons/{board_crm_configuration => board_crm}/i18n/tr.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/uk.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/vi.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/zh_CN.po   | 0
 addons/{board_crm_configuration => board_crm}/i18n/zh_TW.po   | 0
 addons/crm/report/crm_opportunity_report.py                   | 3 ++-
 41 files changed, 6 insertions(+), 7 deletions(-)
 rename addons/{board_crm_configuration => board_crm}/__init__.py (100%)
 rename addons/{board_crm_configuration => board_crm}/__terp__.py (95%)
 rename addons/{board_crm_configuration => board_crm}/board_crm_demo.xml (100%)
 rename addons/{board_crm_configuration => board_crm}/board_crm_statistical_view.xml (96%)
 rename addons/{board_crm_configuration => board_crm}/board_crm_view.xml (98%)
 rename addons/{board_crm_configuration => board_crm}/i18n/ar.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/bg.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/board_crm_configuration.pot (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/bs.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/ca.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/cs.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/de.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/el.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/es.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/es_AR.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/et.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/fr.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/hr.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/hu.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/id.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/it.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/ko.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/lt.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/nl.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/nl_BE.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/pl.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/pt.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/pt_BR.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/ro.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/ru.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/sk.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/sl.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/sq.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/sv.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/tlh.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/tr.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/uk.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/vi.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/zh_CN.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/zh_TW.po (100%)

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 @@
                 <graph string="Leads By Stage" type="pie">
                     <field name="stage_id"/>
                     <field name="nbr" operator="+"/>
-                    <field name="state" group="True"/>
                 </graph>
             </field>
         </record>
@@ -25,7 +24,6 @@
                 <graph string="Opportunities" type="bar" orientation="horizontal">
                     <field name="categ_id"/>
                     <field name="nbr" operator="+"/>
-                    <field name="state" group="True"/>
                 </graph>
             </field>
         </record>
@@ -100,7 +98,7 @@
 
 		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
-            name="CRM Configuration" parent="base.dashboard"
+            name="CRM" parent="base.dashboard"
             id="menu_board_crm_config"
             groups="crm.group_crm_manager"/>
         <menuitem
diff --git a/addons/board_crm_configuration/board_crm_view.xml b/addons/board_crm/board_crm_view.xml
similarity index 98%
rename from addons/board_crm_configuration/board_crm_view.xml
rename to addons/board_crm/board_crm_view.xml
index b111aabc2b2..8905f9d8530 100644
--- a/addons/board_crm_configuration/board_crm_view.xml
+++ b/addons/board_crm/board_crm_view.xml
@@ -2,7 +2,7 @@
 <openerp>
 	<data>
 		<record model="board.note.type" id="note_crm_type">
-			<field name="name">CRM Configuration</field>
+			<field name="name">CRM</field>
 		</record>
 		
 		<record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
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')