From 364f9aefa9ca4ce331b5d5c6a8cab0f4ce4f356a Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 14 Sep 2011 18:41:11 +0530
Subject: [PATCH 01/15] [IMP]stock,purchase_requisition,crm:statusbar
 Improvement is Done

bzr revid: mma@tinyerp.com-20110914131111-3o0jykg61r5eq98c
---
 addons/account_voucher/account_voucher.py                 | 2 +-
 addons/account_voucher/account_voucher_view.xml           | 2 +-
 addons/account_voucher/voucher_payment_receipt_view.xml   | 4 ++--
 addons/account_voucher/voucher_sales_purchase_view.xml    | 4 ++--
 addons/crm/crm.py                                         | 4 ++--
 addons/crm_claim/crm_claim_view.xml                       | 2 +-
 addons/crm_fundraising/crm_fundraising_view.xml           | 2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml                 | 2 +-
 addons/hr_evaluation/hr_evaluation.py                     | 2 +-
 addons/hr_evaluation/hr_evaluation_view.xml               | 2 +-
 addons/idea/idea.py                                       | 2 +-
 addons/idea/idea_view.xml                                 | 2 +-
 addons/lunch/lunch.py                                     | 2 +-
 addons/lunch/lunch_view.xml                               | 2 +-
 addons/marketing_campaign/marketing_campaign.py           | 4 ++--
 addons/marketing_campaign/marketing_campaign_view.xml     | 6 +++---
 addons/purchase_requisition/purchase_requisition.py       | 2 +-
 addons/purchase_requisition/purchase_requisition_view.xml | 2 +-
 addons/stock/stock.py                                     | 4 ++--
 addons/stock/stock_view.xml                               | 2 +-
 20 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index da878458d6c..0772b8e178d 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -255,7 +255,7 @@ class account_voucher(osv.osv):
         'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
         'company_currency': fields.related('company_id','currency_id', type='many2one', relation='res.currency', string='Currency', readonly=True),
         'state':fields.selection(
-            [('draft','Draft'),
+            [('draft','New'),
              ('proforma','Pro-forma'),
              ('posted','Posted'),
              ('cancel','Cancelled')
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index fd0e1a0c3c6..567790e6eee 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -102,7 +102,7 @@
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'Blue'}"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
                         <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 504fc4bbefc..a9040350046 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -280,7 +280,7 @@
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'Blue'}"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
                         <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile this record ?"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
@@ -455,7 +455,7 @@
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'Blue'}"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
                         <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 356c3f47ac9..de7da7307d9 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -148,7 +148,7 @@
                         </page>
                     </notebook>
                     <group col="8" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'Blue'}"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
@@ -268,7 +268,7 @@
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'Blue'}"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <group attrs="{'invisible':[('state','!=','posted')]}">
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index c7bc461fa1f..512192ddce7 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -29,8 +29,8 @@ from tools.translate import _
 
 MAX_LEVEL = 15
 AVAILABLE_STATES = [
-    ('draft', 'Draft'),
-    ('open', 'Open'),
+    ('draft', 'New'),
+    ('open', 'In Progress'),
     ('cancel', 'Cancelled'),
     ('done', 'Closed'),
     ('pending', 'Pending'),
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 21ec4cf028e..012a42a83ee 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -106,7 +106,7 @@
                                 <field name="description" colspan="4" nolabel="1"/>
                                 <separator colspan="4" string=""/>
                                 <group col="8" colspan="4">
-                                    <field name="state" select="1"/>
+                                    <field name="state" select="1" 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" />
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index a527eddd1fd..65fb982fa11 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -110,7 +110,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" />
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 0bdaf256a27..6ab783d06ba 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -69,7 +69,7 @@
                             <field name="description" colspan="4" nolabel="1" />
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
-                                <field name="state" select="1"/>
+                                <field name="state" select="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'Blue'}"/>
                                 <button name="case_cancel"
                                     states="draft,open,pending" string="Cancel"
                                     type="object" icon="gtk-cancel" />
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 7634052704c..d79cf90b915 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -158,7 +158,7 @@ class hr_evaluation(osv.osv):
         'survey_request_ids': fields.one2many('hr.evaluation.interview','evaluation_id','Appraisal Forms'),
         'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', required=True),
         'state': fields.selection([
-            ('draft','Draft'),
+            ('draft','New'),
             ('wait','Plan In Progress'),
             ('progress','Waiting Appreciation'),
             ('done','Done'),
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 869d1f93994..6d6333c8654 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -201,7 +201,7 @@
                     </notebook>
                     <newline/>
                     <group col="8" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,wait,progress,done" statusbar_colors="{'progress':'Blue'}"/>
                         <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
                                 icon="gtk-cancel"/>
                         <button name="button_plan_in_progress" string="Start Evaluation" states="draft" type="object"
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 0e6e89f15b5..c6238e6bb13 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -185,7 +185,7 @@ class idea_idea(osv.osv):
         'count_votes': fields.function(_vote_count, string="Count of votes", type="integer"),
         'count_comments': fields.function(_comment_count, string="Count of comments", type="integer"),
         'category_id': fields.many2one('idea.category', 'Category', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'state': fields.selection([('draft', 'Draft'),
+        'state': fields.selection([('draft', 'New'),
             ('open', 'Opened'),
             ('close', 'Accepted'),
             ('cancel', 'Refused')],
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 4111cd03962..69175004385 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -247,7 +247,7 @@
                 </page>
             </notebook>
             <group colspan="4" col="6">
-                <field name="state"/>
+                <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
                 <button name="idea_open" string="Open" states="draft" icon="gtk-go-forward"/>
                 <button name="idea_close" string="Accept" states="open" icon="gtk-jump-to"/>
                 <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/>
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 771779310cb..3c658333e14 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -138,7 +138,7 @@ class lunch_order(osv.osv):
         'cashmove': fields.many2one('lunch.cashmove', 'CashMove' , readonly=True),
         'descript': fields.char('Description Order', readonly=True, size=250, \
             states = {'draft':[('readonly', False)]}),
-        'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ], \
+        'state': fields.selection([('draft', 'New'), ('confirmed', 'Confirmed'), ], \
             'State', readonly=True, select=True),
         'price': fields.function(_price_get, string="Price"),
         'category': fields.many2one('lunch.category','Category'),
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 09f1fcd92a6..100380d34c4 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -34,7 +34,7 @@
                     <newline/>
                    <separator string="" colspan="4"/>
                     <group colspan="4" col="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
                         <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" icon="gtk-ok" attrs="{'invisible':[('state','=','confirmed')]}"/>
                         <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" icon="gtk-cancel"/>
                     </group>
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 27c91fcc3fe..547281911c4 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -113,7 +113,7 @@ this campaign to be run"),
 Test in Realtime - It creates and processes all the activities directly but does not send emails or produce reports.
 With Manual Confirmation - the campaigns runs normally, but the user has to validate all workitem manually.
 Normal - the campaign runs normally and automatically sends all emails and reports (be very careful with this mode, you're live!)"""),
-        'state': fields.selection([('draft', 'Draft'),
+        'state': fields.selection([('draft', 'New'),
                                    ('running', 'Running'),
                                    ('done', 'Done'),
                                    ('cancelled', 'Cancelled'),],
@@ -267,7 +267,7 @@ class marketing_campaign_segment(osv.osv):
                                            '"No duplicates" prevents selecting records which have already entered the campaign previously.'\
                                            'If the campaign has a "unique field" set, "no duplicates" will also prevent selecting records which have '\
                                            'the same value for the unique field as other records that already entered the campaign.'),
-        'state': fields.selection([('draft', 'Draft'),
+        'state': fields.selection([('draft', 'New'),
                                    ('running', 'Running'),
                                    ('done', 'Done'),
                                    ('cancelled', 'Cancelled')],
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 4ecbda6c4f8..109cd8648d4 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -36,7 +36,7 @@
                 <field name="activity_ids" nolabel = "1" colspan="4" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" />
                 <separator string="" colspan="4" />
                 <group col="10" colspan="4">
-                    <field name="state" readonly="1" />
+                    <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
                     <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
                     <button name="state_running_set" string="Run" states="draft,done,cancelled" icon="gtk-apply"/>
                     <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
@@ -161,7 +161,7 @@
                 </group>
                 <separator string="" colspan="4"/>
                 <group col="6" colspan="4">
-                    <field name="state" readonly="1"/>
+                    <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
                     <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
                     <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
                     <button name="state_done_set" string="Close" states="running" icon="terp-dialog-close"/>
@@ -382,7 +382,7 @@
                 </group>
                 <separator string="" colspan="4"/>
                 <group colspan="4" col="11">
-                    <field name="state" readonly="True"/>
+                    <field name="state" readonly="True" widget="statusbar" statusbar_visible="todo,done" statusbar_colors="{'exception':'red'}"/>
                     <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="terp-gtk-stop"/>
                     <button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-undo"/>
                     <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index cb31709b20e..00c449dfd7d 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -41,7 +41,7 @@ class purchase_requisition(osv.osv):
         'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders',states={'done': [('readonly', True)]}),
         'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase',states={'done': [('readonly', True)]}),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),        
-        'state': fields.selection([('draft','Draft'),('in_progress','In Progress'),('cancel','Cancelled'),('done','Done')], 'State', required=True)
+        'state': fields.selection([('draft','New'),('in_progress','In Progress'),('cancel','Cancelled'),('done','Done')], 'State', required=True)
     }
     _defaults = {
         'date_start': time.strftime('%Y-%m-%d %H:%M:%S'),
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 79cee2870b7..aa8b99c9ea9 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -60,7 +60,7 @@
                         </field>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" select="1" readonly ="1"/>
+                        <field name="state" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done"/>
                         <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
                         <button name="tender_in_progress" states="draft" string="Confirm" type="object" icon="gtk-apply" />
                         <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 8d7e993d817..ca26c335cac 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -622,8 +622,8 @@ class stock_picking(osv.osv):
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location',help="Location where the system will stock the finished products.", select=True),
         'move_type': fields.selection([('direct', 'Partial Delivery'), ('one', 'All at once')], 'Delivery Method', required=True, help="It specifies goods to be delivered all at once or by direct delivery"),
         'state': fields.selection([
-            ('draft', 'Draft'),
-            ('auto', 'Waiting'),
+            ('draft', 'New'),
+            ('auto', 'Waiting Another Operation'),
             ('confirmed', 'Waiting Availability'),
             ('assigned', 'Ready to Process'),
             ('done', 'Done'),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 7b2dae600d0..5531f86f84d 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1210,7 +1210,7 @@
                                 </form>
                             </field>
                             <group col="10" colspan="4">
-                                <field name="state" readonly="1"/>
+                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors="{'auto':'Blue', 'confirmed':'Blue'}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>

From 3246126ee75d659944e18385aeb596639fd7c80e Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Thu, 15 Sep 2011 11:06:24 +0530
Subject: [PATCH 02/15] [ADD] sale,purchase,stock:Add widget=statusbar in state
 field.

bzr revid: aag@tinyerp.com-20110915053624-jtxwvlujqb2o976m
---
 addons/purchase/purchase_view.xml | 2 +-
 addons/sale/sale.py               | 2 +-
 addons/sale/sale_view.xml         | 2 +-
 addons/stock/stock.py             | 2 +-
 addons/stock/stock_view.xml       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 137c44347d2..414e87c37f1 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -194,7 +194,7 @@
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                             </group>
                             <group col="11" colspan="4">
-                                <field name="state" readonly="1"/>
+                                <field name="state" widget="statusbar" statusbar_visible=" draft, approved, done" statusbar_colors="{'except_picking':'red','except_invoice':'red','confirmed':'blue','wait':'blue'}" readonly="1"/>
                                 <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index a37c9331c71..8404beb3b87 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -199,7 +199,7 @@ class sale_order(osv.osv):
         'state': fields.selection([
             ('draft', 'Quotation'),
             ('waiting_date', 'Waiting Schedule'),
-            ('manual', 'Manual In Progress'),
+            ('manual', 'To Invoice'),
             ('progress', 'In Progress'),
             ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index fc30b934111..924d53b345d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -177,7 +177,7 @@
                                 <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
                             </group>
                             <group col="13" colspan="4">
-                                <field name="state"/>
+                                <field name="state" widget="statusbar" statusbar_visible=" draft, progress, done" statusbar_colors="{'shipping_except':'red','invoice_except':'red','waiting_date':'blue'}"/>
                                 <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
                                 <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
                                 <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 8d7e993d817..f288b4246b5 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1545,7 +1545,7 @@ class stock_move(osv.osv):
         'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History (parent moves)'),
         'picking_id': fields.many2one('stock.picking', 'Reference', select=True,states={'done': [('readonly', True)]}),
         'note': fields.text('Notes'),
-        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Not Available'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
+        'state': fields.selection([('draft', 'New'), ('waiting', 'Waiting'), ('confirmed', 'Not Available'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
               help='When the stock move is created it is in the \'Draft\' state.\n After that, it is set to \'Not Available\' state if the scheduler did not find the products.\n When products are reserved it is set to \'Available\'.\n When the picking is done the state is \'Done\'.\
               \nThe state is \'Waiting\' if the move is waiting for another one.'),
         'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 7b2dae600d0..575f0bd3156 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1467,7 +1467,7 @@
                     </group>
 
                     <separator colspan="4"/>
-                    <field name="state"/>
+                    <field name="state" widget="statusbar" statusbar_visible=" draft, assigned, done" statusbar_colors="{'waiting':'blue','confirmed':'blue'}"/>
                     <group col="4" colspan="2">
                         <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
                         <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>

From f7b4a83a3ec8a99b628856f7315983268fc24ad1 Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Thu, 15 Sep 2011 11:09:23 +0530
Subject: [PATCH 03/15] [ADD] CRM:Add widget=statusbar in state field.

bzr revid: aag@tinyerp.com-20110915053923-nsfqjpp73397uj2g
---
 addons/crm/crm.py                 | 2 +-
 addons/crm/crm_lead_view.xml      | 4 ++--
 addons/crm/crm_phonecall_view.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index c7bc461fa1f..8f4f660d8e2 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -29,7 +29,7 @@ from tools.translate import _
 
 MAX_LEVEL = 15
 AVAILABLE_STATES = [
-    ('draft', 'Draft'),
+    ('draft', 'New'),
     ('open', 'Open'),
     ('cancel', 'Cancelled'),
     ('done', 'Closed'),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 8811cea8ac4..4bc0688cabd 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -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" />
@@ -516,7 +516,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" />
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 878f9a2e5d8..48355a99af5 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -107,7 +107,7 @@
                 <field name="description" nolabel="1" colspan="4" />
                 <separator colspan="4" />
                 <group col="8" colspan="4">
-                    <field name="state" select="1" />
+                	<field name="state" widget="statusbar" statusbar_visible=" open, done" statusbar_colors="{'pending':'red'}" select="1"/>
                     <button name="case_cancel" string="Cancel"
                         states="open,pending" type="object"
                         icon="gtk-cancel" />

From 556233685f925bdff1e093e2ee94ad152b39e02a Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Thu, 15 Sep 2011 11:10:59 +0530
Subject: [PATCH 04/15] [ADD] MRP,Project:Add widget=statusbar in state field.

bzr revid: aag@tinyerp.com-20110915054059-7iuj6qeg3nc4wm10
---
 addons/analytic/analytic.py     | 2 +-
 addons/mrp/mrp.py               | 2 +-
 addons/mrp/mrp_view.xml         | 2 +-
 addons/project/project.py       | 2 +-
 addons/project/project_view.xml | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index a155352adf8..722491ae6e2 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -168,7 +168,7 @@ class account_analytic_account(osv.osv):
         'date_start': fields.date('Date Start'),
         'date': fields.date('Date End', select=True),
         'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
-        'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed'),('template', 'Template')], 'State', required=True,
+        'state': fields.selection([('draft','New'),('open','Started'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed'),('template', 'Template')], 'State', required=True,
                                   help='* When an account is created its in \'Draft\' state.\
                                   \n* If any associated partner is there, it can be in \'Open\' state.\
                                   \n* If any pending balance is there it can be in \'Pending\'. \
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index ec429488914..7b653de9f6e 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -475,7 +475,7 @@ class mrp_production(osv.osv):
         'move_created_ids2': fields.one2many('stock.move', 'production_id', 'Moves Created', domain=[('state','in', ('done', 'cancel'))]),
         'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation'),
-        'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
+        'state': fields.selection([('draft','New'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','Production Started'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
                                     help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Picking Exception\'.\
                                     \nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production gets started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'),
         'hour_total': fields.function(_production_calc, type='float', string='Total Hours', multi='workorder', store=True),
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9b2ea49e2b5..0e630677df6 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -700,7 +700,7 @@
                                </field>
                             <separator colspan="4"/>
                             <group col="9" colspan="4">
-                                <field name="state"/>
+                                <field name="state" widget="statusbar" statusbar_visible=" draft, ready, in_production, done" statusbar_colors="{'picking_except':'red','confirmed':'blue'}"/>
                                 <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
                                 <button name="action_cancel" type="object" states="confirmed" string="Cancel" icon="gtk-stop"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
diff --git a/addons/project/project.py b/addons/project/project.py
index e62570a1a43..6ed790b298f 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -430,7 +430,7 @@ class task(osv.osv):
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of tasks."),
         'type_id': fields.many2one('project.task.type', 'Stage'),
-        'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
+        'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
         'create_date': fields.datetime('Create Date', readonly=True,select=True),
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0f0c4a9ca0b..64db87bf21f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -45,7 +45,7 @@
                             <newline/>
                             <separator colspan="4"/>
                             <group col="9" colspan="8">
-                                <field name="state" select="1" readonly="1"/>
+                            	<field name="state" widget="statusbar" statusbar_visible=" open, close" statusbar_colors="{'pending':'blue'}" select="1" readonly="1"/>
                                 <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
                                 <button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
@@ -257,7 +257,7 @@
                             </field>
                             <newline/>
                             <group col="11" colspan="4">
-                                <field name="state" select="1"/>
+                                <field name="state" widget="statusbar" statusbar_visible=" draft, open, done" statusbar_colors="{'pending':'blue'}" select="1"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                                 <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
                                 <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>

From 53be1a95ef5ab8fd246ae142a8e047a2decc3683 Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Thu, 15 Sep 2011 11:13:40 +0530
Subject: [PATCH 05/15] [ADD]
 Hr_expense,Hr_holidays,Hr_Recrutment,,Project_issue:Add widget=statusbar in
 state field.

bzr revid: aag@tinyerp.com-20110915054340-i84rf83h7ctkvvu3
---
 addons/hr_expense/hr_expense.py               | 2 +-
 addons/hr_expense/hr_expense_view.xml         | 4 ++--
 addons/hr_holidays/hr_holidays.py             | 2 +-
 addons/hr_holidays/hr_holidays_view.xml       | 4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 addons/project_issue/project_issue.py         | 2 +-
 addons/project_issue/project_issue_view.xml   | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 68d607b0335..dc835dfacde 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -77,7 +77,7 @@ class hr_expense_expense(osv.osv):
         'department_id':fields.many2one('hr.department','Department'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'state': fields.selection([
-            ('draft', 'Draft'),
+            ('draft', 'New'),
             ('confirm', 'Waiting Approval'),
             ('accepted', 'Approved'),
             ('invoiced', 'Invoiced'),
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 60dffa22d24..886750b11f6 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -99,11 +99,11 @@
                                     </group>
                                 </form>
                             </field>
-                            <field name="state"/>
+                            <field name="state" widget="statusbar" statusbar_visible=" draft, confirm, accepted, invoiced" statusbar_colors="{'confirm':'blue','cancelled':'red'}"/>
                             <group col="6" colspan="2">
                                 <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_user"/>
                                 <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
-                                <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
+                                <button name="confirm" states="draft" string="Submit to Manager" type="workflow" icon="gtk-apply"/>
                                 <button name="invoice" states="accepted" string="Invoice" type="object" icon="gtk-go-forward" groups="base.group_hr_user"/>
                                 <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_user"/>
                             </group>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 612b890b723..f3e4b867420 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -111,7 +111,7 @@ class hr_holidays(osv.osv):
 
     _columns = {
         'name': fields.char('Description', required=True, size=64),
-        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
+        'state': fields.selection([('draft', 'New'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
             ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')],
             'State', readonly=True, help='The state is set to \'Draft\', when a holiday request is created.\
             \nThe state is \'Waiting Approval\', when holiday request is confirmed by user.\
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 99d0c611314..552d48fa7c8 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -83,7 +83,7 @@
                             <separator string="Reasons" colspan="4"/>
                             <field name="notes" nolabel="1" colspan="4"/>
                             <newline/>
-                            <field name="state" colspan="2"/>
+                            <field name="state" widget="statusbar" statusbar_visible=" draft, confirm, validate" statusbar_colors="{'confirm':'blue','validate1':'blue','refuse':'red'}" colspan="2"/>
                             <group colspan="2" col="6">
                                 <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
@@ -125,7 +125,7 @@
                         <separator string="Reasons" colspan="4"/>
                         <field name="notes" nolabel="1" colspan="4"/>
                         <newline/>
-                        <field name="state" colspan="2"/>
+                        <field name="state" widget="statusbar" statusbar_visible=" draft, confirm, validate" statusbar_colors="{'confirm':'blue','validate1':'blue','refuse':'red'}" colspan="2"/>
                         <group colspan="2" col="6">
                             <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 629b1c68012..ce081cbd99c 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -132,7 +132,7 @@
                         </group>
                         <separator colspan="4" string="Status"/>
                         <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="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <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"/>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index af756d34c5f..302000950a1 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -196,7 +196,7 @@ class project_issue(crm.crm_case, osv.osv):
                                  domain="[('partner_id','=',partner_id)]"),
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Description'),
-        'state': fields.selection([('draft', 'New'), ('open', 'To Do'), ('cancel', 'Cancelled'), ('done', 'Closed'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
+        'state': fields.selection([('draft', 'New'), ('open', 'To Solve'), ('cancel', 'Cancelled'), ('done', 'Closed'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index ce66320897a..f4b67716925 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -83,9 +83,9 @@
                             <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"/>
-                            <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                            <button name="case_open" string="Solve" states="draft,pending" type="object" icon="gtk-go-forward"/>
                             <button name="case_close" string="Close" states="open,draft,pending" type="object" icon="terp-dialog-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" icon="gtk-go-up"/>

From 0e8ddd5b224ed9f1a3f9168fa4f93405d89792cf Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Thu, 15 Sep 2011 11:15:57 +0530
Subject: [PATCH 06/15] [ADD] Account,,Project_long_term:Add widget=statusbar
 in state field.

bzr revid: aag@tinyerp.com-20110915054557-x7a7641i36cncu0l
---
 addons/account/account_bank_statement.py            | 2 +-
 addons/account/account_invoice_view.xml             | 4 ++--
 addons/account/account_view.xml                     | 4 ++--
 addons/project_long_term/project_long_term.py       | 2 +-
 addons/project_long_term/project_long_term_view.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index f712cc9ab0c..8b0161e7baa 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -144,7 +144,7 @@ class account_bank_statement(osv.osv):
             states={'confirm':[('readonly', True)]}),
         'move_line_ids': fields.one2many('account.move.line', 'statement_id',
             'Entry lines', states={'confirm':[('readonly',True)]}),
-        'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirmed')],
+        'state': fields.selection([('draft', 'New'),('confirm', 'Confirmed')],
             'State', required=True,
             states={'confirm': [('readonly', True)]}, readonly="1",
             help='When new statement is created the state will be \'Draft\'. \
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 545bfd41f10..6cb1af69fd0 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -205,7 +205,7 @@
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="state"/>
+                                <field name="state" widget="statusbar" statusbar_visible=" draft, open, paid" statusbar_colors="{'proforma':'blue','proforma2':'blue'}"/>
                                 <field name="residual"/>
                                 <group col="6" colspan="4">
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
@@ -300,7 +300,7 @@
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="state"/>
+                                <field name="state" widget="statusbar" statusbar_visible=" draft, open, paid" statusbar_colors="{'proforma':'blue','proforma2':'blue'}"/>
                                 <field name="residual"/>
                                 <group col="8" colspan="4" groups="base.group_user">
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 2264508a7da..1aba125bc63 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -596,7 +596,7 @@
                         </page>
                     </notebook>
                     <group col="8" colspan="4">
-                        <field name="state"/>
+                        <field name="state" widget="statusbar" statusbar_visible=" draft, confirm"/>
                         <field name="balance_end"/>
                         <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                         <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
@@ -2642,7 +2642,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                         </group>
                     </group>
                     <group col="8" colspan="4">
-                        <field name="state" colspan="4"/>
+                        <field name="state" widget="statusbar" statusbar_visible=" draft, confirm" colspan="4"/>
                         <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
                         <button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-dialog-close" type="object"/>
                         <button name="button_open" states="draft" string="Open CashBox" icon="gtk-go-forward" type="object"/>
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 6c5ef7890bf..7cd6697b67a 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -117,7 +117,7 @@ class project_phase(osv.osv):
         'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'resource_ids': fields.one2many('project.resource.allocation', 'phase_id', "Project Resources",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'responsible_id': fields.many2one('res.users', 'Responsible', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
+        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
                                   \n If the phase is over, the states is set to \'Done\'.'),
         'total_hours': fields.function(_compute, string='Total Hours'),
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 8d976517a34..94be9dbd109 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -140,7 +140,7 @@
                              </field>
                             <separator string="" colspan="4"/>
                             <group col="12" colspan="4">
-                                <field name="state" select="1"/>
+                                <field name="state" widget="statusbar" statusbar_visible=" draft, open, done" statusbar_colors="{'pending':'blue'}" select="1"/>
                                 <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                                 <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
                                 <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>

From 882392394d639080e54f56395003559a7c3e6d73 Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Thu, 15 Sep 2011 14:19:14 +0530
Subject: [PATCH 07/15] [IMP] ALL: Remove Space from attribute values

bzr revid: aag@tinyerp.com-20110915084914-kgbpw52ym5uz8ye0
---
 addons/account/account_invoice_view.xml             | 4 ++--
 addons/account/account_view.xml                     | 4 ++--
 addons/crm/crm_lead_view.xml                        | 4 ++--
 addons/crm/crm_phonecall_view.xml                   | 2 +-
 addons/hr_expense/hr_expense_view.xml               | 2 +-
 addons/hr_holidays/hr_holidays_view.xml             | 4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml       | 2 +-
 addons/mrp/mrp_view.xml                             | 2 +-
 addons/project/project_view.xml                     | 4 ++--
 addons/project_issue/project_issue_view.xml         | 2 +-
 addons/project_long_term/project_long_term_view.xml | 2 +-
 addons/purchase/purchase_view.xml                   | 2 +-
 addons/sale/sale_view.xml                           | 2 +-
 addons/stock/stock_view.xml                         | 2 +-
 14 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 6cb1af69fd0..a543d00fb5b 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -205,7 +205,7 @@
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="state" widget="statusbar" statusbar_visible=" draft, open, paid" statusbar_colors="{'proforma':'blue','proforma2':'blue'}"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors="{'proforma':'blue','proforma2':'blue'}"/>
                                 <field name="residual"/>
                                 <group col="6" colspan="4">
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
@@ -300,7 +300,7 @@
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="state" widget="statusbar" statusbar_visible=" draft, open, paid" statusbar_colors="{'proforma':'blue','proforma2':'blue'}"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors="{'proforma':'blue','proforma2':'blue'}"/>
                                 <field name="residual"/>
                                 <group col="8" colspan="4" groups="base.group_user">
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1aba125bc63..95a08cf6158 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -596,7 +596,7 @@
                         </page>
                     </notebook>
                     <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible=" draft, confirm"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                         <field name="balance_end"/>
                         <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                         <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
@@ -2642,7 +2642,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                         </group>
                     </group>
                     <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible=" draft, confirm" colspan="4"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm" colspan="4"/>
                         <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
                         <button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-dialog-close" type="object"/>
                         <button name="button_open" states="draft" string="Open CashBox" icon="gtk-go-forward" type="object"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 4bc0688cabd..897493496f0 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -120,7 +120,7 @@
                     <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible=" draft, open, done" statusbar_colors="{'pending':'blue'}"/>
+                        <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" />
@@ -516,7 +516,7 @@
 
                     <separator colspan="4"/>
                     <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible=" draft, open, done" statusbar_colors="{'pending':'blue'}"/>
+                        <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" />
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 48355a99af5..8d99464370e 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -107,7 +107,7 @@
                 <field name="description" nolabel="1" colspan="4" />
                 <separator colspan="4" />
                 <group col="8" colspan="4">
-                	<field name="state" widget="statusbar" statusbar_visible=" open, done" statusbar_colors="{'pending':'red'}" select="1"/>
+                	<field name="state" widget="statusbar" statusbar_visible="open,done" statusbar_colors="{'pending':'red'}" select="1"/>
                     <button name="case_cancel" string="Cancel"
                         states="open,pending" type="object"
                         icon="gtk-cancel" />
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 886750b11f6..e81a926774e 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -99,7 +99,7 @@
                                     </group>
                                 </form>
                             </field>
-                            <field name="state" widget="statusbar" statusbar_visible=" draft, confirm, accepted, invoiced" statusbar_colors="{'confirm':'blue','cancelled':'red'}"/>
+                            <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,invoiced" statusbar_colors="{'confirm':'blue','cancelled':'red'}"/>
                             <group col="6" colspan="2">
                                 <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_user"/>
                                 <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 552d48fa7c8..44d1cdaf296 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -83,7 +83,7 @@
                             <separator string="Reasons" colspan="4"/>
                             <field name="notes" nolabel="1" colspan="4"/>
                             <newline/>
-                            <field name="state" widget="statusbar" statusbar_visible=" draft, confirm, validate" statusbar_colors="{'confirm':'blue','validate1':'blue','refuse':'red'}" colspan="2"/>
+                            <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors="{'confirm':'blue','validate1':'blue','refuse':'red'}" colspan="2"/>
                             <group colspan="2" col="6">
                                 <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
@@ -125,7 +125,7 @@
                         <separator string="Reasons" colspan="4"/>
                         <field name="notes" nolabel="1" colspan="4"/>
                         <newline/>
-                        <field name="state" widget="statusbar" statusbar_visible=" draft, confirm, validate" statusbar_colors="{'confirm':'blue','validate1':'blue','refuse':'red'}" colspan="2"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors="{'confirm':'blue','validate1':'blue','refuse':'red'}" colspan="2"/>
                         <group colspan="2" col="6">
                             <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ce081cbd99c..4bcfa6b32b4 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -132,7 +132,7 @@
                         </group>
                         <separator colspan="4" string="Status"/>
                         <group col="8" colspan="4">
-                            <field name="state" widget="statusbar" statusbar_visible=" draft, open, done" statusbar_colors="{'pending':'blue'}"/>
+                            <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'blue'}"/>
                             <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <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"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 0e630677df6..b5296bbb322 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -700,7 +700,7 @@
                                </field>
                             <separator colspan="4"/>
                             <group col="9" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible=" draft, ready, in_production, done" statusbar_colors="{'picking_except':'red','confirmed':'blue'}"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors="{'picking_except':'red','confirmed':'blue'}"/>
                                 <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
                                 <button name="action_cancel" type="object" states="confirmed" string="Cancel" icon="gtk-stop"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 64db87bf21f..7f05d8c1738 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -45,7 +45,7 @@
                             <newline/>
                             <separator colspan="4"/>
                             <group col="9" colspan="8">
-                            	<field name="state" widget="statusbar" statusbar_visible=" open, close" statusbar_colors="{'pending':'blue'}" select="1" readonly="1"/>
+                            	<field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors="{'pending':'blue'}" select="1" readonly="1"/>
                                 <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
                                 <button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
@@ -257,7 +257,7 @@
                             </field>
                             <newline/>
                             <group col="11" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible=" draft, open, done" statusbar_colors="{'pending':'blue'}" select="1"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'blue'}" select="1"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                                 <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
                                 <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index f4b67716925..4cc29921aa2 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -83,7 +83,7 @@
                             <field name="description" nolabel="1" colspan="4"/>
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
-                            <field name="state" widget="statusbar" statusbar_visible=" draft, open, done" statusbar_colors="{'pending':'blue'}"/>
+                            <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"/>
                             <button name="case_open" string="Solve" states="draft,pending" type="object" icon="gtk-go-forward"/>
                             <button name="case_close" string="Close" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 94be9dbd109..df00ea6144f 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -140,7 +140,7 @@
                              </field>
                             <separator string="" colspan="4"/>
                             <group col="12" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible=" draft, open, done" statusbar_colors="{'pending':'blue'}" select="1"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'blue'}" select="1"/>
                                 <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                                 <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
                                 <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 414e87c37f1..a2ce738e647 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -194,7 +194,7 @@
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                             </group>
                             <group col="11" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible=" draft, approved, done" statusbar_colors="{'except_picking':'red','except_invoice':'red','confirmed':'blue','wait':'blue'}" readonly="1"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors="{'except_picking':'red','except_invoice':'red','confirmed':'blue','wait':'blue'}" readonly="1"/>
                                 <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 924d53b345d..a6b51a2a4b8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -177,7 +177,7 @@
                                 <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
                             </group>
                             <group col="13" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible=" draft, progress, done" statusbar_colors="{'shipping_except':'red','invoice_except':'red','waiting_date':'blue'}"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors="{'shipping_except':'red','invoice_except':'red','waiting_date':'blue'}"/>
                                 <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
                                 <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
                                 <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 575f0bd3156..e32a64f9cae 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1467,7 +1467,7 @@
                     </group>
 
                     <separator colspan="4"/>
-                    <field name="state" widget="statusbar" statusbar_visible=" draft, assigned, done" statusbar_colors="{'waiting':'blue','confirmed':'blue'}"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors="{'waiting':'blue','confirmed':'blue'}"/>
                     <group col="4" colspan="2">
                         <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
                         <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>

From 41bd7e15cce8d6a53f89e4dde41cf75b2ffed317 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 15 Sep 2011 15:58:47 +0530
Subject: [PATCH 08/15] [IMP]stock,purchase_requisition:statusbar Improvement
 is Done

bzr revid: mma@tinyerp.com-20110915102847-u0omsifqtn9dkk0g
---
 addons/purchase_requisition/purchase_requisition_view.xml | 4 ++--
 addons/stock/stock_view.xml                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index aa8b99c9ea9..f92264a176a 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -60,9 +60,9 @@
                         </field>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done"/>
+                        <field name="state" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors="{'in_progress':'Blue'}"/>
                         <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
-                        <button name="tender_in_progress" states="draft" string="Confirm" type="object" icon="gtk-apply" />
+                        <button name="tender_in_progress" states="draft" string="Start" type="object" icon="gtk-apply" />
                         <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
                         <button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
                     </group>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5531f86f84d..0ce4b6d31bd 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -990,7 +990,7 @@
                                 </form>
                             </field>
                             <group col="12" colspan="4">
-                                <field name="state" readonly="1"/>
+                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors="{'auto':'Blue', 'confirmed':'Blue'}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>

From 2663d7ca86411b451a5192a3711e0440c52bbe47 Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Thu, 15 Sep 2011 16:08:41 +0530
Subject: [PATCH 09/15] [IMP] Stock:Rename string of confirmed, waiting

bzr revid: aag@tinyerp.com-20110915103841-ad7hjx7mx6d74jdu
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f288b4246b5..69c8341405b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1545,7 +1545,7 @@ class stock_move(osv.osv):
         'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History (parent moves)'),
         'picking_id': fields.many2one('stock.picking', 'Reference', select=True,states={'done': [('readonly', True)]}),
         'note': fields.text('Notes'),
-        'state': fields.selection([('draft', 'New'), ('waiting', 'Waiting'), ('confirmed', 'Not Available'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
+        'state': fields.selection([('draft', 'New'), ('waiting', 'Waiting Another Move'), ('confirmed', 'Waiting Availability'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
               help='When the stock move is created it is in the \'Draft\' state.\n After that, it is set to \'Not Available\' state if the scheduler did not find the products.\n When products are reserved it is set to \'Available\'.\n When the picking is done the state is \'Done\'.\
               \nThe state is \'Waiting\' if the move is waiting for another one.'),
         'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),

From d47cacfc9f3eb67775be1f080f71021f9bf91c40 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 15 Sep 2011 16:47:40 +0530
Subject: [PATCH 10/15] [IMP]survey:remove a draft state and add a widget
 statusbar as per specification

bzr revid: mma@tinyerp.com-20110915111740-8x311rpkfw3ke113
---
 addons/survey/survey.py       |  8 ++------
 addons/survey/survey_view.xml | 10 ++++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index bd27f313d82..8cdc1ffb704 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -58,7 +58,7 @@ class survey(osv.osv):
                      help="Set to one if survey is answerable only once"),
         'response_user': fields.integer('Maximum Answer per User',
                      help="Set to one if  you require only one Answer per user"),
-        'state': fields.selection([('draft', 'Draft'), ('open', 'Open'), ('close', 'Closed'), ('cancel', 'Cancelled')], 'Status', readonly=True),
+        'state': fields.selection([('open', 'Open'), ('close', 'Closed'), ('cancel', 'Cancelled')], 'Status', readonly=True),
         'responsible_id': fields.many2one('res.users', 'Responsible', help="User responsible for survey"),
         'tot_start_survey': fields.integer("Total Started Survey", readonly=1),
         'tot_comp_survey': fields.integer("Total Completed Survey", readonly=1),
@@ -70,17 +70,13 @@ class survey(osv.osv):
         'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'),
     }
     _defaults = {
-        'state': lambda * a: "draft",
+        'state': lambda * a: "open",
         'tot_start_survey': lambda * a: 0,
         'tot_comp_survey': lambda * a: 0,
         'send_response': lambda * a: 1,
         'response_user': lambda * a:1,
     }
 
-    def survey_draft(self, cr, uid, ids, arg):
-        self.write(cr, uid, ids, {'state': 'draft'})
-        return True
-
     def survey_open(self, cr, uid, ids, arg):
         self.write(cr, uid, ids, {'state': 'open', 'date_open': strftime("%Y-%m-%d %H:%M:%S")})
         return True
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index fae6c89210a..b130227adf4 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -180,14 +180,12 @@
                                 </form>
                             </field>
                             <group col="9" colspan="4">
-                                <field name="state"/>
+                                <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                                 <button name="survey_cancel"
                                     string="Cancel" states="open" type="object" icon="gtk-cancel"/>
-                                <button name="survey_draft"
-                                    string="Set to draft" states="cancel,close" type="object"
-                                    icon="gtk-new"/>
-                                <button name="survey_open" string="Open"
-                                    states="draft" type="object" icon="gtk-go-forward"/>
+                                <button name="survey_open"
+                                    string="Open" states="cancel,close" type="object"
+                                    icon="gtk-go-forward"/>
                                 <button name="survey_close"
                                     string="Close" states="open" type="object" icon="gtk-close"/>
                             </group>

From 3846b99e01c9318ab13204b881f712745811999d Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 15 Sep 2011 19:00:52 +0530
Subject: [PATCH 11/15] [IMP]stock:statusbar Improvement is Done as per
 suggestion

bzr revid: mma@tinyerp.com-20110915133052-di9iknwgnromr4s4
---
 addons/account_voucher/account_voucher_view.xml           | 2 +-
 addons/account_voucher/voucher_payment_receipt_view.xml   | 4 ++--
 addons/account_voucher/voucher_sales_purchase_view.xml    | 4 ++--
 addons/crm_claim/crm_claim_view.xml                       | 2 +-
 addons/crm_fundraising/crm_fundraising_view.xml           | 2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml                 | 2 +-
 addons/hr_evaluation/hr_evaluation_view.xml               | 2 +-
 addons/purchase_requisition/purchase_requisition_view.xml | 2 +-
 addons/stock/stock_view.xml                               | 6 +++---
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 567790e6eee..877415dd2de 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -102,7 +102,7 @@
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'Blue'}"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'blue'}"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
                         <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index a9040350046..204db6d0696 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -280,7 +280,7 @@
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'Blue'}"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'blue'}"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
                         <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile this record ?"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
@@ -455,7 +455,7 @@
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'Blue'}"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'blue'}"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
                         <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index de7da7307d9..20192030b66 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -148,7 +148,7 @@
                         </page>
                     </notebook>
                     <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'Blue'}"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'blue'}"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
@@ -268,7 +268,7 @@
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'Blue'}"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'blue'}"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <group attrs="{'invisible':[('state','!=','posted')]}">
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 012a42a83ee..c24b54cb0db 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -106,7 +106,7 @@
                                 <field name="description" colspan="4" nolabel="1"/>
                                 <separator colspan="4" string=""/>
                                 <group col="8" colspan="4">
-                                    <field name="state" select="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'Blue'}"/>
+                                    <field name="state" select="1" 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" />
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 65fb982fa11..3605ff8453c 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -110,7 +110,7 @@
                                 <field name="description" nolabel="1" colspan="4"/>
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'Blue'}"/>
+                                <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" />
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 6ab783d06ba..158f6aab343 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -69,7 +69,7 @@
                             <field name="description" colspan="4" nolabel="1" />
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
-                                <field name="state" select="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'Blue'}"/>
+                                <field name="state" select="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'blue'}"/>
                                 <button name="case_cancel"
                                     states="draft,open,pending" string="Cancel"
                                     type="object" icon="gtk-cancel" />
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 6d6333c8654..78aa1de8ada 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -201,7 +201,7 @@
                     </notebook>
                     <newline/>
                     <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,wait,progress,done" statusbar_colors="{'progress':'Blue'}"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors="{'progress':'blue'}"/>
                         <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
                                 icon="gtk-cancel"/>
                         <button name="button_plan_in_progress" string="Start Evaluation" states="draft" type="object"
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index f92264a176a..127083b74ca 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -60,7 +60,7 @@
                         </field>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors="{'in_progress':'Blue'}"/>
+                        <field name="state" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors="{'in_progress':'blue'}"/>
                         <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
                         <button name="tender_in_progress" states="draft" string="Start" type="object" icon="gtk-apply" />
                         <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 0ce4b6d31bd..8df88e4e5f3 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -798,7 +798,7 @@
                                 </form>
                             </field>
                             <group col="10" colspan="4">
-                                <field name="state" readonly="1"/>
+                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors="{'auto':'blue', 'confirmed':'blue'}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
@@ -990,7 +990,7 @@
                                 </form>
                             </field>
                             <group col="12" colspan="4">
-                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors="{'auto':'Blue', 'confirmed':'Blue'}"/>
+                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors="{'auto':'blue', 'confirmed':'blue'}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
@@ -1210,7 +1210,7 @@
                                 </form>
                             </field>
                             <group col="10" colspan="4">
-                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors="{'auto':'Blue', 'confirmed':'Blue'}"/>
+                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors="{'auto':'blue', 'confirmed':'blue'}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>

From d84b6bcc2e89c6c120adb2cde212dec6079f5fa2 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 16 Sep 2011 15:22:44 +0530
Subject: [PATCH 12/15] [IMP]hr_timesheet_sheet:timesheet improvemant is done

bzr revid: mma@tinyerp.com-20110916095244-un9l8e3wc5fnm7az
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 9569149860c..28c0808a993 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -143,8 +143,8 @@
                         </page>
                     </notebook>
                     <group col="6" colspan="4">
-                        <field name="state"/>
-                        <button name="button_confirm" states="draft" string="Submit to Manager" type="object" icon="terp-check"/>
+                        <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
+                        <button name="button_confirm" states="draft" string="Submited to Manager" type="object" icon="terp-check"/>
                         <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                         <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_user"/>
                         <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_user"/>

From 0e0438a779927fd247b2581e8ca4e728a09ee7d7 Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Wed, 21 Sep 2011 10:39:48 +0530
Subject: [PATCH 13/15] [IMP] ALL:change in all statusbar_colors quotes

bzr revid: aag@tinyerp.com-20110921050948-m2iezimspmspsvjs
---
 addons/account/account_invoice_view.xml             | 4 ++--
 addons/crm/crm_lead_view.xml                        | 4 ++--
 addons/crm/crm_phonecall_view.xml                   | 2 +-
 addons/hr_expense/hr_expense_view.xml               | 2 +-
 addons/hr_holidays/hr_holidays_view.xml             | 4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml       | 2 +-
 addons/mrp/mrp_view.xml                             | 2 +-
 addons/project/project_view.xml                     | 4 ++--
 addons/project_issue/project_issue_view.xml         | 2 +-
 addons/project_long_term/project_long_term_view.xml | 2 +-
 addons/purchase/purchase_view.xml                   | 2 +-
 addons/sale/sale_view.xml                           | 2 +-
 addons/stock/stock_view.xml                         | 2 +-
 13 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index a543d00fb5b..d440f2efc90 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -205,7 +205,7 @@
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors="{'proforma':'blue','proforma2':'blue'}"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                 <field name="residual"/>
                                 <group col="6" colspan="4">
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
@@ -300,7 +300,7 @@
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors="{'proforma':'blue','proforma2':'blue'}"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                 <field name="residual"/>
                                 <group col="8" colspan="4" groups="base.group_user">
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 897493496f0..67a54f85751 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -120,7 +120,7 @@
                     <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'blue'}"/>
+                        <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" />
@@ -516,7 +516,7 @@
 
                     <separator colspan="4"/>
                     <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'blue'}"/>
+                        <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" />
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 8d99464370e..6917088a052 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -107,7 +107,7 @@
                 <field name="description" nolabel="1" colspan="4" />
                 <separator colspan="4" />
                 <group col="8" colspan="4">
-                	<field name="state" widget="statusbar" statusbar_visible="open,done" statusbar_colors="{'pending':'red'}" select="1"/>
+                	<field name="state" widget="statusbar" statusbar_visible="open,done" statusbar_colors='{"pending":"red"}' select="1"/>
                     <button name="case_cancel" string="Cancel"
                         states="open,pending" type="object"
                         icon="gtk-cancel" />
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index e81a926774e..fa22d100282 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -99,7 +99,7 @@
                                     </group>
                                 </form>
                             </field>
-                            <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,invoiced" statusbar_colors="{'confirm':'blue','cancelled':'red'}"/>
+                            <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,invoiced" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                             <group col="6" colspan="2">
                                 <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_user"/>
                                 <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 44d1cdaf296..988642cd25d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -83,7 +83,7 @@
                             <separator string="Reasons" colspan="4"/>
                             <field name="notes" nolabel="1" colspan="4"/>
                             <newline/>
-                            <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors="{'confirm':'blue','validate1':'blue','refuse':'red'}" colspan="2"/>
+                            <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}' colspan="2"/>
                             <group colspan="2" col="6">
                                 <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
@@ -125,7 +125,7 @@
                         <separator string="Reasons" colspan="4"/>
                         <field name="notes" nolabel="1" colspan="4"/>
                         <newline/>
-                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors="{'confirm':'blue','validate1':'blue','refuse':'red'}" colspan="2"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}' colspan="2"/>
                         <group colspan="2" col="6">
                             <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 4bcfa6b32b4..0477bd1e370 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -132,7 +132,7 @@
                         </group>
                         <separator colspan="4" string="Status"/>
                         <group col="8" colspan="4">
-                            <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'blue'}"/>
+                            <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                             <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <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"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index b5296bbb322..3053b8de448 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -700,7 +700,7 @@
                                </field>
                             <separator colspan="4"/>
                             <group col="9" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors="{'picking_except':'red','confirmed':'blue'}"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
                                 <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
                                 <button name="action_cancel" type="object" states="confirmed" string="Cancel" icon="gtk-stop"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7f05d8c1738..85cacf491d3 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -45,7 +45,7 @@
                             <newline/>
                             <separator colspan="4"/>
                             <group col="9" colspan="8">
-                            	<field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors="{'pending':'blue'}" select="1" readonly="1"/>
+                            	<field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
                                 <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
                                 <button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
@@ -257,7 +257,7 @@
                             </field>
                             <newline/>
                             <group col="11" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'blue'}" select="1"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                                 <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
                                 <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 4cc29921aa2..6f213ec61e2 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -83,7 +83,7 @@
                             <field name="description" nolabel="1" colspan="4"/>
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
-                            <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'blue'}"/>
+                            <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"/>
                             <button name="case_open" string="Solve" states="draft,pending" type="object" icon="gtk-go-forward"/>
                             <button name="case_close" string="Close" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index df00ea6144f..a05465f81d8 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -140,7 +140,7 @@
                              </field>
                             <separator string="" colspan="4"/>
                             <group col="12" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'blue'}" select="1"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
                                 <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                                 <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
                                 <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index a2ce738e647..8887119e1e2 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -194,7 +194,7 @@
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                             </group>
                             <group col="11" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors="{'except_picking':'red','except_invoice':'red','confirmed':'blue','wait':'blue'}" readonly="1"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
                                 <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index a6b51a2a4b8..48be64ae7f8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -177,7 +177,7 @@
                                 <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
                             </group>
                             <group col="13" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors="{'shipping_except':'red','invoice_except':'red','waiting_date':'blue'}"/>
+                                <field name="state" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                                 <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
                                 <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
                                 <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e32a64f9cae..d7ce04919e0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1467,7 +1467,7 @@
                     </group>
 
                     <separator colspan="4"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors="{'waiting':'blue','confirmed':'blue'}"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                     <group col="4" colspan="2">
                         <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
                         <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>

From 1be371c8512f9a8b8cc62a486bcc341de1fb213d Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 21 Sep 2011 10:47:20 +0530
Subject: [PATCH 14/15] 
 [IMP]account_voucher,crm_claim,crm_fundraising,marketing_campaign,stock,purchase_requisition:removed
 a quote from statusbar_colour as per suggestion

bzr revid: mma@tinyerp.com-20110921051720-ag458lyz42o64bhb
---
 addons/account_voucher/account_voucher_view.xml           | 2 +-
 addons/account_voucher/voucher_payment_receipt_view.xml   | 4 ++--
 addons/account_voucher/voucher_sales_purchase_view.xml    | 4 ++--
 addons/crm_claim/crm_claim_view.xml                       | 2 +-
 addons/crm_fundraising/crm_fundraising_view.xml           | 2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml                 | 2 +-
 addons/hr_evaluation/hr_evaluation_view.xml               | 2 +-
 addons/marketing_campaign/marketing_campaign_view.xml     | 2 +-
 addons/purchase_requisition/purchase_requisition_view.xml | 2 +-
 addons/stock/stock_view.xml                               | 6 +++---
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 877415dd2de..acb83471ac7 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -102,7 +102,7 @@
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'blue'}"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
                         <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 204db6d0696..a9d222c4318 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -280,7 +280,7 @@
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'blue'}"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
                         <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile this record ?"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
@@ -455,7 +455,7 @@
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'blue'}"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
                         <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 20192030b66..8f1dccadadc 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -148,7 +148,7 @@
                         </page>
                     </notebook>
                     <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'blue'}"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
@@ -268,7 +268,7 @@
                         </page>
                     </notebook>
                     <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'blue'}"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue'}'/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <group attrs="{'invisible':[('state','!=','posted')]}">
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index c24b54cb0db..b23478a07c5 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -106,7 +106,7 @@
                                 <field name="description" colspan="4" nolabel="1"/>
                                 <separator colspan="4" string=""/>
                                 <group col="8" colspan="4">
-                                    <field name="state" select="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'blue'}"/>
+                                    <field name="state" select="1" 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" />
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 3605ff8453c..b6db384d077 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -110,7 +110,7 @@
                                 <field name="description" nolabel="1" colspan="4"/>
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'blue'}"/>
+                                <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" />
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 158f6aab343..47acacdff09 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -69,7 +69,7 @@
                             <field name="description" colspan="4" nolabel="1" />
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
-                                <field name="state" select="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'blue'}"/>
+                                <field name="state" select="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                                 <button name="case_cancel"
                                     states="draft,open,pending" string="Cancel"
                                     type="object" icon="gtk-cancel" />
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 78aa1de8ada..7eb04a56d46 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -201,7 +201,7 @@
                     </notebook>
                     <newline/>
                     <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors="{'progress':'blue'}"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
                         <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
                                 icon="gtk-cancel"/>
                         <button name="button_plan_in_progress" string="Start Evaluation" states="draft" type="object"
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 109cd8648d4..c1028e3f3e1 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -382,7 +382,7 @@
                 </group>
                 <separator string="" colspan="4"/>
                 <group colspan="4" col="11">
-                    <field name="state" readonly="True" widget="statusbar" statusbar_visible="todo,done" statusbar_colors="{'exception':'red'}"/>
+                    <field name="state" readonly="True" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
                     <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="terp-gtk-stop"/>
                     <button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-undo"/>
                     <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 127083b74ca..facb9a1b7b4 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -60,7 +60,7 @@
                         </field>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors="{'in_progress':'blue'}"/>
+                        <field name="state" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
                         <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
                         <button name="tender_in_progress" states="draft" string="Start" type="object" icon="gtk-apply" />
                         <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8df88e4e5f3..0452a925808 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -798,7 +798,7 @@
                                 </form>
                             </field>
                             <group col="10" colspan="4">
-                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors="{'auto':'blue', 'confirmed':'blue'}"/>
+                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
@@ -990,7 +990,7 @@
                                 </form>
                             </field>
                             <group col="12" colspan="4">
-                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors="{'auto':'blue', 'confirmed':'blue'}"/>
+                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
@@ -1210,7 +1210,7 @@
                                 </form>
                             </field>
                             <group col="10" colspan="4">
-                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors="{'auto':'blue', 'confirmed':'blue'}"/>
+                                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>