diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index a92e223cadc..aca58156c0c 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -114,7 +114,7 @@
             <field name="model">account.invoice</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state=='draft'" string="Invoice">
+                <tree colors="blue:state in ('draft');black:state not in ('draft')" string="Invoice">
                     <field name="name"/>
                     <field name="type"/>
                     <field name="number"/>
@@ -407,20 +407,20 @@
             <field name="context">{'type':'out_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
-        
+
         <record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="act_window_id" ref="action_invoice_tree3"/>
         </record>
-        
+
         <record id="action_invoice_tree3_view2" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">form</field>
             <field name="view_id" ref="invoice_form"/>
             <field name="act_window_id" ref="action_invoice_tree3"/>
         </record>
-        
+
         <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="account.menu_finance_invoice"/>
 
         <record id="action_invoice_tree4" model="ir.actions.act_window">
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index dec57719c86..c3df794dc1b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -162,7 +162,7 @@
             <field name="type">tree</field>
             <field name="field_parent">child_id</field>
             <field name="arch" type="xml">
-                <tree string="Chart of accounts" toolbar="1" colors="blue:type=='view'">
+                <tree string="Chart of accounts" toolbar="1" colors="blue:type in ('view');black:type not in ('view')">
                     <field name="code"/>
                     <field name="name"/>
                     <field name="debit"/>
@@ -301,7 +301,7 @@
             <field name="model">account.bank.statement</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end)" string="Statement">
+                <tree colors="red:balance_end_real!=balance_end and state=='draft';blue:state=='draft' and (balance_end_real==balance_end);black:state=='confirm'" string="Statement">
                     <field name="date"/>
                     <field name="name"/>
                     <field name="journal_id"/>
@@ -790,7 +790,7 @@
                 </form>
             </field>
         </record>
-		
+
 		<record id="view_account_move_line_filter" model="ir.ui.view">
             <field name="name">Entry Lines</field>
             <field name="model">account.move.line</field>
@@ -1511,7 +1511,7 @@
 
 
         <!-- Account Templates -->
-        <menuitem 
+        <menuitem
             id="account_template_folder"
             name="Templates"
             parent="account.menu_finance_accounting"
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index afabde4bbc2..3cdd2b3187a 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -8,7 +8,7 @@
             <field name="type">tree</field>
             <field eval="8" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="red:date and (date&lt;=current_date)" string="Analytic account">
+                <tree colors="red:(date&lt;=current_date);black:(date&gt;current_date)" string="Analytic account">
                     <field name="code"/>
                     <field name="complete_name"/>
                     <field name="quantity"/>
@@ -43,7 +43,7 @@
             <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree toolbar="True" colors="red:date and (date&lt;=current_date)" string="Analytic account">
+                <tree toolbar="True" colors="red:(date&lt;=current_date);black:(date&gt;current_date)" string="Analytic account">
                     <field name="name"/>
                     <field name="code"/>
                     <field name="date"/>
diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml
index bf45eb7067b..34253d9c4ae 100644
--- a/addons/board_project/board_project_view.xml
+++ b/addons/board_project/board_project_view.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <record id="note_project_manager_type" model="board.note.type">
             <field name="name">Project</field>
         </record>
-        
+
         <record id="view_task_tree" model="ir.ui.view">
             <field name="name">project.task.tree</field>
             <field name="model">project.task</field>
             <field name="type">tree</field>
             <field eval="99" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="red:date_deadline&lt;current_date;blue:date_deadline==current_date" string="My Tasks">
+                <tree colors="red:date_deadline&lt;current_date;blue:date_deadline==current_date;black:date_deadline&gt;current_date" string="My Tasks">
                     <field name="name"/>
                     <field name="project_id"/>
                     <field name="date_deadline"/>
@@ -38,7 +38,7 @@
             <field name="domain">[('user_id','=',uid),('state','=','open'),('date_deadline','&lt;&gt;',False)]</field>
             <field name="view_id" ref="view_task_tree"/>
         </record>
-        
+
         <record id="action_view_board_note_tree" model="ir.actions.act_window">
             <field name="name">Public Notes</field>
             <field name="res_model">board.note</field>
@@ -46,7 +46,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('type','=','Project')]</field>
         </record>
-        
+
         <record id="board_project_form" model="ir.ui.view">
             <field name="name">board.project.form</field>
             <field name="model">board.board</field>
@@ -67,7 +67,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="open_board_project" model="ir.actions.act_window">
             <field name="name">Project Dashboard</field>
             <field name="res_model">board.board</field>
@@ -82,10 +82,10 @@
             name="Project"
             parent="board.dashboard_menu"/>
         <menuitem
-            action="open_board_project" 
-            icon="terp-graph" 
-            id="menu_board_project" 
-            parent="next_id_86" 
+            action="open_board_project"
+            icon="terp-graph"
+            id="menu_board_project"
+            parent="next_id_86"
             sequence="1"/>
     </data>
 </openerp>
diff --git a/addons/crm/crm_bugs_view.xml b/addons/crm/crm_bugs_view.xml
index 39ff98deb3b..3038d5125ba 100755
--- a/addons/crm/crm_bugs_view.xml
+++ b/addons/crm/crm_bugs_view.xml
@@ -37,7 +37,7 @@
                     <group colspan="2">
                         <field name="case_id" select="1"/>
                         <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
-                    </group>    
+                    </group>
                     <newline/>
                     <separator string= "Description" colspan="4"/>
                     <field name="description" nolabel="1" colspan="4"/>
@@ -117,7 +117,7 @@
                            </tree>
                        </field>
                        <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
-                 </page>                
+                 </page>
                 </notebook>
             </form>
         </field>
@@ -127,7 +127,7 @@
         <field name="model">crm.case</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Bugs Tree"  colors="red:state=='open'">
+            <tree string="Bugs Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id"/>
                 <field name="name" string="Title"/>
                 <field name="partner_id"/>
@@ -142,7 +142,7 @@
                 <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                 <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"/>
-                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>                
+                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
             </tree>
         </field>
     </record>
@@ -194,7 +194,7 @@
             </search>
          </field>
     </record>
-    
+
     <record id="view_crm_case_feature_request_filter" model="ir.ui.view">
         <field name="name">crm.case.feature.request.select</field>
         <field name="model">crm.case</field>
@@ -214,8 +214,8 @@
                </group>
            </search>
         </field>
-     </record>        
-    
+     </record>
+
      <record model="ir.ui.view" id="crm_case_calendar_view">
         <field name="name">CRM - Bug Tracker Calendar</field>
         <field name="model">crm.case</field>
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 9bb8647d60d..d9ad9872a1c 100755
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    # ------------------------------------------------------ 
+    # ------------------------------------------------------
     # Claims
-    # ------------------------------------------------------ 
+    # ------------------------------------------------------
 
     <record model="ir.ui.view" id="crm_case_claims_tree_view">
         <field name="name">CRM - Claims Tree</field>
         <field name="model">crm.case</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Claims"  colors="red:state=='open'">
+            <tree string="Claims"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id"/>
                 <field name="name"/>
                 <field name="partner_id"/>
@@ -44,7 +44,7 @@
                     <group colspan="2">
                         <field name="case_id" select="1"/>
                         <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
-                    </group>                       
+                    </group>
                 </group>
                 <notebook>
                 <page string="Claims Info">
@@ -63,7 +63,7 @@
                     <field name="description" colspan="4" nolabel="1"/>
                     <separator colspan="4" string="Status"/>
                     <group col="8" colspan="4">
-                        <field name="state" select="1"/> 
+                        <field name="state" select="1"/>
                         <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
                         <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
                         <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
@@ -75,7 +75,7 @@
                     <field name="id" select="1"/>
                     <field name="active"/>
                     <field name="canal_id"/>
-                    <field name="som"/>                                        
+                    <field name="som"/>
                     <separator colspan="4" string="Dates"/>
                     <field name="create_date"/>
                     <field name="date_closed"/>
@@ -122,7 +122,7 @@
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>                            
+                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
                         </form>
                         <tree string="Communication history">
                             <field name="description"/>
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 7d1c0fac677..703a2c18440 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -2,15 +2,15 @@
 <openerp>
 <data>
 
-    # ------------------------------------------------------ 
+    # ------------------------------------------------------
     # Fund Raising
-    # ------------------------------------------------------ 
+    # ------------------------------------------------------
     <record model="ir.ui.view" id="crm_case_tree_view_fund">
         <field name="name">CRM - Funds Tree</field>
         <field name="model">crm.case</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Funds Tree"  colors="red:state=='open'">
+            <tree string="Funds Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id"/>
                 <field name="name" string="Funds"/>
                 <field name="categ_id"/>
@@ -24,7 +24,7 @@
                 <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
                 <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"/>
-                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>                
+                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
             </tree>
         </field>
     </record>
@@ -58,7 +58,7 @@
                         <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" select="2"/> 
+                        <field name="state" select="2"/>
                         <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-close"/>
                         <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
                         <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
@@ -73,7 +73,7 @@
                     <field name="priority" string="Priority"/>
                     <newline/>
                     <field name="canal_id"/>
-                    <field name="som"/>                    
+                    <field name="som"/>
                     <separator colspan="4" string="Dates"/>
                     <field name="create_date"/>
                     <field name="date_closed"/>
@@ -82,7 +82,7 @@
                     <separator colspan="4" string="References"/>
                     <field name="ref" colspan="4"/>
                     <field name="ref2" colspan="4"/>
-                
+
                     <field name="log_ids" nolabel="1" colspan="4">
                         <form string="Actions">
                             <separator string="Action Information" colspan="4"/>
@@ -111,7 +111,7 @@
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>                            
+                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
                         </form>
                         <tree string="Communication history">
                             <field name="description"/>
@@ -149,7 +149,7 @@
             </graph>
         </field>
     </record>
-    
+
     <record id="view_crm_case_fund_filter" model="ir.ui.view">
             <field name="name">crm.case.fund.select</field>
             <field name="model">crm.case</field>
@@ -173,6 +173,6 @@
                </search>
             </field>
         </record>
-        
+
 </data>
 </openerp>
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 99a6e1d4cd1..aab721b8324 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -2,9 +2,9 @@
 <openerp>
 <data>
 
-    # ------------------------------------------------------ 
+    # ------------------------------------------------------
     # Helpdesk Support
-    # ------------------------------------------------------ 
+    # ------------------------------------------------------
 
     <record model="ir.ui.view" id="crm_case_form_view_helpdesk">
         <field name="name">CRM - Helpdesk Support Form</field>
@@ -21,7 +21,7 @@
                     <group colspan="2">
                         <field name="case_id" select="1"/>
                         <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
-                    </group>                    
+                    </group>
                 </group>
                 <notebook colspan="4">
                     <page string="General">
@@ -115,7 +115,7 @@
                            </tree>
                        </field>
                        <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
-                    </page>                        
+                    </page>
                 </notebook>
             </form>
         </field>
@@ -125,9 +125,9 @@
         <field name="model">crm.case</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Helpdesk Support Tree"  colors="red:state=='open'">
+            <tree string="Helpdesk Support Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id"/>
-                <field name="name" string="Support Query"/>                
+                <field name="name" string="Support Query"/>
                 <field name="partner_id" string="Partner"/>
                 <field name="planned_revenue"/>
                 <field name="probability"/>
@@ -139,11 +139,11 @@
                 <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
                 <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"/>
-                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>                
+                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
             </tree>
         </field>
-    </record>   
-    
+    </record>
+
     <record model="ir.ui.view" id="crm_case_helpdesk_calendar_view">
         <field name="name">CRM - Helpdesk Support Calendar</field>
         <field name="model">crm.case</field>
@@ -156,6 +156,6 @@
                 <field name="categ_id"/>
             </calendar>
         </field>
-    </record> 
+    </record>
 </data>
 </openerp>
diff --git a/addons/crm/crm_jobs_view.xml b/addons/crm/crm_jobs_view.xml
index db1452c3cef..561ce64f57b 100755
--- a/addons/crm/crm_jobs_view.xml
+++ b/addons/crm/crm_jobs_view.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    # ------------------------------------------------------ 
+    # ------------------------------------------------------
     # Jobs
-    # ------------------------------------------------------ 
+    # ------------------------------------------------------
 
     <record model="ir.ui.view" id="crm_case_tree_view_job">
         <field name="name">CRM - Jobs Requests Tree</field>
         <field name="model">crm.case</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Jobs - Recruitment Tree"  colors="red:state=='open'">
+            <tree string="Jobs - Recruitment Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id"/>
                 <field name="name" string="Description"/>
                 <field name="partner_name" string="Name"/>
@@ -25,7 +25,7 @@
                 <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
                 <button name="case_cancel" string="Candidate Refused" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                 <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>                
+                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
             </tree>
         </field>
     </record>
@@ -78,7 +78,7 @@
 
                         <separator colspan="4" string="Status"/>
                         <group col="8" colspan="4">
-                            <field name="state" select="1"/> 
+                            <field name="state" select="1"/>
                             <button name="case_close" string="Candidate Hired" states="open,draft,pending" type="object" icon="terp-partner"/>
                             <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
                             <button name="case_cancel" string="Candidate Refused" states="draft,open,pending" type="object" icon="gtk-cancel"/>
@@ -101,7 +101,7 @@
                        <separator colspan="4" string="References"/>
                        <field name="ref" colspan="4"/>
                        <field name="ref2" colspan="4"/>
-                   
+
                        <field name="log_ids" nolabel="1" colspan="4">
                            <form string="Actions">
                                <separator string="Action Information" colspan="4"/>
@@ -139,7 +139,7 @@
                         </tree>
                     </field>
                     <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
-                 </page>                   
+                 </page>
                 </notebook>
             </form>
         </field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 73eea8158f8..ac90a5704a3 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -141,7 +141,7 @@
         <field name="model">crm.case</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Leads Tree"  colors="red:state=='open'">
+            <tree string="Leads Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id"/>
                 <field name="name" string="Lead Subject"/>
                 <field name="partner_phone"/>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index edca8639dbc..3a0c40d2bba 100755
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    # ------------------------------------------------------ 
+    # ------------------------------------------------------
     # Meetings
-    # ------------------------------------------------------ 
+    # ------------------------------------------------------
 
     <record model="ir.ui.view" id="crm_case_form_view_meet">
         <field name="name">CRM - Meetings Form</field>
@@ -22,7 +22,7 @@
                         <field name="case_id" on_change="onchange_case_id(case_id, name, partner_id)"/>
                         <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
                     </group>
-                    
+
                 </group>
                 <notebook colspan="4">
 	                <page string="Meeting">
@@ -36,12 +36,12 @@
 	                    <field name="description" nolabel="1" colspan="4"/>
 	                    <separator colspan="4"/>
 	                    <group col="8" colspan="4">
-	                        <field name="state" select="2"/> 
+	                        <field name="state" select="2"/>
 	                        <button name="case_open" string="Confirm Meeting" states="draft,cancel,pending" type="object" icon="terp-crm"/>
 	                        <button name="case_cancel" string="Cancel Meeting" states="draft,open,pending" type="object" icon="gtk-cancel"/>
 	                        <button name="case_reset" string="Reset to Unconfirmed" states="done,open,cancel" type="object" icon="gtk-convert"/>
 	                    </group>
-	                </page>	               	                             
+	                </page>
                 </notebook>
             </form>
         </field>
@@ -51,7 +51,7 @@
         <field name="model">crm.case</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Meetings Tree"  colors="red:state=='open'">
+            <tree string="Meetings Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id"/>
                 <field name="name" string="Title"/>
                 <field name="date" string="Next Meeting"/>
@@ -63,7 +63,7 @@
                 <field name="state"/>
                 <button name="case_open" string="Confirm Meeting" states="draft,cancel,pending" type="object" icon="terp-crm"/>
                 <button name="case_cancel" string="Cancel Meeting" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                <button name="case_reset" string="Reset to Unconfirmed" states="done,open,cancel" type="object" icon="gtk-convert"/>                
+                <button name="case_reset" string="Reset to Unconfirmed" states="done,open,cancel" type="object" icon="gtk-convert"/>
             </tree>
         </field>
     </record>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index ee4c4feb36b..f217005ff70 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -2,11 +2,11 @@
 <openerp>
 <data>
 
-    # ------------------------------------------------------ 
+    # ------------------------------------------------------
     # Opportunities
-    # ------------------------------------------------------ 
+    # ------------------------------------------------------
+
 
-    
 
     <record model="ir.ui.view" id="crm_case_form_view_oppor">
         <field name="name">CRM - Opportunities Form</field>
@@ -19,7 +19,7 @@
                     <field name="section_id" colspan="1" widget="selection"/>
                     <field name="user_id" select="2" string="Responsible"/>
                     <button string="Schedule a Phone Call"
-                        name="%(wizard_crm_reschedule_phone_call)d" icon="gtk-redo" type="action" />                    
+                        name="%(wizard_crm_reschedule_phone_call)d" icon="gtk-redo" type="action" />
                         <newline/>
                         <label string="Sales Stage: " align="1.0"/>
                         <group colspan="1" col="2">
@@ -30,7 +30,7 @@
                     <group colspan="2">
                         <field name="case_id" select="1"/>
                         <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
-                    </group>                    
+                    </group>
                 </group>
                 <notebook colspan="4">
                 <page string="Description">
@@ -49,7 +49,7 @@
 
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" select="2"/> 
+                        <field name="state" select="2"/>
                         <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-close"/>
                         <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
                         <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
@@ -63,7 +63,7 @@
                     <field name="active"/>
                     <field name="canal_id"/>
                     <field name="som"/>
-                    
+
                     <separator colspan="4" string="Dates"/>
                     <field name="create_date"/>
                     <field name="date_closed"/>
@@ -72,7 +72,7 @@
                     <separator colspan="4" string="References"/>
                     <field name="ref" colspan="4"/>
                     <field name="ref2" colspan="4"/>
-                
+
                     <field name="log_ids" nolabel="1" colspan="4">
                         <form string="Actions">
                             <separator string="Action Information" colspan="4"/>
@@ -114,7 +114,7 @@
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>                            
+                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
                         </form>
                         <tree string="Communication history">
                             <field name="description"/>
@@ -133,7 +133,7 @@
         <field name="model">crm.case</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Opportunities Tree"  colors="red:state=='open'">
+            <tree string="Opportunities Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id"/>
                 <field name="name" string="Opportunities"/>
                 <field name="stage_id"  string="Sales Stage"/>
@@ -150,7 +150,7 @@
             </tree>
         </field>
     </record>
-    
+
     <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
         <field name="name">crm.case.opportunities.select</field>
         <field name="model">crm.case</field>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index f20a039c689..559936b4fec 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    # ------------------------------------------------------ 
+    # ------------------------------------------------------
     # Phone Calls
-    # ------------------------------------------------------ 
+    # ------------------------------------------------------
 
     <record model="ir.ui.view" id="crm_case_phone_tree_view">
         <field name="name">CRM - Phone Calls Tree</field>
         <field name="model">crm.case</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Phone Calls" colors="red:state=='open'">
+            <tree string="Phone Calls" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="date" string="Date"/>
-                <field name="name" string="Call Summary"/>                
+                <field name="name" string="Call Summary"/>
                 <field name="partner_id" string="Partner"/>
                 <field name="partner_address_id" string="Contact"/>
-                <field name="case_id"/>                
+                <field name="case_id"/>
                 <button string="Opportunity" name="%(wizard_crm_opportunity_set)d"  type="action"/>
                 <button string="Meeting"
                         name="%(wizard_crm_reschedule_phone_call)d"  type="action" />
                 <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
-                
+
             </tree>
         </field>
     </record>
@@ -30,17 +30,17 @@
         <field name="model">crm.case</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Phone Calls"  editable="bottom" colors="red:state=='open'">
+            <tree string="Phone Calls"  editable="bottom" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="date" string="Date"/>
-                <field name="name" string="Call Summary"/>                
+                <field name="name" string="Call Summary"/>
                 <field name="partner_id" string="Partner"/>
                 <field name="partner_address_id" string="Contact"/>
-                <field name="case_id"/>                
+                <field name="case_id"/>
                 <button string="Opportunity" name="%(wizard_crm_opportunity_set)d"  type="action"/>
                 <button string="Meeting"
                         name="%(wizard_crm_reschedule_phone_call)d"  type="action" />
                 <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
-                
+
             </tree>
         </field>
     </record>
@@ -54,13 +54,13 @@
                 <group colspan="4" col="7">
                     <field name="name" string="Subject"/>
                     <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="user_id" string="Assigned to" select="2"/> 
-                    <button string="Convert to Opportunity" name="%(wizard_crm_opportunity_set)d" icon="gtk-index" type="action"/>                   
+                    <field name="user_id" string="Assigned to" select="2"/>
+                    <button string="Convert to Opportunity" name="%(wizard_crm_opportunity_set)d" icon="gtk-index" type="action"/>
                     <newline/>
                     <field name="date" string="Planned Date"/>
                     <field name="duration"/>
                     <group colspan="2">
-                        <field name="case_id" on_change="onchange_case_id(case_id, name, partner_id)" 
+                        <field name="case_id" on_change="onchange_case_id(case_id, name, partner_id)"
                         context="{'default_name':name,'default_section_id':section_id,'default_user_id':user_id,'default_duration':duration,
                                'default_partner_id':partner_id,'default_partner_address_id':partner_address_id,'default_partner_phone':partner_phone,
                                'default_partner_mobile':partner_mobile,'default_categ_id':categ_id}"/>
@@ -76,11 +76,11 @@
                     <label string="Partner:" align="1.0"/>
                     <group colspan="1">
                         <field name="partner_id" string="Partner" nolabel="1"/>
-                        <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"/>                        
-                    </group>                        
-                    <field name="partner_address_id" string="Contact"/>                                     
+                        <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"/>
+                    </group>
+                    <field name="partner_address_id" string="Contact"/>
                     <field name="partner_phone"/>
-                    <field name="partner_mobile"/>                    
+                    <field name="partner_mobile"/>
                     <newline/>
                     <field name="som"/>
                     <field name="priority" string="Relevant"/>
@@ -88,14 +88,14 @@
                     <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" select="1"/> 
+                        <field name="state" select="1"/>
                         <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_pending" string="Not Held" states="open" type="object" icon="gtk-undo"/>
                         <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
                         <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
                     </group>
-                </page>                            
+                </page>
                </notebook>
            </form>
         </field>
@@ -114,7 +114,7 @@
             </calendar>
         </field>
     </record>
-        
+
     <record id="view_crm_case_phonecalls_filter" model="ir.ui.view">
         <field name="name">crm.case.phonecalls.select</field>
         <field name="model">crm.case</field>
@@ -158,7 +158,7 @@
            </search>
         </field>
     </record>
-    
-        
+
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index f0d1f0db869..6798ed51e59 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -238,7 +238,7 @@
             <field name="view_id" ref="crm_case_rule_tree-view"/>
         </record>
         <menuitem action="crm_case_rule-act" id="menu_crm_case_rule-act" parent="crm.next_id_51"/>
-		
+
        <record id="view_crm_email_add_cc_wizard" model="ir.ui.view">
             <field name="name">Add CC</field>
             <field name="model">crm.email.add.cc</field>
@@ -322,7 +322,7 @@
             <field name="model">crm.case</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:date_deadline&lt;current_date and state=='open'" string="Cases">
+                <tree colors="red:date_deadline&lt;current_date and state=='open';black:state in ('draft', 'cancel','done','pending')" string="Cases">
                     <field name="id"/>
                     <field name="section_id"/>
                     <field name="date"/>
@@ -529,7 +529,7 @@
                 </search>
         	</field>
     	</record>
-        
+
         <record id="crm_case_history-act" model="ir.actions.act_window">
             <field name="name">Histories</field>
             <field name="res_model">crm.case.history</field>
@@ -686,7 +686,7 @@
                 <tree string="Email Gateway">
                     <field name="name"/>
                     <field name="section_id" />
-                    <field name="server_id" />                    
+                    <field name="server_id" />
                 </tree>
             </field>
         </record>
@@ -696,7 +696,7 @@
             <field name="model">crm.email.gateway.server</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Email Gateway Server">                    
+                <form string="Email Gateway Server">
                     <field name="server_type" colspan="4" on_change="onchange_server_type(server_type,ssl)"/>
                     <field name="name"/>
                     <field name="port" />
@@ -718,7 +718,7 @@
                     <field name="name"/>
                     <field name="port" />
                     <field name="server_type"/>
-                    <field name="ssl" />            
+                    <field name="ssl" />
                 </tree>
             </field>
         </record>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 409c15ecd1e..e663f7b71ab 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -107,7 +107,7 @@
 			<field name="model">event.event</field>
 			<field name="type">tree</field>
 			<field name="arch" type="xml">
-				<tree string="Events" colors="red:register_min>register_current">
+				<tree string="Events" colors="red:register_min>register_current;black:register_min&lt;=register_current">
 					<field name="name" string="Name"/>
 					<field name="user_id"/>
 					<field name="date_begin"/>
@@ -117,7 +117,7 @@
 				</tree>
 			</field>
 		</record>
-		
+
 		<record model="ir.ui.view" id="view_event_search">
 			<field name="name">Events</field>
 			<field name="model">event.event</field>
@@ -148,8 +148,8 @@
            <field name="view_mode">tree,form</field>
            <field name="search_view_id" ref="view_event_search"/>
        </record>
-       
-       <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="menu_event_main" />	
+
+       <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="menu_event_main" />
 
 	<!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
@@ -222,7 +222,7 @@
 						<field name="ref2" colspan="4"/>
 					</page>
 					<page string="History">
-                        <field name="history_line" colspan="4" nolabel="1" mode="tree,form">                        
+                        <field name="history_line" colspan="4" nolabel="1" mode="tree,form">
                             <form string="Communication history">
 								<field name="date"/>
 								<field name="som"/>
@@ -299,7 +299,7 @@
 			name="Registrations"
 			id="menu_action_registration" parent="menu_event_main"
 			action="action_registration"/>
-		
+
 	<!-- report , event on registration... start -->
 		<record model="ir.ui.view" id="report_event_registration_tree">
 			<field name="name">report.event.registration.tree</field>
diff --git a/addons/event_project/event_view.xml b/addons/event_project/event_view.xml
index b4155119e72..fa316ee4399 100644
--- a/addons/event_project/event_view.xml
+++ b/addons/event_project/event_view.xml
@@ -27,7 +27,7 @@
 				<field name="register_prospect" position="after">
 					<separator string="Remaining Tasks" colspan="4"/>
 					<field name="task_ids" colspan="4" nolabel="1" widget="one2many_list" >
-						<tree string="All tasks" colors="red:date_deadline&lt;current_date and state=='draft';blue:date_deadline==current_date and state=='draft';grey:state=='cancel' or state=='close'">
+						<tree string="All tasks" colors="red:date_deadline&lt;current_date and state=='draft';blue:date_deadline==current_date and state=='draft';grey:state in ('cancel','done');black:state not in ('cancel','done')">
 							<field name="sequence"/>
 							<field name="name"/>
 							<field name="user_id" />
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index e0603037b03..8a0f032e4d7 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -18,7 +18,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="hr_timesheet_account_form" model="ir.ui.view">
             <field name="name">hr.timesheet.account.form</field>
             <field name="model">hr_timesheet_sheet.sheet.account</field>
@@ -32,7 +32,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="hr_timesheet_account_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.account.tree</field>
             <field name="model">hr_timesheet_sheet.sheet.account</field>
@@ -46,7 +46,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="hr_timesheet_day_form" model="ir.ui.view">
             <field name="name">hr.timesheet.day.form</field>
             <field name="model">hr_timesheet_sheet.sheet.day</field>
@@ -61,13 +61,13 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="hr_timesheet_day_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.day.tree</field>
             <field name="model">hr_timesheet_sheet.sheet.day</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:total_difference&lt;=0.1;blue:total_difference&gt;=0.1" string="Timesheet by Days">
+                <tree colors="red:total_difference&lt;0.1;blue:total_difference&gt;=0.1" string="Timesheet by Days">
                     <field name="sheet_id"/>
                     <field name="name"/>
                     <field name="total_timesheet" sum="Total Timesheet"/>
@@ -76,7 +76,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="hr_timesheet_sheet_form" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.form</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
@@ -98,7 +98,7 @@
                                 <button name="date_today" string="Today" type="object" icon="gtk-home"/>
                                 <button icon="gtk-media-next" name="date_next" string="" type="object"/>
                             </group>
-                            
+
                             <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1" groups="hr_attendance.group_hr_attendance">
                                 <tree string="Attendances">
                                     <field name="name"/>
@@ -110,7 +110,7 @@
                                 <button name="sign_in" string="Sign In" type="object" icon="gtk-go-back"/>
                                 <button name="sign_out" string="Sign Out" type="object" icon="gtk-go-forward"/>
                             </group>
-                            
+
                             <field name="state_attendance" groups="hr_attendance.group_hr_attendance"/>
                             <field name="total_attendance_day" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
                             <field colspan="4" context="date=date_current,user_id=user_id" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
@@ -146,7 +146,7 @@
                         </page>
                         <page string="By Day">
                             <field colspan="4" name="period_ids" nolabel="1">
-                                <tree colors="red:total_difference&lt;=0.1;blue:total_difference&gt;=0.1" string="Period">
+                                <tree colors="red:total_difference&lt;0.1;blue:total_difference&gt;=0.1" string="Period">
                                     <field name="name"/>
                                     <field name="total_attendance" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
                                     <field name="total_timesheet" widget="float_time"/>
@@ -191,23 +191,23 @@
                </search>
             </field>
         </record>
-        
+
         <record id="act_hr_timesheet_sheet_form" model="ir.actions.act_window">
             <field name="name">Timesheets</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr_timesheet_sheet.sheet</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
-            <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>            
+            <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
         <menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="next_id_60"
             groups="hr.group_hr_manager"/>
-        
+
         <!--
             Company inheritancy
         -->
-        
+
         <record id="hr_timesheet_sheet_company" model="ir.ui.view">
             <field name="name">res.company.sheet</field>
             <field name="model">res.company</field>
@@ -222,11 +222,11 @@
                 </page>
             </field>
         </record>
-        
+
         <!--
             hr.analytic.timesheet inheritancy
         -->
-        
+
         <record id="hr_timesheet_line_form" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.form</field>
             <field name="model">hr.analytic.timesheet</field>
@@ -241,7 +241,7 @@
         <!--
             hr.attendance inheritancy
         -->
-        
+
         <record id="view_attendance_form" model="ir.ui.view">
             <field name="name">hr.attendance.form</field>
             <field name="model">hr.attendance</field>
@@ -264,15 +264,15 @@
                 </field>
             </field>
         </record>
-        
+
         <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_day" name="Timesheet by Account" res_model="hr_timesheet_sheet.sheet.account" src_model="hr_timesheet_sheet.sheet"/>
         <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_account" name="Timesheet by Day" res_model="hr_timesheet_sheet.sheet.day" src_model="hr_timesheet_sheet.sheet"/>
-        
-        
+
+
         <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet" name="Timesheet Lines" res_model="hr.analytic.timesheet" src_model="hr_timesheet_sheet.sheet"/>
-        
+
         <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_2_hr_attendance" name="Attendances" res_model="hr.attendance" src_model="hr_timesheet_sheet.sheet"/>
-        
+
         <record id="hr_timesheet_sheet_tree_simplified" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.tree.simplified</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
@@ -289,6 +289,6 @@
                 </tree>
             </field>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index d73b5776653..e431edd9ae0 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -375,7 +375,7 @@
             <field name="model">mrp.production</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:date_planned&lt;current_date and state not in ('done','cancel')" string="Production orders">
+                <tree colors="red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date and state in ('done','cancel') " string="Production orders">
                     <field name="name"/>
                     <field name="product_id"/>
                     <field name="product_qty" sum="Total Qty"/>
@@ -567,7 +567,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
-        
+
         <record id="mrp_production_action3" model="ir.actions.act_window">
             <field name="name">Production Orders in Progress</field>
             <field name="type">ir.actions.act_window</field>
@@ -578,7 +578,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
-        
+
         <record id="mrp_production_action4" model="ir.actions.act_window">
             <field name="name">Production Orders Waiting Products</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 06b3d58faab..db167cfdd33 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -36,7 +36,7 @@
             <field name="type">tree</field>
             <field eval="7" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="red:virtual_available&lt;0;blue:state in ['draft', 'end', 'obsolete']" string="Products">
+            <tree colors="red:virtual_available&lt;0;blue:virtual_available&gt;=0 and state in ('draft', 'end', 'obsolete');black:virtual_available&gt;=0 and state not in ('draft', 'end', 'obsolete')" string="Products">
                     <field name="default_code"/>
                     <field name="name"/>
                     <field name="variants" groups="product.group_product_variant"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9bcf214aaaa..0279367c248 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -68,7 +68,8 @@
                         </page>
                         <page string="Tasks">
                            <field name="tasks" nolabel="1" attrs="{'readonly':[('state','in',['cancelled','done'])]}">
-                               <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0;red:bool(date_deadline) &amp; (date_deadline&lt;current_date) &amp; (state in ('draft','open'))" string="Tasks">
+                           <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0;red:bool(date_deadline) and (date_deadline&lt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
+                           <!--    <tree string="Tasks">-->
                                    <field name="sequence"/>
                                    <field name="name"/>
                                    <field name="user_id"/>
@@ -349,7 +350,7 @@
             <field name="type">tree</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0;red:bool(date_deadline) &amp; (date_deadline&lt;current_date) &amp; (state in ('draft','open'))" string="Tasks">
+                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0;red:bool(date_deadline) and (date_deadline&lt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
                     <field name="sequence" string="Seq."/>
                     <field name="name"/>
                     <field name="project_id" icon="gtk-indent"/>
@@ -372,7 +373,7 @@
             <field name="type">tree</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree editable="top" colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0;red:bool(date_deadline) &amp; (date_deadline&lt;current_date) &amp; (state in ('draft','open'))" string="Tasks">
+                <tree editable="top" colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0;red:bool(date_deadline) and (date_deadline&lt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
                     <field name="sequence" string="Seq."/>
                     <field name="name"/>
                     <field name="project_id" icon="gtk-indent"/>
@@ -395,7 +396,7 @@
             <field name="type">tree</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0;red:bool(date_deadline) &amp; (date_deadline&lt;current_date) &amp; (state in ('draft','open'))" string="Tasks">
+                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0;red:bool(date_deadline) and (date_deadline&lt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
                     <field name="sequence" string="Seq."/>
                     <field name="name"/>
                     <field name="project_id"/>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index b9e3a4cb87b..b3c8d695a5e 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -102,7 +102,7 @@
         <field name="type">tree</field>
         <field eval="2" name="priority"/>
         <field name="arch" type="xml">
-            <tree editable="top" colors="grey:state in ('done',);red:state=='cancelled'" string="Tasks">
+            <tree editable="top" colors="grey:state in ('done',);red:state in ('cancelled');black:state not in ('done','cancelled')" string="Tasks">
                 <field name="name"/>
                 <field name="user_id"/>
                 <field name="timebox_id" widget="selection"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 23609fb5d42..407dd8613dc 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -53,7 +53,7 @@
                             <field name="partner_ref" select="2"/>
                             <newline/>
                             <field colspan="4" name="order_line" nolabel="1" mode="tree,form">
-                                <tree colors="red:date_planned&lt;=current_date" string="Purchase Order Lines">
+                                <tree colors="red:date_planned&lt;=current_date;black:date_planned&gt;current_date" string="Purchase Order Lines">
                                     <field name="date_planned"/>
                                     <field name="name"/>
                                     <field name="product_id"/>
@@ -149,7 +149,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','approved')]</field>
-            <field name="search_view_id" ref="view_purchase_order_filter"/>            
+            <field name="search_view_id" ref="view_purchase_order_filter"/>
         </record>
 
         <record id="purchase_order_tree" model="ir.ui.view">
@@ -212,7 +212,7 @@
             <field name="model">purchase.order.line</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:date_planned&lt;=current_date" string="Purchase Order Lines">
+                <tree colors="red:date_planned&lt;=current_date;black:date_planned&gt;current_date" string="Purchase Order Lines">
                     <field name="name"/>
                     <field name="date_planned"/>
                     <field name="product_id"/>
diff --git a/addons/report_account/report_receivable_view.xml b/addons/report_account/report_receivable_view.xml
index 8d5d20a5e93..f0f67b477e3 100644
--- a/addons/report_account/report_receivable_view.xml
+++ b/addons/report_account/report_receivable_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <!-- Balance by account type -->
-        
+
         <record id="view_crm_case_user_graph" model="ir.ui.view">
             <field name="name">report.account.receivable.graph</field>
             <field name="model">report.account.receivable</field>
@@ -40,7 +40,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="action_account_receivable_graph" model="ir.actions.act_window">
             <field name="name">Balance by Type of Account</field>
             <field name="res_model">report.account.receivable</field>
@@ -48,9 +48,9 @@
             <field name="view_mode">tree,graph</field>
         </record>
         <menuitem action="action_account_receivable_graph" id="menu_account_receivable_graph" parent="account.menu_finance_reporting"/>
-        
+
         <!-- Report for Aged Receivable -->
-        
+
         <record id="view_aged_recv_graph" model="ir.ui.view">
             <field name="name">report.aged.receivable.graph</field>
             <field name="model">report.aged.receivable</field>
@@ -62,7 +62,7 @@
                 </graph>
             </field>
         </record>
-        
+
         <record id="view_aged_recv_tree" model="ir.ui.view">
             <field name="name">report.aged.receivable.tree</field>
             <field name="model">report.aged.receivable</field>
@@ -74,23 +74,23 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="action_aged_receivable_graph" model="ir.actions.act_window">
             <field name="name">Aged Receivable</field>
             <field name="res_model">report.aged.receivable</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
         </record>
-        
+
         <!-- Created Invoice for random activities of service dashboard -->
-        
+
         <record id="board_view_created_invoice" model="ir.ui.view">
             <field name="name">report.invoice.created.tree</field>
             <field name="model">report.invoice.created</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state=='draft'" string="Invoices">
-                	<field name="create_date" select="1"/>
+                <tree colors="blue:state in ('draft');black:state not in ('draft') " string="Invoices">
+                   	<field name="create_date" select="1"/>
                     <field name="name" select="1"/>
                     <field name="type"/>
                     <field name="number"/>
@@ -106,7 +106,7 @@
                 </tree>
             </field>
         </record>
-        
+
 	    <record id="action_view_created_invoice_dashboard" model="ir.actions.act_window">
 		    <field name="name">Invoices Created Within Past 15 Days</field>
 		    <field name="res_model">report.invoice.created</field>
@@ -114,7 +114,7 @@
 		    <field name="view_mode">tree,form</field>
 		    <field name="view_id" ref="board_view_created_invoice"/>
 	    </record>
-	    
+
 <!--	    <menuitem id="menu_report_this_month" name="This Month" parent="account.menu_finance_reporting"/>-->
 	    <menuitem id="menu_report_all_months" name="Sales by Account" parent="account.menu_finance_reporting"/>
 	    <!-- Report of the sales by product and account -->
@@ -134,19 +134,19 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_report_account_sales_graph" model="ir.ui.view">
              <field name="name">report.account.sales.graph</field>
              <field name="model">report.account.sales</field>
              <field name="type">graph</field>
              <field name="arch" type="xml">
-                 <graph string="Sales by Account" type="pie">                    
+                 <graph string="Sales by Account" type="pie">
                      <field name="account_id"/>
                      <field name="amount_total"/>
                  </graph>
              </field>
         </record>
-        
+
         <record id="view_report_account_sales_search" model="ir.ui.view">
             <field name="name">report.account.sales.search</field>
             <field name="model">report.account.sales</field>
@@ -161,16 +161,16 @@
                </search>
             </field>
         </record>
-        
+
         <record id="action_report_account_sales_tree_all" model="ir.actions.act_window">
             <field name="name">Sales by Account</field>
             <field name="res_model">report.account.sales</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
             <field name="search_view_id" ref="view_report_account_sales_search"/>
-        </record>        
+        </record>
         <menuitem action="action_report_account_sales_tree_all" id="menu_report_account_sales_all" parent="menu_report_all_months"/>
-        
+
         <!-- Report of the sales by product and account type -->
 	    <record id="view_report_account_type_sales_tree" model="ir.ui.view">
             <field name="name">report.account_type.sales.tree</field>
@@ -189,7 +189,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_report_account_type_sales_form" model="ir.ui.view">
             <field name="name">report.account_type.sales.form</field>
             <field name="model">report.account_type.sales</field>
@@ -202,13 +202,13 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_report_account_type_sales_graph" model="ir.ui.view">
              <field name="name">report.account_type.sales.graph</field>
              <field name="model">report.account_type.sales</field>
              <field name="type">graph</field>
              <field name="arch" type="xml">
-                 <graph string="Sales by Account" type="pie">                     
+                 <graph string="Sales by Account" type="pie">
                      <field name="user_type"/>
                      <field name="amount_total"/>
                  </graph>
@@ -236,7 +236,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
             <field name="search_view_id" ref="view_report_account_type_sales_search"/>
-        </record>        
+        </record>
         <menuitem action="action_report_account_type_sales_tree_all" id="menu_report_account_type_sales_all" parent="menu_report_all_months"/>
 
     </data>
diff --git a/addons/stock/report_stock_view.xml b/addons/stock/report_stock_view.xml
index 57b2608aa05..ba6cb865501 100644
--- a/addons/stock/report_stock_view.xml
+++ b/addons/stock/report_stock_view.xml
@@ -38,7 +38,7 @@
                 </tree>
             </field>
         </record>
-        
+
 
         <menuitem
             id="next_id_61"
@@ -81,7 +81,7 @@
             id="act_stock_production_lot_2_stock_report_prodlots"
             name="Stock" res_model="stock.report.prodlots"
             src_model="stock.production.lot"/>
-	
+
 		<act_window
             domain="[('tracking_id', '=', active_id)]"
             id="act_stock_tracking_lot_2_stock_report_tracklots"
@@ -121,15 +121,15 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        
+
         <menuitem parent="next_id_61" action="action_stock_line_date" id="menu_report_stock_line_date"/>
-        
+
         <record id="view_location_tree_3" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
             <field name="model">stock.location</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Stock Location" colors="blue:usage=='view';darkred:usage=='internal'">
+                <tree string="Stock Location" colors="blue:usage=='view';darkred:usage=='internal';black:usage not in ('view','internal')">
                     <field name="complete_name"/>
                     <field name="usage"/>
                     <field name="stock_real_value" />
@@ -137,7 +137,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="action_location_tree_3" model="ir.actions.act_window">
             <field name="name">Locations' Values</field>
             <field name="res_model">stock.location</field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 04e79821368..3f1e7eef33f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -139,7 +139,7 @@
             <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree color="grey:not active" string="Tracking Number">
+                <tree colors="grey:not active" string="Tracking Number">
                     <field name="name" select="1"/>
                     <field name="serial" select="1"/>
                     <field name="date" select="1"/>
@@ -228,7 +228,7 @@
             <field name="type">tree</field>
             <field name="field_parent">move_history_ids</field>
             <field name="arch" type="xml">
-                <tree color="grey:state=='cancel'" string="Moves">
+                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Moves">
                     <field name="product_id" select="1"/>
                     <field name="product_qty" select="1"/>
                     <field name="product_uom" select="1" string="UOM"/>
@@ -250,7 +250,7 @@
             <field name="type">tree</field>
             <field name="field_parent">move_history_ids2</field>
             <field name="arch" type="xml">
-                <tree color="grey:state=='cancel'" string="Moves">
+                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Moves">
                     <field name="product_id" select="1"/>
                     <field name="product_qty" select="1"/>
                     <field name="product_uom" select="1" string="UOM"/>
@@ -364,7 +364,7 @@
             <field name="model">stock.location</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Stock location" colors="blue:usage=='view';darkred:usage=='internal'">
+                <tree string="Stock location" colors="blue:usage=='view';darkred:usage=='internal';black:usage not in ('view','internal')">
                     <field name="complete_name"/>
                     <field name="usage"/>
                     <field name="stock_real" invisible="'product_id' not in context"/>
@@ -499,7 +499,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree color="red:state=='cancel'" string="Picking list">
+                <tree colors="red:state in ('cancel');black:state not in ('cancel')" string="Picking list">
                     <field name="name"/>
                     <field name="origin"/>
                     <field name="address_id" select="1"/>
@@ -589,8 +589,8 @@
                 </form>
             </field>
         </record>
-        
-        
+
+
         <record id="view_stock_picking_filter" model="ir.ui.view">
             <field name="name">stock.picking.list.select</field>
             <field name="model">stock.picking</field>
@@ -619,7 +619,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree color="red:state=='cancel'" string="Picking list">
+                <tree colors="red:state in ('cancel');black:state not in ('cancel')" string="Picking list">
                     <field name="name"/>
                     <field name="origin"/>
                     <field name="address_id" select="1"/>
@@ -761,7 +761,7 @@
             <field name="domain">[('state','=','assigned'),('type','=','delivery')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
         </record>
-		
+
         <menuitem action="action_picking_tree_delivery" groups="base.group_extended" id="menu_action_picking_tree_delivery" parent="menu_stock_root" sequence="20"/>
         <menuitem action="action_picking_calendar_delivery" id="menu_action_picking_calendar_delivery" parent="menu_action_picking_tree_delivery"/>
 
@@ -774,7 +774,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:state=='cancel';grey:state=='confirmed';blue:state=='done'" string="Picking list">
+                <tree colors="red:state in ('cancel');grey:state in ('confirmed');blue:state in ('done');black:state not in ('cancel','confirmed','done')" string="Picking list">
                     <field name="name"/>
                     <field name="origin"/>
                     <field name="address_id"/>
@@ -863,7 +863,7 @@
                 </form>
             </field>
         </record>
-		
+
 		<record id="view_picking_out_search" model="ir.ui.view">
             <field name="name">stock.picking.out.search</field>
             <field name="model">stock.picking</field>
@@ -881,7 +881,7 @@
                 </search>
             </field>
         </record>
-	
+
         <record id="action_picking_tree" model="ir.actions.act_window">
             <field name="name">Outgoing Products</field>
             <field name="res_model">stock.picking</field>
@@ -919,7 +919,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree color="red:state=='cancel'" string="Picking list">
+                <tree colors="red:state in ('cancel');black:state not in ('cancel')" string="Picking list">
                     <field name="name"/>
                     <field name="origin"/>
                     <field name="address_id"/>
@@ -1011,7 +1011,7 @@
                 </form>
             </field>
         </record>
-		
+
 		<record id="view_picking_in_search" model="ir.ui.view">
             <field name="name">stock.picking.in.search</field>
             <field name="model">stock.picking</field>
@@ -1105,7 +1105,7 @@
             <field name="type">tree</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <tree color="grey:state=='cancel'" string="Moves">
+                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Moves">
                     <field name="name"/>
                     <field name="product_id"/>
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -1164,7 +1164,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_move_search" model="ir.ui.view">
             <field name="name">stock.move.search</field>
             <field name="model">stock.move</field>
@@ -1183,7 +1183,7 @@
             	</search>
             </field>
         </record>
-        
+
         <record id="action_move_form2" model="ir.actions.act_window">
             <field name="name">Stock Moves</field>
             <field name="res_model">stock.move</field>
@@ -1208,7 +1208,7 @@
 	====================================
         Reception Picking (By Stock Move)
         ====================================
-        
+
 	<record id="view_move_tree_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.tree2</field>
             <field name="model">stock.move</field>
@@ -1216,8 +1216,8 @@
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancel','done');black:state not in ('cancel','done')" string="Moves">
-                    <field name="picking_id" string="Reference"/> 
-                    <field name="origin" string="Purchase Order"/>               	
+                    <field name="picking_id" string="Reference"/>
+                    <field name="origin" string="Purchase Order"/>
                     <field name="partner_id" string="Supplier"/>
                     <field name="product_id"/>
                     <field name="product_qty" />
@@ -1232,7 +1232,7 @@
                 </tree>
             </field>
         </record>
-	
+
 	<record id="view_move_form_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.form2</field>
             <field name="model">stock.move</field>
@@ -1240,7 +1240,7 @@
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Moves">
-                	<field name="picking_id"/>                    
+                	<field name="picking_id"/>
                 	<field name="product_id"/>
                 	<field name="product_qty" />
                     <field name="product_uom" string="UOM"/>
@@ -1250,7 +1250,7 @@
                 </form>
             </field>
         </record>
-	
+
 	<record id="view_move_search_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.search2</field>
             <field name="model">stock.move</field>
@@ -1263,9 +1263,9 @@
 	            		<filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
 	            		<filter icon="terp-stock" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
 	            		<separator orientation="vertical"/>
-                        <field name="origin" string="Purchase Order" select="1"/> 
+                        <field name="origin" string="Purchase Order" select="1"/>
 	            		<field name="partner_id" string="Supplier" select="1"/>
-	                    <field name="product_id"/>	                    
+	                    <field name="product_id"/>
                     </group>
             	</search>
             </field>
@@ -1282,7 +1282,7 @@
             <field name="search_view_id" ref="view_move_search_reception_picking"/>
         </record>
         <menuitem action="action_reception_picking_move" id="menu_action_reception_picking_move" parent="menu_stock_root"/>
-		
+
 
         # -------------------------------------------------------------
         # Stock incoterms