From 2b04f2f32051b8656f75abc14e898d98d4d7c997 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 14:45:00 +0530
Subject: [PATCH] [IMP]:crm:Buttons of records must match to the order of the
 status bar. from left to right.

bzr revid: apa@tinyerp.com-20120427091500-w02yddph6z1yhep5
---
 addons/crm/crm.py                               | 5 +++--
 addons/crm/crm_lead_view.xml                    | 6 +++---
 addons/crm/crm_phonecall.py                     | 4 ++--
 addons/crm/crm_phonecall_view.xml               | 2 +-
 addons/crm_claim/crm_claim_view.xml             | 2 +-
 addons/crm_fundraising/crm_fundraising_view.xml | 2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml       | 2 +-
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 467ea64e633..2b0dccd275a 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -31,9 +31,10 @@ MAX_LEVEL = 15
 AVAILABLE_STATES = [
     ('draft', 'New'),
     ('open', 'In Progress'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
     ('pending', 'Pending'),
+    ('done', 'Closed'),
+    ('cancel', 'Cancelled'),
+    
 ]
 
 AVAILABLE_PRIORITIES = [
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index d915c73ac09..d85b4b2e4b5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -53,11 +53,11 @@
         <field name="arch" type="xml">
             <form string="Leads Form" layout="manual">
                 <div class="oe_form_topbar">
+                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
                     <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause" />
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
-                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
                     <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
@@ -401,8 +401,8 @@
         <field name="arch" type="xml">
             <form string="Opportunities" layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
                     <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
                     <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
                     <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index e869c2a890a..2b8eb9d1435 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -51,9 +51,9 @@ class crm_phonecall(crm_base, osv.osv):
         'state': fields.selection([
                                     ('draft', 'Draft'),
                                     ('open', 'Todo'),
-                                    ('cancel', 'Cancelled'),
-                                    ('done', 'Held'),
                                     ('pending', 'Not Held'),
+                                    ('done', 'Held'),
+                                    ('cancel', 'Cancelled'),
                                 ], 'State', size=16, readonly=True,
                                   help='The state is set to \'Todo\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 9e4280f1e64..ef334522821 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -60,9 +60,9 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
+                <button name="case_close" string="Held" states="open,pending" type="object" icon="gtk-jump-to" />
                 <button name="case_open" string="Todo" states="pending" type="object" icon="gtk-go-forward" />
                 <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause" />
-                <button name="case_close" string="Held" states="open,pending" type="object" icon="gtk-jump-to" />
                 <button name="case_reset" string="Reset to Todo" states="cancel" type="object" icon="gtk-convert" />
                 <button name="case_cancel" string="Cancel" states="open,pending" type="object" icon="gtk-cancel" />
                 <div class="oe_right">
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 60d5379787f..d8a95a6315a 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -68,8 +68,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
                     <button name="case_close" string="Done" states="open,pending" type="object" icon="gtk-jump-to" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 1bef2520f91..f82485b0244 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -79,8 +79,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
+                    <button name="case_close" string="Done" states="open,pending" type="object" icon="gtk-close" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-close" />
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
                     <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index aa0500ad0ff..6a04fdb4f93 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -30,9 +30,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
+                    <button name="case_close" states="open,pending" string="Close" type="object" icon="gtk-jump-to" />
                     <button name="case_open" states="draft,pending" string="Open" type="object" icon="gtk-go-forward" />
                     <button name="case_pending" states="draft,open" string="Pending" type="object" icon="gtk-media-pause" />
-                    <button name="case_close" states="open,draft,pending" string="Close" type="object" icon="gtk-jump-to" />
                     <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
                     <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object" icon="gtk-go-up" />
                     <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" />