[FIX] crm, crm_partner_assign: rename assign_partner with _lead_set_partner in crm...

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

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 141d822..0e2b5df 100644 (file)
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -59,10 +59,10 @@
                         widget="selection"
                         domain="[('object_id.model','=','crm.lead')]"/>
                     <button
-                         name="convert_opportunity"
+                         name="%(crm.action_crm_lead2opportunity_partner)d"
                          string="Convert to Opportunity"
                          help="Convert to Opportunity" icon="gtk-go-forward"
-                         type="object"/>
+                         />
                     <newline />
                     <field name="user_id" />
                     <field name="section_id" widget="selection" />
@@ -120,7 +120,7 @@
                     <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                         <button name="case_cancel" string="Cancel"
                             states="draft,open,pending" type="object"
                             icon="gtk-cancel" />
@@ -195,7 +195,7 @@
                                     <field name="email_cc" size="512" attrs="{'invisible': [('email_from', '=', False)]}"/>
                                 </group>
                                 <field name="subject" colspan="4" widget="char" attrs="{'invisible': [('email_from', '=', False)]}" size="512"/>
-                                <field name="body_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
+                                <field name="display_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
                             </group>
                             <notebook colspan="4">
                                 <page string="Details" attrs="{'invisible': [('email_from', '=', False)]}">
@@ -302,7 +302,7 @@
                 <field name="state"/>
                 <field name="color"/>
                 <field name="priority"/>
-                <field name="planned_revenue"/>
+                <field name="planned_revenue" sum="Expected Revenues"/>
                 <field name="user_email"/>
                 <templates>
                     <t t-name="kanban-box">
@@ -341,7 +341,6 @@
                                 <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
                                     <div class="oe_kanban_left">
                                         <a string="Edit" icon="gtk-edit" type="edit"/>
-                                        <a string="Delete" icon="gtk-close" type="delete"/>
                                         <a string="Change Color" icon="color-picker" type="color" name="color"/>
                                         <a string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
                                         <a string="Schedule/Log Call" name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action"/>
@@ -373,13 +372,15 @@
             <search string="Search Leads">
                 <filter icon="terp-check"
                     string="New"
-                    name="current" help="New Leads"
-                    domain="[('state','in',('draft','open','pending'))]"/>
+                    name="new" help="New Leads"
+                    domain="[('state','=','draft')]"/>
                 <filter icon="terp-camera_test"
                     string="Open"
+                    name="open"
                     domain="[('state','=','open')]"/>
                 <filter icon="terp-gtk-media-pause"
                     string="Pending"
+                    name="pending"
                     domain="[('state','=','pending')]"/>
 
                 <separator orientation="vertical"/>
@@ -412,7 +413,7 @@
                 </field>
                 <separator orientation="vertical"/>
                 <field name="country_id" context="{'invisible_country': False}">
-                       <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
+                    <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
                 </field>
                 <newline/>
                 <group expand="0" string="Group By...">
@@ -516,7 +517,7 @@
 
                     <separator colspan="4"/>
                     <group col="10" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                         <button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />
                         <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
                         <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
@@ -581,7 +582,7 @@
                                    <field name="email_cc" size="512" attrs="{'invisible': [('email_from', '=', False)]}"/>
                                </group>
                                <field name="subject" colspan="4" widget="char" attrs="{'invisible': [('email_from', '=', False)]}" size="512"/>
-                               <field name="body_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
+                               <field name="display_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
                            </group>
                            <notebook colspan="4">
                                <page string="Details" attrs="{'invisible': [('email_from', '=', False)]}">
@@ -676,13 +677,15 @@
             <search string="Search Opportunities">
                 <filter icon="terp-check"
                     string="New"  help="New Opportunities"
-                    name="current"
-                    domain="[('state','in',('draft','open','pending'))]"/>
+                    name="new"
+                    domain="[('state','=','draft')]"/>
                 <filter icon="terp-camera_test"
                     string="Open"  help="Open Opportunities"
+                    name="open"
                     domain="[('state','=','open')]"/>
                 <filter icon="terp-gtk-media-pause"
                     string="Pending"  help="Pending Opportunities"
+                    name="pending"
                     domain="[('state','=','pending')]"/>
                 <separator orientation="vertical"/>
                 <field name="name" string="Opportunity"/>