[MERGE]
[odoo/odoo.git] / addons / report_crm / report_crm_view.xml
index e298795..6e93f65 100644 (file)
@@ -1,45 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data>       
 
-        <!--
-       Cases by user and section
-       -->
-
-        <record id="view_crm_case_user_tree" model="ir.ui.view">
-            <field name="name">report.crm.case.user.tree</field>
-            <field name="model">report.crm.case.user</field>
+        <record id="view_crm_case_tree" model="ir.ui.view">
+            <field name="name">report.crm.case.tree</field>
+            <field name="model">report.crm.case</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Cases by User and Section">
+                <tree string="Cases">
                     <field name="name" />
                     <field name="month"/>
                     <field name="user_id"/>
-                                       <field name="section_id"/>                    
+                                       <field name="section_id"/>
                     <field name="nbr"/>
                     <field name="state"/>
                 </tree>
             </field>
         </record>
-        <record id="view_crm_case_user_form" model="ir.ui.view">
-            <field name="name">report.crm.case.user.form</field>
-            <field name="model">report.crm.case.user</field>
+        <record id="view_crm_case_form" model="ir.ui.view">
+            <field name="name">report.crm.case.form</field>
+            <field name="model">report.crm.case</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Cases by User and Section">
+                <form string="Cases">
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
                     <field name="user_id" select="1"/>
-                                       <field name="section_id" select="1"/>                             
+                                       <field name="section_id" select="1"/>
                     <field name="nbr" select="1"/>
                     <field name="state" select="1"/>
                 </form>
             </field>
         </record>
 
-        <record id="view_crm_case_user_graph" model="ir.ui.view">
-            <field name="name">report.crm.case.user.graph</field>
-            <field name="model">report.crm.case.user</field>
+        <record id="view_crm_case_graph" model="ir.ui.view">
+            <field name="name">report.crm.case.graph</field>
+            <field name="model">report.crm.case</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Cases by User and Section" type="bar">
             </field>
         </record>
 
-        <record id="view_crm_case_user_filter" model="ir.ui.view">
-            <field name="name">report.crm.case.user.select</field>
-            <field name="model">report.crm.case.user</field>
+        <record id="view_crm_case_filter" model="ir.ui.view">
+            <field name="name">report.crm.case.select</field>
+            <field name="model">report.crm.case</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Cases by User">
-                   <group col="12" colspan="4">
+                <search string="Search">
+                  <group col="16" colspan="8">
                                <filter string="My Cases" icon="terp-hr" domain="[('user_id','=',uid)]" help="My cases by section"/>
                                <separator orientation="vertical"/>
                                <filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
-                                               <filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
+                                               <filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]"/>
+                                               <filter string="Current" icon="terp-hr" domain="[('state','=','draft')]"/>
+                                               <filter string="Won" icon="terp-hr" domain="[('state','=','done')]"/>
+                                               <filter string="Lost" icon="terp-hr" domain="[('state','=','cancel')]"/>                                                
                                                <separator orientation="vertical"/>
                                                <field name="name" select="1"/>
                            <field name="month" select="1"/>
                            <field name="user_id" select="1"/>
-                                               <field name="section_id" select="1"/>                               
+                                               <field name="section_id" select="1"/>
                            <field name="nbr" select="1"/>
                            <field name="state" select="1"/>
                    </group>
-               </search>
-            </field>
-        </record>
-
-        <menuitem id="crm.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
-        <menuitem id="crm.next_id_52" name="Cases" parent="crm.next_id_64" sequence="0"/>
-
-        <record id="action_report_crm_case_user_tree" model="ir.actions.act_window">
-            <field name="name">Cases by User and Section</field>
-            <field name="res_model">report.crm.case.user</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="search_view_id" ref="view_crm_case_user_filter"/>
-        </record>
-        <menuitem action="action_report_crm_case_user_tree" id="menu_crm_case_user_tree" parent="crm.next_id_52"/>
-
-        <!-- # Cases by section and categoryof case -->
-
-        <record id="view_crm_case_categ_tree" model="ir.ui.view">
-            <field name="name">report.crm.case.categ.tree</field>
-            <field name="model">report.crm.case.categ</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Cases by User and Section">
-                    <field name="name"/>
-                                       <field name="section_id" select="1"/>                        
-                    <field name="month"/>
-                    <field name="nbr"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-        <record id="view_crm_case_categ_form" model="ir.ui.view">
-            <field name="name">report.crm.case.categ.form</field>
-            <field name="model">report.crm.case.categ</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Cases by User and Section">
-                    <field name="name" select="1"/>
-                                       <field name="section_id" select="1"/>                        
-                    <field name="month" select="1"/>
-                    <field name="nbr" select="1"/>
-                    <field name="state" select="1"/>
-                </form>
-            </field>
-        </record>
-
-               <record id="view_crm_case_categ_filter" model="ir.ui.view">
-            <field name="name">report.crm.case.categ.select</field>
-            <field name="model">report.crm.case.categ</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Cases by categories and Sections">
-                   <group col="12" colspan="4">
-                               <filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
-                                               <filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
-                                               <separator orientation="vertical"/>
-                                               <field name="name" select="1"/>
-                                               <field name="section_id" select="1"/>                                                   
-                           <field name="nbr" select="1"/>
-                           <field name="state" select="1"/>
+                   <newline/>
+                  <group expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Section" icon="terp-sale" domain="[]" context="{'group_by':'section_id'}"/>
+                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
+                       <filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
+                       <filter string="Category" icon="terp-sale" domain="[]" context="{'group_by':'categ_id'}"/>
                    </group>
+                   
+                   
                </search>
             </field>
         </record>
+           <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>        
+
 
-        <record id="action_report_crm_case_categ_tree" model="ir.actions.act_window">
-            <field name="name">Cases by Categories and Section</field>
-            <field name="res_model">report.crm.case.categ</field>
+        <record id="action_report_crm_case_tree" model="ir.actions.act_window">
+            <field name="name">Cases</field>
+            <field name="res_model">report.crm.case</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="search_view_id" ref="view_crm_case_categ_filter"/>
+            <field name="search_view_id" ref="view_crm_case_filter"/>
         </record>
-        <menuitem action="action_report_crm_case_categ_tree" id="menu_crm_case_categ_tree" parent="crm.next_id_52"/>
-
-        <act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_report_crm_case_user" name="Monthly cases" res_model="report.crm.case.user" src_model="res.users"/>
-
-        <act_window domain="[('section_id', '=', active_id)]" id="act_crm_case_section_2_report_crm_case_user" name="Monthly cases by user" res_model="report.crm.case.user" src_model="crm.case.section"/>
-
-        <act_window domain="[('categ_id', '=', active_id)]" id="act_crm_case_categ_2_report_crm_case_categ" name="Monthly cases" res_model="report.crm.case.categ" src_model="crm.case.categ"/>
+        <!--<menuitem action="action_report_crm_case_user_tree" id="menu_crm_case_user_tree" parent="crm.next_id_52"/>
+-->
+       <!-- <menuitem action="action_report_crm_case_categ_tree" id="menu_crm_case_categ_tree" parent="crm.next_id_52"/>-->
 
-        <act_window domain="[('section_id', '=', active_id)]" id="act_crm_case_section_2_report_crm_case_categ" name="Monthly cases by section" res_model="report.crm.case.categ" src_model="crm.case.section"/>
+        <act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_report_crm_case_user" name="Monthly cases" res_model="report.crm.case" src_model="res.users"/>
 
+        <act_window domain="[('section_id', '=', active_id)]" id="act_crm_case_section_2_report_crm_case_user" name="Monthly cases by user" res_model="report.crm.case" src_model="crm.case.section"/>
 
-        <!-- Cases by Section  -->
+        <act_window domain="[('section_id', '=', active_id)]" id="act_crm_case_section_2_report_crm_case_categ" name="Monthly cases by section" res_model="report.crm.case" src_model="crm.case.section"/>
 
-        <record id="view_report_crm_case_section_tree" model="ir.ui.view">
-            <field name="name">report.crm.case.section.tree</field>
-            <field name="model">report.crm.case.section</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Cases by Section">
-                    <field name="name" select="1"/>
-                                       <field name="section_id" select="1"/>                    
-                    <field name="month" select="1"/>
-                    <field name="nbr_cases" select="1"/>
-                    <field name="avg_answers"/>
-                </tree>
-            </field>
-        </record>
+        
 
-        <record id="view_report_crm_case_section_graph" model="ir.ui.view">
-            <field name="name">report.crm.case.section.graph</field>
-            <field name="model">report.crm.case.section</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Cases by Section" type="bar">
-                    <field name="name"/>
-                    <field name="nbr_cases" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-               <record id="view_report_crm_case_section_filter" model="ir.ui.view">
-            <field name="name">report.crm.case.section.select</field>
-            <field name="model">report.crm.case.section</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Cases by Section">
-                   <group col="4" colspan="4">
-                               <filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
-                                               <filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
-                                               <separator orientation="vertical"/>
-                                               <field name="name" select="1"/>
-                                               <field name="section_id" select="1"/>                                                   
-                           <field name="month" select="1"/>
-                           <field name="nbr_cases" select="1"/>
-                   </group>
-               </search>
-            </field>
-        </record>
-
-
-        <record id="action_report_crm_case_section_tree" model="ir.actions.act_window">
-            <field name="name">Cases by Section</field>
-            <field name="res_model">report.crm.case.section</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="search_view_id" ref="view_report_crm_case_section_filter"/>
-        </record>
 
         <!-- Closed & Open CRM Case view for Random Activities dashboard  -->
 
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="CRM Cases">
-                       <field name="date_closed" select="1"/>
                     <field name="date"/>
                     <field name="name"/>
                     <field name="user_id" select="2"/>
                <field name="view_id" ref="board_view_crm_case_open_dashboard_tree"/>
                <field name="domain">[('state','=','open')]</field>
        </record>
-
+       
     </data>
 </openerp>