[MERGE] forward port of branch 8.0 up to 83bd9ee

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

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 69ddb76..c1e877b 100644 (file)
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -3,14 +3,37 @@
     <data>
 
 
-    <!-- Phonecall Categories Form View  -->
-    <record id="crm_phonecall_categ_action" model="ir.actions.act_window">
+    <!-- Phonecall Categories -->
+
+        <record id="crm_phonecall_category_form" model="ir.ui.view">
+            <field name="name">crm.phonecall.category.form</field>
+            <field name="model">crm.phonecall.category</field>
+            <field name="arch" type="xml">
+                <form string="Phonecall Categories">
+                    <group>
+                        <field name="name"/>
+                        <field name="team_id" groups="base.group_multi_salesteams"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="crm_phonecall_category_tree" model="ir.ui.view">
+            <field name="name">crm.phonecall.category.tree</field>
+            <field name="model">crm.phonecall.category</field>
+            <field name="arch" type="xml">
+                <tree string="Phonecall Categories">
+                    <field name="name"/>
+                    <field name="team_id" groups="base.group_multi_salesteams"/>
+                </tree>
+            </field>
+        </record>
+
+    <record id="crm_phonecall_category_action" model="ir.actions.act_window">
         <field name="name">Phonecall Categories</field>
-        <field name="res_model">crm.case.categ</field>
+        <field name="res_model">crm.phonecall.category</field>
         <field name="view_type">form</field>
-        <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-        <field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field>
-        <field name="context" eval="{'object_id': ref('model_crm_phonecall')}"/>
+        <field name="view_id" ref="crm_phonecall_category_tree"/>
         <field name="help" type="html">
           <p class="oe_view_nocontent_create">
             Click to add a new category.
@@ -21,7 +44,7 @@
         </field>
     </record>
 
-    <menuitem action="crm_phonecall_categ_action" name="Categories"
+    <menuitem action="crm_phonecall_category_action" name="Categories"
         id="menu_crm_case_phonecall-act" parent="menu_crm_config_phonecall" groups="base.group_no_one"/>
 
     <!-- Phonecalls Tree View -->
@@ -38,7 +61,7 @@
                     name="action_make_meeting"
                     icon="gtk-redo"
                     type="object"/>
-                <button string="Convert to Opportunity"
+                <button string="Create an Opportunity"
                     type="object"
                     name="action_button_convert2opportunity"
                     states="open,pending"
@@ -97,11 +120,10 @@
                         <div>
                                <field name="duration" widget="float_time" class="oe_inline" style="vertical-align:baseline"/> <b> min(s)</b>
                         </div>
-                        <field name="section_id" colspan="1" widget="selection"
+                        <field name="team_id" colspan="1" widget="selection"
                                 groups="base.group_multi_salesteams"/>
                         <field name="partner_id" on_change="on_change_partner_id(partner_id)"/>
-                        <field name="categ_id" widget="selection"
-                            domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <field name="categ_id" widget="selection"/>
                         <field name="partner_mobile"/>
                         <field name="priority" widget="priority"/>
                         <field name="opportunity_id" on_change="on_change_opportunity(opportunity_id)" context="{'opportunity_id': opportunity_id}"/>
@@ -130,7 +152,6 @@
                     invisible="1"/>
                 <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_salesman_all_leads']}"/>
                 <field name="categ_id" widget="selection"
-                    domain="[('object_id.model', '=', 'crm.phonecall')]"
                     invisible="1"/>
                 <field name="state" invisible="1"/>
                 <field name="create_date" invisible="1"/>
@@ -142,7 +163,7 @@
                 <button string="Meeting"
                      icon="gtk-redo"
                      name="action_make_meeting" type="object"/>
-                <button string="Convert to Opportunity"
+                <button string="Create an Opportunity"
                     name="action_button_convert2opportunity"
                     states="open,pending"
                     icon="gtk-index"
@@ -174,7 +195,7 @@
                 <field name="date"/>
                 <field name="state"/>
                 <filter string="My Phonecalls" domain="[('user_id', '=', uid)]"/>
-                <filter string="My Team" domain="[('section_id.user_id', '=', uid)]"/>
+                <filter string="My Team" domain="[('team_id.user_id', '=', uid)]"/>
                 <filter string="Unassigned" domain="[('user_id','=',False)]"/>
                 <separator/>
                 <filter string="To Do" name="current" domain="[('state','in',('open','pending'))]"/>
@@ -184,7 +205,7 @@
                 <field name="partner_id" operator="child_of"/>
                 <field name="user_id"/>
                 <field name="opportunity_id"/>
-                <field name="section_id" string="Sales Team"
+                <field name="team_id" string="Sales Team"
                         groups="base.group_multi_salesteams"/>
                 <group expand="0" string="Group By">
                     <filter string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>