[MERGE] merged refactoring of superfluous "My ..." buttons in search views

[odoo/odoo.git] / addons / crm / crm_view.xml

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index b1e5e0d..063f986 100644 (file)
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -1,26 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="menu_crm_configuration" name="Cases" parent="base.menu_base_config" sequence="0"/>
+        <menuitem id="base.menu_crm_configuration" name="Cases"
+            parent="base.menu_base_config" sequence="0" groups="base.group_extended"/>
 
-<!-- Case Sections Form View -->
+        <menuitem id="base.next_id_64" name="Reporting"
+               parent="base.menu_base_partner" sequence="8" />
+
+        <!-- Case Sections Form View -->
 
         <record id="crm_case_section_view_form" model="ir.ui.view">
             <field name="name">crm.case.section.form</field>
             <field name="model">crm.case.section</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Case Section">
-                    <notebook>
-                        <page string="Case section">
-                            <field name="name" select="1"/>
-                            <field name="code" select="1"/>
-                            <field name="user_id" select="2"/>
-                            <field name="active" select="2"/>
-                            <field name="parent_id" select="2" widget="selection"/>
-                            <field name="allow_unlink" select="2"/>
-                            <field name="reply_to" select="2"/>
-                            <field name="resource_calendar_id" select="2"/>
+                <form string="Sales Team">
+                    <group col="6" colspan="4">
+                        <field name="name" select="1" colspan="4"/>
+                        <field name="code" select="1"/>
+                        <newline/>
+                        <field name="resource_calendar_id" select="2"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Sales Team">
+                            <group col="2" colspan="1">
+                                <separator string="Responsible" colspan="2"/>
+                                <field name="parent_id" select="2" widget="selection"/>
+                                <field name="user_id" select="2"/>
+                            </group>
+                            <group col="2" colspan="1">
+                                <separator string="Contact Information" colspan="2"/>
+                                <field name="reply_to" select="2"/>
+                            </group>
+                            <group col="2" colspan="1">
+                                <separator string="Sales Team Property" colspan="2"/>
+                                <field name="active" select="2"/>
+                                <field name="allow_unlink" select="2"/>
+                            </group>
+                            <separator string="Members List" colspan="4"/>
+                            <field name="member_ids" nolabel="1" colspan="4"/>
+                            <separator string="Note" colspan="4"/>
+                            <field name="note" select="1" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
@@ -35,7 +55,7 @@
             <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree string="Case Section">
+                <tree string="Sales Team">
                     <field name="name" select="1"/>
                     <field name="code" select="1"/>
                     <field name="user_id" select="1"/>
@@ -46,7 +66,7 @@
 <!-- Case Sections Action -->
 
         <record id="crm_case_section_act" model="ir.actions.act_window">
-            <field name="name">Sections</field>
+            <field name="name">Sales Team</field>
             <field name="res_model">crm.case.section</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_section_view_tree"/>
@@ -99,7 +119,7 @@
             <field name="view_id" ref="crm_case_stage_tree"/>
         </record>
 
-        <menuitem  id="menu_crm_case_stage" name="Stages" parent="crm.menu_crm_configuration"/>
+        <menuitem  id="menu_crm_case_stage" name="Stages" parent="base.menu_crm_configuration" groups="base.group_extended"/>
 
 
 <!-- Case Categories Form View -->
@@ -139,11 +159,11 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_categ_tree-view"/>
         </record>
-        <menuitem id="menu_crm_case_categ"   name="Categories"  parent="crm.menu_crm_configuration"/>
+        <menuitem id="menu_crm_case_categ"   name="Categories"  parent="base.menu_crm_configuration" groups="base.group_extended"/>
 
         <menuitem action="crm_case_section_act"
             id="menu_crm_case_section_act"
-            parent="crm.menu_crm_configuration" />
+            parent="base.menu_crm_configuration" />
 
 
 <!-- Resource Type of case Tree View -->
@@ -185,7 +205,7 @@
             <field name="view_id" ref="crm_case_resource_type_tree"/>
         </record>
         <menuitem id="menu_crm_case_resource_type" name="Resource Type"
-            parent="crm.menu_crm_configuration" />
+            parent="base.menu_crm_configuration" groups="base.group_extended" />
 
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
             <field name="name">Cases by section</field>
@@ -238,7 +258,7 @@
 
         <record id="crm_case_calendar-view" model="ir.ui.view">
             <field name="name">crm.case.calendar</field>
-            <field name="model">crm.case</field>
+            <field name="model">mailgate.thread</field>
             <field name="type">calendar</field>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="create_date"
@@ -255,7 +275,7 @@
 
         <record id="crm_case_tree-view" model="ir.ui.view">
             <field name="name">crm.case.tree</field>
-            <field name="model">crm.case</field>
+            <field name="model">mailgate.thread</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:date_deadline&lt;current_date and state=='open';black:state in ('draft', 'cancel','done','pending')" string="Cases">
@@ -280,6 +300,7 @@
                         icon="gtk-media-pause" />
                     <button name="case_escalate"
                         states="open,draft,pending" string="Escalate"
+                        groups="base.group_extended"
                         type="object" icon="gtk-go-up" />
                     <button name="case_reset" states="done,cancel"
                         string="Reset to Draft" type="object"
@@ -292,7 +313,7 @@
 
         <record id="crm_case-view" model="ir.ui.view">
             <field name="name">crm.case.form</field>
-            <field name="model">crm.case</field>
+            <field name="model">mailgate.thread</field>
             <field name="type">form</field>
             <field name="priority" eval="1"/>
             <field name="arch" type="xml">
@@ -300,7 +321,7 @@
                     <field colspan="4" name="name" select="1"/>
                     <field colspan="2" name="section_id" widget="selection"/>
                     <field name="create_date" select="1"/>
-                    <field name="date_deadline" select="2"/>
+                    <field name="date_deadline"/>
                     <newline />
                     <notebook colspan="4">
                         <page string="General">
@@ -311,10 +332,10 @@
                                 <field colspan="3"
                                     name="partner_address_id"
                                     on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                                    select="2" />
+                                    />
                                 <newline />
                                 <field colspan="3" name="email_from"
-                                    select="2" />
+                                    />
                                 <button name="remind_partner"
                                     states="open,pending"
                                     string="Send Reminder" type="object"
@@ -347,6 +368,7 @@
                                 <button name="case_escalate"
                                     states="open,draft,pending"
                                     string="Escalate" type="object"
+                                    groups="base.group_extended"
                                     icon="gtk-go-up" />
                                 <button name="case_reset"
                                     states="done,cancel"
@@ -356,15 +378,15 @@
                         </page>
                         <page string="History" groups="base.group_extended">
                             <field name="id" select="1"/>
-                            <field name="active" select="2"/>
+                            <field name="active"/>
                             <separator colspan="4" string="Dates"/>
                             <field name="create_date"/>
                             <field colspan="4" name="log_ids" nolabel="1">
                                 <form string="Actions">
                                     <separator colspan="4" string="Action Information"/>
                                     <field colspan="4" name="name"/>
-                                    <field name="date" select="2"/>
-                                    <field name="user_id" select="2"/>                                    
+                                    <field name="date"/>
+                                    <field name="user_id"/>
                                 </form>
                             </field>
                         </page>
@@ -372,16 +394,12 @@
                            <group colspan="4">
                                <field colspan="4" name="email_cc" string="CC"/>
                            </group>
-                           <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                           <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                                <form string="Communication history">
-                                   <group col="7" colspan="4">
+                                   <group col="6" colspan="4">
                                        <field name="date"/>
                                        <field name="email_to"/>
-                                       <field name="email_from"/>                                       
-                                       <button
-                                     string="Add a CC"
-                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                               icon="gtk-add" type="action"/>
+                                       <field name="email_from"/>
                                    </group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
@@ -409,16 +427,14 @@
 
 <!-- Case Search View  -->
 
+               
         <record id="view_crm_case_filter" model="ir.ui.view">
             <field name="name">crm.case.select</field>
-            <field name="model">crm.case</field>
+            <field name="model">mailgate.thread</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Case">
                     <group col='6' colspan='4'>
-                        <filter icon="terp-partner" string="My Cases"
-                            domain="[('user_id','=',uid)]" separator="1"
-                            default="1" help="Cases Related to Current User" />
                         <field name="state" select="1">
                             <filter icon="gtk-new"
                                 domain="[('state','in',('draft', 'open'))]"
@@ -443,15 +459,16 @@
 
         <record id="crm_case_categ0-act" model="ir.actions.act_window">
             <field name="name">Cases</field>
-            <field name="res_model">crm.case</field>
+            <field name="res_model">mailgate.thread</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_tree-view"/>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_crm_case_filter"/>
         </record>
 
         <record id="crm_case_categ0-act_open" model="ir.actions.act_window">
             <field name="name">Open Cases</field>
-            <field name="res_model">crm.case</field>
+            <field name="res_model">mailgate.thread</field>
             <field name="view_type">form</field>
             <field name="domain">
                 [('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]
@@ -461,7 +478,7 @@
 
         <record id="crm_case_section_open_act" model="ir.actions.act_window">
             <field name="name">Cases</field>
-            <field name="res_model">crm.case</field>
+            <field name="res_model">mailgate.thread</field>
             <field name="domain">[('section_id','child_of',[active_id])]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
@@ -486,11 +503,11 @@
                     <field colspan="4" name="name" select="1"/>
                     <field name="date" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="model_id" select="2"/>
-                    <field name="res_id" select="2"/>
-                    <field name="som" select="2"/>
-                    <field name="canal_id" select="2"/>
-                    <field colspan="4" name="description" select="2"/>
+                    <field name="model_id"/>
+                    <field name="res_id"/>
+                    <field name="som"/>
+                    <field name="canal_id"/>
+                    <field colspan="4" name="description"/>
                 </form>
             </field>
         </record>
@@ -503,10 +520,6 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
                 <search string="Search Histories">
-                       <filter icon="terp-crm" string="My Histories"
-                           domain="[('user_id','=',uid)]"
-                           help="My Histories" />
-                       <separator orientation="vertical"/>
                      <group col="6" colspan="2">
                        <field name="date" select="1"/>
                     <field name="user_id" select="1" widget="selection"/>
@@ -526,6 +539,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="crm_case_history_tree-view"/>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="crm_case_history_search"/>
         </record>
 
@@ -556,9 +570,9 @@
                 <form string="Partner Segmentation Lines">
                     <field colspan="4" name="name" select="1"/>
                     <group col="2" colspan="4">
-                        <field name="expr_name" select="2"/>
-                        <field name="expr_operator" select="2"/>
-                        <field name="expr_value" select="2"/>
+                        <field name="expr_name"/>
+                        <field name="expr_operator"/>
+                        <field name="expr_value"/>
                     </group>
                     <newline/>
                     <field name="operator"/>
@@ -576,7 +590,7 @@
                 <form string="Partner Segmentation">
                     <group col="6" colspan="4">
                         <field name="name" select="1"/>
-                        <field name="categ_id" select="2"/>
+                        <field name="categ_id"/>
                         <field name="exclusif"/>
                     </group>
                     <notebook colspan="4">
@@ -591,7 +605,7 @@
                             <field colspan="4" name="segmentation_line" widget="one2many_list" nolabel="1"/>
                         </page>
                         <page string="Description">
-                               <field colspan="4" name="description" select="2" nolabel="1"/>
+                               <field colspan="4" name="description" nolabel="1"/>
                            </page>
                     </notebook>
                     <field name="state"/>
@@ -641,7 +655,8 @@
         </record>
         <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
-            parent="crm.menu_crm_configuration" />
+            groups="base.group_extended"
+            parent="base.menu_crm_configuration" />
 
         <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
             <field name="name">view.users.form.crm.modif.inherited1</field>
@@ -665,7 +680,7 @@
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <field name="password" position="after">
-                    <field name="context_section_id" completion="1" widget="selection"/>
+                        <field name="context_section_id" completion="1" widget="selection"/>
                     </field>
                 </field>
         </record>
@@ -680,33 +695,36 @@
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <field name="parent_id" position="after">
-                    <field name="section_id" completion="1" widget="selection"/>
+                        <field name="section_id" completion="1" widget="selection"
+                            groups="base.group_extended"/>
                     </field>
                 </field>
         </record>
 
         <record id="view_partners_form_crm2" model="ir.ui.view">
-                <field name="name">view.res.partner.form.crm.inherited2</field>
+                <field name="name">view.res.partner.tree.crm.inherited2</field>
                 <field name="model">res.partner</field>
-                <field name="type">form</field>
+                <field name="type">tree</field>
                 <field name="inherit_id" ref="base.view_partner_tree"/>
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <field name="lang" position="after">
-                    <field name="section_id" completion="1" widget="selection"/>
+                        <field name="section_id" completion="1" widget="selection"
+                            groups="base.group_extended"/>
                     </field>
                 </field>
         </record>
 
         <record id="view_partners_form_crm3" model="ir.ui.view">
-                <field name="name">view.res.partner.form.crm.inherited3</field>
+                <field name="name">view.res.partner.search.crm.inherited3</field>
                 <field name="model">res.partner</field>
-                <field name="type">form</field>
+                <field name="type">search</field>
                 <field name="inherit_id" ref="base.view_res_partner_filter"/>
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <field name="category_id" position="after">
-                        <field name="section_id" completion="1" widget="selection"/>
+                        <field name="section_id" completion="1" widget="selection"
+                            groups="base.group_extended"/>
                     </field>
                 </field>
         </record>