From 8d3365c1bab2a33fa8dcdc828deef832e947fc8e Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 15:21:37 +0530
Subject: [PATCH] [IMP]

bzr revid: apa@tinyerp.com-20120427095137-5v5dnze0jokg7u3f
---
 addons/crm/crm.py                             | 2 +-
 addons/crm/crm_phonecall.py                   | 2 +-
 addons/hr/hr.py                               | 2 +-
 addons/hr_evaluation/hr_evaluation.py         | 2 +-
 addons/hr_evaluation/hr_evaluation_view.xml   | 2 +-
 addons/hr_expense/hr_expense.py               | 5 +++--
 addons/hr_expense/hr_expense_view.xml         | 2 +-
 addons/hr_recruitment/hr_recruitment.py       | 4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 2b0dccd275a..2c2a53bd557 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -32,8 +32,8 @@ AVAILABLE_STATES = [
     ('draft', 'New'),
     ('open', 'In Progress'),
     ('pending', 'Pending'),
-    ('done', 'Closed'),
     ('cancel', 'Cancelled'),
+    ('done', 'Closed'),
     
 ]
 
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 2b8eb9d1435..c641aced9e8 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -52,8 +52,8 @@ class crm_phonecall(crm_base, osv.osv):
                                     ('draft', 'Draft'),
                                     ('open', 'Todo'),
                                     ('pending', 'Not Held'),
-                                    ('done', 'Held'),
                                     ('cancel', 'Cancelled'),
+                                    ('done', 'Held'),
                                 ], '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/hr/hr.py b/addons/hr/hr.py
index bd0c730d92d..030cafcbb45 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -110,7 +110,7 @@ class hr_job(osv.osv):
         'requirements': fields.text('Requirements'),
         'department_id': fields.many2one('hr.department', 'Department'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'state': fields.selection([('open', 'In Position'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', readonly=True, required=True),
+        'state': fields.selection([('open', 'In Position'),('recruit', 'In Recruitement'),('old', 'Old')], 'State', readonly=True, required=True),
     }
     _defaults = {
         'expected_employees': 1,
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 6e1983d7a11..c409ad19496 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -163,8 +163,8 @@ class hr_evaluation(osv.osv):
             ('draft','New'),
             ('wait','Plan In Progress'),
             ('progress','Waiting Appreciation'),
-            ('done','Done'),
             ('cancel','Cancelled'),
+            ('done','Done'),
         ], 'State', required=True, readonly=True),
         'date_close': fields.date('Ending Date', select=True),
         'progress': fields.float("Progress"),
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 2c192513ed4..5b4d04923de 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -162,7 +162,7 @@
                     <button name="button_draft" string="Reset to Draft" states="cancel" type="object" icon="terp-stock_effects-object-colorize"/>
                     <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object" icon="gtk-cancel"/>
                     <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,wait,done" statusbar_colors='{"progress":"blue"}'/>
                     </div>
                 </div>
                 <sheet string="Appraisal" layout="auto">
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 6e7db83bbb7..71b8b2f0bef 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -80,10 +80,11 @@ class hr_expense_expense(osv.osv):
         'state': fields.selection([
             ('draft', 'New'),
             ('confirm', 'Waiting Approval'),
+            ('cancelled', 'Refused'),
             ('accepted', 'Approved'),
             ('invoiced', 'Invoiced'),
-            ('paid', 'Reimbursed'),
-            ('cancelled', 'Refused')],
+            ('paid', 'Reimbursed')
+            ],
             'State', readonly=True, help='When the expense request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Confirmation\'.\
             \nIf the admin accepts it, the state is \'Accepted\'.\n If an invoice is made for the expense request, the state is \'Invoiced\'.\n If the expense is paid to user, the state is \'Reimbursed\'.'),
     }
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index a8500bc7c35..1e1687025d1 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -73,7 +73,7 @@
                     <button name="invoice" states="accepted" string="Invoice" type="object" icon="gtk-go-forward" groups="base.group_hr_user"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
                     <div class="oe_right">
-                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,accepted,invoiced" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
+                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                     </div>
                 </div>
                 <sheet string="Expenses Sheet" layout="auto">
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 17a2d11fd0e..69b25798864 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -36,9 +36,9 @@ wizard.mail_compose_message.SUPPORTED_MODELS.append('hr.applicant')
 AVAILABLE_STATES = [
     ('draft', 'New'),
     ('open', 'In Progress'),
+    ('pending', 'Pending'),
     ('cancel', 'Refused'),
-    ('done', 'Hired'),
-    ('pending', 'Pending')
+    ('done', 'Hired')
 ]
 
 AVAILABLE_PRIORITIES = [
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 4041dc69698..f089acac180 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -76,8 +76,8 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
                 <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
+                <button name="case_open" string="In Progress" 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 New" states="done,cancel" type="object" icon="gtk-convert"/>
                 <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>