Task-ID:919 merge board_crm into crm

bzr revid: sbh@tinyerp.com-20100607104934-7z3xjjh6mbknw44n

diff --git a/addons/board_crm/board_crm_demo.xml b/addons/board_crm/board_crm_demo.xml
deleted file mode 100644 (file)
index 76caab9..0000000
--- a/addons/board_crm/board_crm_demo.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-       <data noupdate="1">
-
-               <!--
-                Administrator shortcut
-                Demo user startup menu
-                -->
-<!--           <record model="ir.ui.view_sc" id="sc_crm_dash">
-                       <field name="name">CRM Dashboard</field>
-                       <field name="user_id" ref="base.user_demo"/>
-                       <field name="resource">ir.ui.menu</field>
-                       <field name="sequence">3</field>
-                       <field name="res_id" ref="menu_board_crm"/>
-               </record> -->
-               <record model="res.users" id="base.user_root">
-                       <field name="action_id" ref="open_board_crm"/>
-               </record>
-
-       </data>
-</openerp>

diff --git a/addons/board_crm/board_crm_statistical_view.xml b/addons/board_crm/board_crm_statistical_view.xml
deleted file mode 100644 (file)
index ba952a8..0000000
--- a/addons/board_crm/board_crm_statistical_view.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <!--
-         Board for statistical view of the sections
-         -->
-        <record model="ir.ui.view" id="view_crm_lead_stage_graph1">
-            <field name="name">Leads By Stage - Graph</field>
-            <field name="model">crm.lead.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Leads By Stage" type="pie">
-                    <field name="stage_id"/>
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_crm_opportunity_categ_graph">
-            <field name="name">report.crm.opportunity.categ.graph</field>
-            <field name="model">crm.lead.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Opportunity by Sales Team and Categories" type="bar" orientation="horizontal">
-                    <field name="categ_id"/>
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <act_window name="Opportunities By Categories"
-            domain="[('state','!=','done'),('state','!=','cancel')]"
-            res_model="crm.lead.report"
-            view_type="form"
-            view_mode="graph,tree,form"
-            view_id="view_crm_opportunity_categ_graph"
-            id="act_oppor_categ"/>
-
-        <record model="ir.actions.act_window" id="act_leads_state">
-            <field name="res_model">crm.lead.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree,form</field>
-            <field name="view_id" ref="view_crm_lead_stage_graph1"/>
-            <field name="domain">[('state','!=','done'),('state','!=','cancel')]</field>
-        </record>
-
-        <act_window name="Leads Of The Month By User"
-            domain="[('month','=',time.strftime('%%m')),('state','!=','cancel')]"
-            res_model="crm.lead.report"
-            view_type="form"
-            view_mode="graph,tree,form"
-            view_id="view_crm_lead_stage_graph1"
-            id="act_leads_month_user"/>
-
-        <record model="ir.ui.view" id="board_crm_statistical_form">
-            <field name="name">CRM - Statistical Dashboard Form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Statistics Dashboard">
-                    <hpaned>
-                        <child1>
-                            <action
-                                string="Opportunities By Categories"
-                                name="%(act_oppor_categ)d"
-                                colspan="4"
-                                height="200"
-                                width="250"/>
-
-                            <action
-                                string="Leads By Stage"
-                                name="%(act_leads_state)d"
-                                height="200"
-                                colspan="4"/>
-
-                        </child1>
-                        <child2>
-
-                            <action
-                                string="Leads Of The Month By User"
-                                name="%(act_leads_month_user)d"
-                                colspan="4"/>
-
-                        </child2>
-                    </hpaned>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="open_board_statistical_dash">
-            <field name="name">CRM - Statistics Dashboard</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="usage">menu</field>
-            <field name="view_id" ref="board_crm_statistical_form"/>
-        </record>
-
-        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-        <menuitem
-            name="CRM Configuration" parent="base.dashboard"
-            id="menu_board_crm_config"
-            groups="crm.group_crm_manager"/>
-        <menuitem
-            name="Statistics Dashboard" parent="menu_board_crm_config"
-            action="open_board_statistical_dash"
-            sequence="2"
-            id="menu_board_statistics_dash"
-            icon="terp-graph"/>
-
-    </data>
-</openerp>

diff --git a/addons/board_crm/board_crm_view.xml b/addons/board_crm/board_crm_view.xml
deleted file mode 100644 (file)
index 0bbdbe1..0000000
--- a/addons/board_crm/board_crm_view.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-       <data>
-               <record model="board.note.type" id="note_crm_type">
-                       <field name="name">CRM Configuration</field>
-               </record>
-               <record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
-                       <field name="name">crm.opportunity.user.graph1</field>
-                       <field name="model">crm.lead.report</field>
-                       <field name="type">graph</field>
-                       <field name="arch" type="xml">
-                               <graph string="Opportunities by User and Section" type="pie">
-                                       <field name="state"/>
-                                       <field name="nbr" operator="+"/>
-                               </graph>
-                       </field>
-               </record>
-               <record model="ir.actions.act_window" id="act_my_leads">
-                       <field name="res_model">crm.lead</field>
-                       <field name="view_type">form</field>
-                       <field name="view_mode">tree,form</field>
-                       <field name="view_id" ref="crm.crm_case_tree_view_leads"/>
-            <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
-               </record>
-               <record model="ir.actions.act_window" id="act_my_meetings">
-                       <field name="res_model">crm.meeting</field>
-                       <field name="view_type">form</field>
-                       <field name="view_mode">tree,form</field>
-                       <field name="view_id" ref="crm.crm_case_tree_view_meet"/>
-                       <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
-               </record>
-
-               <record model="ir.actions.act_window" id="act_my_leads_stage">
-                       <field name="res_model">crm.lead.report</field>
-                       <field name="view_type">form</field>
-                       <field name="view_mode">graph,tree,form</field>
-                       <field name="view_id" ref="view_crm_lead_stage_graph1"/>
-            <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
-               </record>
-
-               <record model="ir.actions.act_window" id="act_sales_pipeline">
-                       <field name="res_model">crm.lead.report</field>
-                       <field name="view_type">form</field>
-                       <field name="view_mode">graph,tree,form</field>
-                       <field name="view_id" ref="view_crm_opportunity_user_graph1"/>
-                       <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel'),('type', '=', 'opportunity')]</field>
-               </record>
-
-               <record model="ir.ui.view" id="board_crm_form">
-                       <field name="name">CRM - Dashboard Form</field>
-                       <field name="model">board.board</field>
-                       <field name="type">form</field>
-                       <field name="arch" type="xml">
-                               <form string="Connecting Dashboard">
-                                       <hpaned>
-
-                                               <child1>
-
-                                                       <action
-                                                               name="%(act_my_leads)d"
-                                                               colspan="4"
-                                                               height="150"
-                                                               width="510"/>
-
-                                                       <action
-                                                               string="My Meetings"
-                                                               name="%(act_my_meetings)d"
-                                                               height="150"
-                                                               colspan="4"/>
-
-                                               </child1>
-
-                                               <child2>
-                                                       <action
-                                string="My Leads By Stage"
-                                name="%(act_my_leads_stage)d"
-                                colspan="4"/>
-
-                            <action
-                                string="My Sales Pipeline"
-                                name="%(act_sales_pipeline)d"
-                                colspan="4"/>
-
-                        </child2>
-                    </hpaned>
-                </form>
-            </field>
-        </record>
-        <record model="ir.actions.act_window" id="open_board_crm">
-            <field name="name">CRM Dashboard</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="usage">menu</field>
-            <field name="view_id" ref="board_crm_form"/>
-        </record>
-
-        <menuitem
-            name="Connecting Dashboard" parent="menu_board_crm_config"
-            action="open_board_crm"
-            sequence="1"
-            id="menu_board_crm" icon="terp-graph"/>
-
-
-    </data>
-</openerp>

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index ea5cf3f..b40cc77 100644 (file)
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -98,14 +98,17 @@ between mails and Open ERP.""",
         'process/crm_configuration_process.xml',
         'crm_installer_view.xml', 
         
-        'res_partner_view.xml'
+        'res_partner_view.xml',
+        'board_crm_statistical_view.xml',
+        'board_crm_view.xml',
     ],
     'demo_xml': [
         'crm_demo.xml',
         'crm_lead_demo.xml',
         'crm_meeting_demo.xml',
         'crm_opportunity_demo.xml',
-        'crm_phonecall_demo.xml'
+        'crm_phonecall_demo.xml',
+        'board_crm_demo.xml',
     ],
     'test': [
             'test/test_crm_lead.yml',

diff --git a/addons/crm/board_crm_demo.xml b/addons/crm/board_crm_demo.xml
new file mode 100644 (file)
index 0000000..76caab9
--- /dev/null
+++ b/addons/crm/board_crm_demo.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<openerp>
+       <data noupdate="1">
+
+               <!--
+                Administrator shortcut
+                Demo user startup menu
+                -->
+<!--           <record model="ir.ui.view_sc" id="sc_crm_dash">
+                       <field name="name">CRM Dashboard</field>
+                       <field name="user_id" ref="base.user_demo"/>
+                       <field name="resource">ir.ui.menu</field>
+                       <field name="sequence">3</field>
+                       <field name="res_id" ref="menu_board_crm"/>
+               </record> -->
+               <record model="res.users" id="base.user_root">
+                       <field name="action_id" ref="open_board_crm"/>
+               </record>
+
+       </data>
+</openerp>

diff --git a/addons/crm/board_crm_statistical_view.xml b/addons/crm/board_crm_statistical_view.xml
new file mode 100644 (file)
index 0000000..ba952a8
--- /dev/null
+++ b/addons/crm/board_crm_statistical_view.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <!--
+         Board for statistical view of the sections
+         -->
+        <record model="ir.ui.view" id="view_crm_lead_stage_graph1">
+            <field name="name">Leads By Stage - Graph</field>
+            <field name="model">crm.lead.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Leads By Stage" type="pie">
+                    <field name="stage_id"/>
+                    <field name="nbr" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_crm_opportunity_categ_graph">
+            <field name="name">report.crm.opportunity.categ.graph</field>
+            <field name="model">crm.lead.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Opportunity by Sales Team and Categories" type="bar" orientation="horizontal">
+                    <field name="categ_id"/>
+                    <field name="nbr" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+        <act_window name="Opportunities By Categories"
+            domain="[('state','!=','done'),('state','!=','cancel')]"
+            res_model="crm.lead.report"
+            view_type="form"
+            view_mode="graph,tree,form"
+            view_id="view_crm_opportunity_categ_graph"
+            id="act_oppor_categ"/>
+
+        <record model="ir.actions.act_window" id="act_leads_state">
+            <field name="res_model">crm.lead.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree,form</field>
+            <field name="view_id" ref="view_crm_lead_stage_graph1"/>
+            <field name="domain">[('state','!=','done'),('state','!=','cancel')]</field>
+        </record>
+
+        <act_window name="Leads Of The Month By User"
+            domain="[('month','=',time.strftime('%%m')),('state','!=','cancel')]"
+            res_model="crm.lead.report"
+            view_type="form"
+            view_mode="graph,tree,form"
+            view_id="view_crm_lead_stage_graph1"
+            id="act_leads_month_user"/>
+
+        <record model="ir.ui.view" id="board_crm_statistical_form">
+            <field name="name">CRM - Statistical Dashboard Form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Statistics Dashboard">
+                    <hpaned>
+                        <child1>
+                            <action
+                                string="Opportunities By Categories"
+                                name="%(act_oppor_categ)d"
+                                colspan="4"
+                                height="200"
+                                width="250"/>
+
+                            <action
+                                string="Leads By Stage"
+                                name="%(act_leads_state)d"
+                                height="200"
+                                colspan="4"/>
+
+                        </child1>
+                        <child2>
+
+                            <action
+                                string="Leads Of The Month By User"
+                                name="%(act_leads_month_user)d"
+                                colspan="4"/>
+
+                        </child2>
+                    </hpaned>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="open_board_statistical_dash">
+            <field name="name">CRM - Statistics Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="usage">menu</field>
+            <field name="view_id" ref="board_crm_statistical_form"/>
+        </record>
+
+        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem
+            name="CRM Configuration" parent="base.dashboard"
+            id="menu_board_crm_config"
+            groups="crm.group_crm_manager"/>
+        <menuitem
+            name="Statistics Dashboard" parent="menu_board_crm_config"
+            action="open_board_statistical_dash"
+            sequence="2"
+            id="menu_board_statistics_dash"
+            icon="terp-graph"/>
+
+    </data>
+</openerp>

diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
new file mode 100644 (file)
index 0000000..0bbdbe1
--- /dev/null
+++ b/addons/crm/board_crm_view.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<openerp>
+       <data>
+               <record model="board.note.type" id="note_crm_type">
+                       <field name="name">CRM Configuration</field>
+               </record>
+               <record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
+                       <field name="name">crm.opportunity.user.graph1</field>
+                       <field name="model">crm.lead.report</field>
+                       <field name="type">graph</field>
+                       <field name="arch" type="xml">
+                               <graph string="Opportunities by User and Section" type="pie">
+                                       <field name="state"/>
+                                       <field name="nbr" operator="+"/>
+                               </graph>
+                       </field>
+               </record>
+               <record model="ir.actions.act_window" id="act_my_leads">
+                       <field name="res_model">crm.lead</field>
+                       <field name="view_type">form</field>
+                       <field name="view_mode">tree,form</field>
+                       <field name="view_id" ref="crm.crm_case_tree_view_leads"/>
+            <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+               </record>
+               <record model="ir.actions.act_window" id="act_my_meetings">
+                       <field name="res_model">crm.meeting</field>
+                       <field name="view_type">form</field>
+                       <field name="view_mode">tree,form</field>
+                       <field name="view_id" ref="crm.crm_case_tree_view_meet"/>
+                       <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+               </record>
+
+               <record model="ir.actions.act_window" id="act_my_leads_stage">
+                       <field name="res_model">crm.lead.report</field>
+                       <field name="view_type">form</field>
+                       <field name="view_mode">graph,tree,form</field>
+                       <field name="view_id" ref="view_crm_lead_stage_graph1"/>
+            <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+               </record>
+
+               <record model="ir.actions.act_window" id="act_sales_pipeline">
+                       <field name="res_model">crm.lead.report</field>
+                       <field name="view_type">form</field>
+                       <field name="view_mode">graph,tree,form</field>
+                       <field name="view_id" ref="view_crm_opportunity_user_graph1"/>
+                       <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel'),('type', '=', 'opportunity')]</field>
+               </record>
+
+               <record model="ir.ui.view" id="board_crm_form">
+                       <field name="name">CRM - Dashboard Form</field>
+                       <field name="model">board.board</field>
+                       <field name="type">form</field>
+                       <field name="arch" type="xml">
+                               <form string="Connecting Dashboard">
+                                       <hpaned>
+
+                                               <child1>
+
+                                                       <action
+                                                               name="%(act_my_leads)d"
+                                                               colspan="4"
+                                                               height="150"
+                                                               width="510"/>
+
+                                                       <action
+                                                               string="My Meetings"
+                                                               name="%(act_my_meetings)d"
+                                                               height="150"
+                                                               colspan="4"/>
+
+                                               </child1>
+
+                                               <child2>
+                                                       <action
+                                string="My Leads By Stage"
+                                name="%(act_my_leads_stage)d"
+                                colspan="4"/>
+
+                            <action
+                                string="My Sales Pipeline"
+                                name="%(act_sales_pipeline)d"
+                                colspan="4"/>
+
+                        </child2>
+                    </hpaned>
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="open_board_crm">
+            <field name="name">CRM Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="usage">menu</field>
+            <field name="view_id" ref="board_crm_form"/>
+        </record>
+
+        <menuitem
+            name="Connecting Dashboard" parent="menu_board_crm_config"
+            action="open_board_crm"
+            sequence="1"
+            id="menu_board_crm" icon="terp-graph"/>
+
+
+    </data>
+</openerp>