From 88d7d0050789e6f893506cae1ddd48765752aea9 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Wed, 20 Apr 2011 12:17:59 +0530
Subject: [PATCH] [IMP] crm: Views improved.

bzr revid: uco@tinyerp.com-20110420064759-e22n05ajbn8ev9um
---
 addons/crm/report/crm_phonecall_report_view.xml |  2 +-
 addons/crm/res_partner_view.xml                 | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index bc2ce828f5e..acc91cbef41 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -108,7 +108,7 @@
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                        <filter string="Type" icon="terp-stock_symbol-selection"
+                        <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 9df185ae831..18cf98e7b29 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -54,19 +54,19 @@
                         <tree string="Phone Calls" colors="gray:state in ('draft', 'cancel','done','pending')">
                             <field name="date" string="Date"/>
                             <field name="name" string="Call Summary"/>
-                            <field name="categ_id" string="Type" widget="selection"/>
+                            <field name="categ_id" widget="selection"/>
                             <field name="user_id"/>
                             <field name="state"/>
                             <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                            <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                            <button name="case_open" string="Todo" states="draft,pending" type="object" icon="gtk-go-forward"/>
                             <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
                             <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause"/>
                         </tree>
             <form string="Phone Call">
                  <group colspan="6" col="7">
                     <field name="name" required="1"/>
-                    <field name="partner_phone"   attrs="{'required': [('categ_id.name', '=', 'Outbound')]}"/>
-                    <field name="duration" widget="float_time" required="1"/>
+                    <field name="partner_phone"/>
+                    <field name="duration" widget="float_time"/>
                     <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
 
                     <field name="date" required="1"/>
@@ -75,7 +75,7 @@
                     <button string="Convert to Opportunity"
                         name="%(phonecall2opportunity_act)d"
                         icon="gtk-index" type="action"
-                        attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+                        attrs="{'invisible':['|', ('opportunity_id','!=',False), ('state','=','done')]}" />
                     <label colspan="6"  string=""/>
                     <button string="Schedule Other Call"
                      icon="terp-call-start"
@@ -103,8 +103,7 @@
                 <group col="2" colspan="2">
                     <separator colspan="2" string="Categorization" />
                     <field name="categ_id" widget="selection"
-                        domain="[('object_id.model', '=', 'crm.phonecall')]"
-                        string="Type" />
+                        domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                     <field name="priority"/>
                     <field name="opportunity_id"/>
                 </group>
@@ -116,7 +115,7 @@
                     <button name="case_cancel" string="Cancel"
                         states="draft,open,pending" type="object"
                         icon="gtk-cancel" />
-                    <button name="case_open" string="Open"
+                    <button name="case_open" string="Todo"
                         states="draft,pending" type="object"
                         icon="gtk-go-forward" />
                     <button name="case_pending" string="Not Held"
@@ -125,7 +124,7 @@
                         states="open,draft,pending" type="object"
                         icon="gtk-jump-to" />
                     <button name="case_reset" string="Reset to Draft"
-                        states="done,cancel" type="object"
+                        states="cancel" type="object"
                         icon="gtk-convert" />
                 </group>
             </form>