From 7111a3fe13b7dce43cab863a833a5108b8af77cf Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Mon, 27 Sep 2010 16:06:43 +0200
Subject: [PATCH 01/21] [FIX] default expression value may now contains single
 quotes (but not 3 consecutive ones)

bzr revid: jth@openerp.com-20100927140643-a2qm2mlsc0f42z94
---
 addons/email_template/email_template.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index f87c4bf750e..cbedc57d6e2 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -351,7 +351,7 @@ This is useful for CRM leads for example"),
             if sub_model_object_field:
                 copy_val += "." + sub_model_object_field
             if null_value:
-                copy_val += " or '" + null_value + "'"
+                copy_val += " or '''%s'''" % null_value
             if model_object_field:
                 copy_val += "}"
         elif template_language == 'django':
@@ -360,7 +360,7 @@ This is useful for CRM leads for example"),
             if sub_model_object_field:
                 copy_val += "." + sub_model_object_field
             if null_value:
-                copy_val = copy_val + '|default:"' + null_value + '"'  
+                copy_val = copy_val + "|default:'''%s'''" % null_value
             copy_val = copy_val + "}}"        
         return copy_val 
             

From 7bf6844f10fc9278901f8e2a61e83df166f8241c Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Mon, 27 Sep 2010 16:11:16 +0200
Subject: [PATCH 02/21] [FIX] Fixed wrong indentation.

bzr revid: jth@openerp.com-20100927141116-wu6vznh4dqzu9i5j
---
 addons/email_template/email_template.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index cbedc57d6e2..d6b73a0ece1 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -348,20 +348,19 @@ This is useful for CRM leads for example"),
         if template_language == 'mako':
             if model_object_field:
                 copy_val = "${object." + model_object_field
-            if sub_model_object_field:
-                copy_val += "." + sub_model_object_field
-            if null_value:
-                copy_val += " or '''%s'''" % null_value
-            if model_object_field:
+                if sub_model_object_field:
+                    copy_val += "." + sub_model_object_field
+                if null_value:
+                    copy_val += " or '''%s'''" % null_value
                 copy_val += "}"
         elif template_language == 'django':
             if model_object_field:
                 copy_val = "{{object." + model_object_field
-            if sub_model_object_field:
-                copy_val += "." + sub_model_object_field
-            if null_value:
-                copy_val = copy_val + "|default:'''%s'''" % null_value
-            copy_val = copy_val + "}}"        
+                if sub_model_object_field:
+                    copy_val += "." + sub_model_object_field
+                if null_value:
+                    copy_val = copy_val + "|default:'''%s'''" % null_value
+                copy_val = copy_val + "}}"        
         return copy_val 
             
     def onchange_model_object_field(self, cr, uid, ids, model_object_field, template_language, context=None):

From ab55bfd6afbddc0583830dd76da24b02fc8b27bc Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Mon, 27 Sep 2010 16:17:58 +0200
Subject: [PATCH 03/21] [REF] Renamed variable to match conventions.

bzr revid: jth@openerp.com-20100927141758-i5dpu1l7ctk39j1e
---
 addons/email_template/email_template.py | 45 ++++++++++++-------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index d6b73a0ece1..49e99de5bf5 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -331,37 +331,34 @@ This is useful for CRM leads for example"),
         default.update({'name':new_name})
         return super(email_template, self).copy(cr, uid, id, default, context)
     
-    def compute_pl(self,
-                   model_object_field,
-                   sub_model_object_field,
-                   null_value, template_language='mako'):
+    def compute_pl(self, field_name, sub_field_name, null_value, template_language='mako'):
         """
-        Returns the expression based on data provided
-        @param model_object_field: First level field
-        @param sub_model_object_field: Second level drilled down field (M2O)
-        @param null_value: What has to be returned if the value is empty
-        @param template_language: The language used for templating
+        Returns a template expression based on data provided
+        @param field_name: field name
+        @param sub_field_name: sub field name (M2O)
+        @param null_value: default value if the target value is empty
+        @param template_language: name of template engine
         @return: computed expression
         """
-        #Configure for MAKO
-        copy_val = ''
+
+        expression = ''
         if template_language == 'mako':
-            if model_object_field:
-                copy_val = "${object." + model_object_field
-                if sub_model_object_field:
-                    copy_val += "." + sub_model_object_field
+            if field_name:
+                expression = "${object." + field_name
+                if sub_field_name:
+                    expression += "." + sub_field_name
                 if null_value:
-                    copy_val += " or '''%s'''" % null_value
-                copy_val += "}"
+                    expression += " or '''%s'''" % null_value
+                expression += "}"
         elif template_language == 'django':
-            if model_object_field:
-                copy_val = "{{object." + model_object_field
-                if sub_model_object_field:
-                    copy_val += "." + sub_model_object_field
+            if field_name:
+                expression = "{{object." + field_name
+                if sub_field_name:
+                    expression += "." + sub_field_name
                 if null_value:
-                    copy_val = copy_val + "|default:'''%s'''" % null_value
-                copy_val = copy_val + "}}"        
-        return copy_val 
+                    expression += "|default: '''%s'''" % null_value  
+                expression += "}}"
+        return expression 
             
     def onchange_model_object_field(self, cr, uid, ids, model_object_field, template_language, context=None):
         if not model_object_field:

From 8b241bb07b78daeba54b6e7473531fa3cbe8ab94 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Mon, 27 Sep 2010 16:22:54 +0200
Subject: [PATCH 04/21] [REF] Renamed method to match conventions.

bzr revid: jth@openerp.com-20100927142254-aru8l7933o3x8cfr
---
 addons/email_template/email_template.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 49e99de5bf5..ee82c917351 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -331,7 +331,7 @@ This is useful for CRM leads for example"),
         default.update({'name':new_name})
         return super(email_template, self).copy(cr, uid, id, default, context)
     
-    def compute_pl(self, field_name, sub_field_name, null_value, template_language='mako'):
+    def build_expression(self, field_name, sub_field_name, null_value, template_language='mako'):
         """
         Returns a template expression based on data provided
         @param field_name: field name
@@ -370,7 +370,7 @@ This is useful for CRM leads for example"),
             res_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', field_obj.relation)], context=context)
             if res_ids:
                 result['sub_object'] = res_ids[0]
-                result['copyvalue'] = self.compute_pl(False,
+                result['copyvalue'] = self.build_expression(False,
                                                       False,
                                                       False,
                                                       template_language)
@@ -379,7 +379,7 @@ This is useful for CRM leads for example"),
         else:
             #Its a simple field... just compute placeholder
             result['sub_object'] = False
-            result['copyvalue'] = self.compute_pl(field_obj.name,
+            result['copyvalue'] = self.build_expression(field_obj.name,
                                                   False,
                                                   False,
                                                   template_language
@@ -398,7 +398,7 @@ This is useful for CRM leads for example"),
             sub_field_obj = self.pool.get('ir.model.fields').browse(cr, uid, sub_model_object_field, context)
             if res_ids:
                 result['sub_object'] = res_ids[0]
-                result['copyvalue'] = self.compute_pl(field_obj.name,
+                result['copyvalue'] = self.build_expression(field_obj.name,
                                                       sub_field_obj.name,
                                                       False,
                                                       template_language
@@ -408,7 +408,7 @@ This is useful for CRM leads for example"),
         else:
             #Its a simple field... just compute placeholder
             result['sub_object'] = False
-            result['copyvalue'] = self.compute_pl(field_obj.name,
+            result['copyvalue'] = self.build_expression(field_obj.name,
                                                   False,
                                                   False,
                                                   template_language
@@ -427,7 +427,7 @@ This is useful for CRM leads for example"),
             sub_field_obj = self.pool.get('ir.model.fields').browse(cr, uid, sub_model_object_field, context)
             if res_ids:
                 result['sub_object'] = res_ids[0]
-                result['copyvalue'] = self.compute_pl(field_obj.name,
+                result['copyvalue'] = self.build_expression(field_obj.name,
                                                       sub_field_obj.name,
                                                       null_value,
                                                       template_language
@@ -437,7 +437,7 @@ This is useful for CRM leads for example"),
         else:
             #Its a simple field... just compute placeholder
             result['sub_object'] = False
-            result['copyvalue'] = self.compute_pl(field_obj.name,
+            result['copyvalue'] = self.build_expression(field_obj.name,
                                                   False,
                                                   null_value,
                                                   template_language

From 4e66ad96cc73597f2e8e10c8e0b9aadeda2c7510 Mon Sep 17 00:00:00 2001
From: Yogesh Sakhreliya <ysa@tinyerp.com>
Date: Mon, 4 Oct 2010 19:38:41 +0530
Subject: [PATCH 05/21] [REM] remove role_id field in workflow.xml file.

bzr revid: ysa@tinyerp.com-20101004140841-abyzp16b5qaau505
---
 .../crossovered_budget_workflow.xml           |  4 --
 .../email_template_workflow.xml               |  4 --
 addons/hr_expense/hr_expense_workflow.xml     |  6 --
 addons/hr_holidays/hr_holidays_workflow.xml   |  5 --
 .../hr_timesheet_workflow.xml                 | 14 ++---
 .../process/hr_timesheet_sheet_process.xml    | 56 +++++++++----------
 addons/sale/process/sale_process.xml          |  8 ---
 7 files changed, 32 insertions(+), 65 deletions(-)

diff --git a/addons/account_budget/crossovered_budget_workflow.xml b/addons/account_budget/crossovered_budget_workflow.xml
index f304775bcca..16997d694f2 100644
--- a/addons/account_budget/crossovered_budget_workflow.xml
+++ b/addons/account_budget/crossovered_budget_workflow.xml
@@ -65,28 +65,24 @@
 		<field name="act_from" ref="act_confirm" />
 		<field name="act_to" ref="act_validate" />
 		<field name="signal">validate</field>
-		<field name="role_id" ref="crossovered_budget_role"/>
 	</record>
 
 	<record model="workflow.transition" id="t3">
 		<field name="act_from" ref="act_confirm" />
 		<field name="act_to" ref="act_cancel" />
 		<field name="signal">cancel</field>
-		<field name="role_id" ref="crossovered_budget_role"/>
 	</record>
 
 	<record model="workflow.transition" id="t4">
 		<field name="act_from" ref="act_validate" />
 		<field name="act_to" ref="act_cancel" />
 		<field name="signal">cancel</field>
-		<field name="role_id" ref="crossovered_budget_role"/>
 	</record>
 
 	<record model="workflow.transition" id="t5">
 		<field name="act_from" ref="act_validate" />
 		<field name="act_to" ref="act_done" />
 		<field name="signal">done</field>
-		<field name="role_id" ref="crossovered_budget_role"/>
 	</record>
 
 	<record model="workflow.transition" id="t6">
diff --git a/addons/email_template/email_template_workflow.xml b/addons/email_template/email_template_workflow.xml
index 911b8bf49ff..1a6a73cca77 100644
--- a/addons/email_template/email_template_workflow.xml
+++ b/addons/email_template/email_template_workflow.xml
@@ -47,26 +47,22 @@
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_approved"/>
             <field name="signal">button_approval</field>
-            <field name="role_id" ref="PE_ADMIN"/>
         </record>
 
         <record id="trans_approved_suspended" model="workflow.transition">
             <field name="act_from" ref="act_approved"/>
             <field name="act_to" ref="act_suspended"/>
             <field name="signal">button_suspended</field>
-            <field name="role_id" ref="PE_ADMIN"/>
         </record>
         <record id="trans_suspended_reapproved" model="workflow.transition">
             <field name="act_from" ref="act_suspended"/>
             <field name="act_to" ref="act_draft"/>
             <field name="signal">get_reapprove</field>
-            <field name="role_id" ref="PE_ADMIN"/>
         </record>
         <record id="trans_suspended_dummy" model="workflow.transition">
             <field name="act_from" ref="act_suspended"/>
             <field name="act_to" ref="act_dummy"/>
             <field name="signal">get_never</field>
-            <field name="role_id" ref="PE_ADMIN"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index cfeee8387ce..2bb0f51e26b 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -75,14 +75,12 @@
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_accepted"/>
             <field name="signal">validate</field>
-            <field name="role_id" ref="HR"/>
         </record>
 
         <record id="t4" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_refused"/>
             <field name="signal">refuse</field>
-            <field name="role_id" ref="HR"/>
         </record>
 
         <record id="t5" model="workflow.transition">
@@ -95,21 +93,18 @@
             <field name="act_from" ref="act_accepted"/>
             <field name="act_to" ref="act_refused"/>
             <field name="signal">refuse</field>
-            <field name="role_id" ref="HR"/>
         </record>
 
         <record id="t7" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_draft"/>
             <field name="signal">draft</field>
-            <field name="role_id" ref="HR"/>
         </record>
 
         <record id="t8" model="workflow.transition">
             <field name="act_from" ref="act_accepted"/>
             <field name="act_to" ref="act_invoice"/>
             <field name="signal">invoice</field>
-            <field name="role_id" ref="HR_INV"/>
         </record>
 
         <record id="t9" model="workflow.transition">
@@ -128,7 +123,6 @@
             <field name="act_from" ref="act_refused"/>
             <field name="act_to" ref="act_draft"/>
             <field name="signal">draft</field>
-            <field name="role_id" ref="HR"/>
         </record>
 
     </data>
diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
index 6dcd55ff162..de2bd9f1131 100644
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ b/addons/hr_holidays/hr_holidays_workflow.xml
@@ -77,28 +77,24 @@
         <field name="act_to" ref="act_validate" />
         <field name="signal">validate</field>
         <field name="condition">(holiday_status_id.double_validation == False)</field>
-        <field name="role_id" ref="HR_holidays"/>
     </record>
 
     <record model="workflow.transition" id="t3">
         <field name="act_from" ref="act_confirm" />
         <field name="act_to" ref="act_refuse" />
         <field name="signal">refuse</field>
-        <field name="role_id" ref="HR_holidays"/>
     </record>
 
     <record model="workflow.transition" id="t4">
         <field name="act_from" ref="act_validate" />
         <field name="act_to" ref="act_cancel" />
         <field name="signal">cancel</field>
-        <field name="role_id" ref="HR_holidays"/>
     </record>
 
     <record model="workflow.transition" id="t5">
         <field name="act_from" ref="act_refuse" />
         <field name="act_to" ref="act_cancel" />
         <field name="signal">cancel</field>
-        <field name="role_id" ref="HR_holidays"/>
     </record>
 
     <record model="workflow.transition" id="t7">
@@ -124,7 +120,6 @@
         <field name="act_to" ref="act_validate1" />
         <field name="condition">(holiday_status_id.double_validation == True)</field>
         <field name="signal">validate</field>
-        <field name="role_id" ref="HR_holidays"/>
     </record>
 
 </data>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml b/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
index 11af4574a4a..b664fd79c96 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <!-- Roles definition -->
-        
+
         <record id="HR" model="res.roles">
             <field name="name">Timesheets validation</field>
         </record>
-        
+
         <!-- Workflow definition -->
-        
+
         <record id="wkf_timesheet" model="workflow">
             <field name="name">hr_timesheet_sheet.sheet</field>
             <field name="osv">hr_timesheet_sheet.sheet</field>
             <field name="on_create">True</field>
         </record>
-        
+
         <record id="act_new" model="workflow.activity">
             <field name="wkf_id" ref="wkf_timesheet"/>
             <field name="name">new</field>
@@ -42,7 +42,7 @@
             <field name="action">write({'state':'done'})</field>
             <field name="flow_stop">True</field>
         </record>
-        
+
         <record id="t0" model="workflow.transition">
             <field name="act_from" ref="act_new"/>
             <field name="act_to" ref="act_draft"/>
@@ -56,13 +56,11 @@
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_done"/>
             <field name="signal">done</field>
-            <field name="role_id" ref="HR"/>
         </record>
         <record id="t3" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_draft"/>
             <field name="signal">cancel</field>
-            <field name="role_id" ref="HR"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
index a2bf0aa24e5..22453dccfa4 100644
--- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
+++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-        
-        <!-- 
+
+        <!--
             Process
         -->
-        
+
         <record id="process_process_hrtimesheetprocess0" model="process.process">
             <field eval="1" name="active"/>
             <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
             <field eval="&quot;&quot;&quot;Hr Timesheet&quot;&quot;&quot;" name="name"/>
         </record>
-        
-        <!-- 
+
+        <!--
             Process Node
         -->
-    
+
         <record id="process_node_attendance0" model="process.node">
             <field name="model_id" ref="hr.model_hr_employee"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
@@ -24,7 +24,7 @@
             <field name="process_id" ref="process_process_hrtimesheetprocess0"/>
             <field eval="1" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_timesheet0" model="process.node">
             <field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
             <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
@@ -35,7 +35,7 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_drafttimesheetsheet0" model="process.node">
             <field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
             <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
@@ -46,7 +46,7 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_confirmedtimesheet0" model="process.node">
             <field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
             <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
@@ -68,7 +68,7 @@
             <field eval="&quot;&quot;&quot;object.state=='done'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_invoiceonwork0" model="process.node">
             <field name="menu_id" ref="account.menu_finance_receivables"/>
             <field name="model_id" ref="account.model_account_invoice"/>
@@ -91,19 +91,15 @@
             <field eval="&quot;&quot;&quot;object.state in ('open', pending', 'done', 'cancelled')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-        
-        <!-- 
+
+        <!--
             Process Transition
         -->
-        
+
         <record id="res_roles_hr0" model="res.roles">
             <field eval="&quot;&quot;&quot;HR&quot;&quot;&quot;" name="name"/>
         </record>
-        
-        <record id="hr_timesheet_sheet.t1" model="workflow.transition">
-            <field name="role_id" ref="res_roles_hr0"/>
-        </record>
-    
+
         <record id="process_transition_attendancetimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -112,7 +108,7 @@
             <field model="process.node" name="target_node_id" ref="process_node_drafttimesheetsheet0"/>
             <field model="process.node" name="source_node_id" ref="process_node_attendance0"/>
         </record>
-    
+
         <record id="process_transition_timesheetdraft0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -121,7 +117,7 @@
             <field model="process.node" name="target_node_id" ref="process_node_drafttimesheetsheet0"/>
             <field model="process.node" name="source_node_id" ref="process_node_timesheet0"/>
         </record>
-    
+
         <record id="process_transition_confirmtimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -131,7 +127,7 @@
             <field model="process.node" name="source_node_id" ref="process_node_drafttimesheetsheet0"/>
             <field eval="[(6,0,[ref('hr_timesheet_sheet.t1')])]" name="transition_ids"/>
         </record>
-    
+
         <record id="process_transition_validatetimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -140,7 +136,7 @@
             <field model="process.node" name="target_node_id" ref="process_node_validatedtimesheet0"/>
             <field model="process.node" name="source_node_id" ref="process_node_confirmedtimesheet0"/>
         </record>
-    
+
         <record id="process_transition_invoiceontimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -149,7 +145,7 @@
             <field model="process.node" name="target_node_id" ref="process_node_invoiceonwork0"/>
             <field model="process.node" name="source_node_id" ref="process_node_confirmedtimesheet0"/>
         </record>
-        
+
         <record id="process_transition_tasktimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -157,32 +153,32 @@
             <field eval="&quot;&quot;&quot;Moves task entry into the timesheet line&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_timesheet0"/>
             <field model="process.node" name="source_node_id" ref="process_node_workontask0"/>
-         </record>        
-        
-        <!-- 
+         </record>
+
+        <!--
             Process Action
         -->
-        
+
         <record id="process_transition_action_draftconfirmtimesheet0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;button_confirm&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
             <field eval="&quot;&quot;&quot;Confirm&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_confirmtimesheet0"/>
         </record>
-        
+
         <record id="process_transition_action_validatetimesheet0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;write({'state':'done'})&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
             <field eval="&quot;&quot;&quot;Validate&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_validatetimesheet0"/>
         </record>
-        
+
         <record id="process_transition_action_refusetimesheet0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;write({'state':'draft'})&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
             <field eval="&quot;&quot;&quot;Refuse&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_validatetimesheet0"/>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index b4a54d5afa5..4d6ca31d973 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -138,14 +138,6 @@
             <field eval="&quot;&quot;&quot;Salesman&quot;&quot;&quot;" name="name"/>
         </record>
 
-        <record id="sale.trans_draft_router" model="workflow.transition">
-            <field name="role_id" ref="res_roles_salesman0"/>
-        </record>
-
-        <record id="sale.trans_wait_invoice_invoice_manual" model="workflow.transition">
-            <field name="role_id" ref="res_roles_salesman0"/>
-        </record>
-
         <record id="process_transition_confirmquotation0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirm Quotation&quot;&quot;&quot;" name="name"/>

From 68f558eeed1d51eb52cbbb72a348e6904cfb71d2 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Tue, 5 Oct 2010 09:10:57 +0200
Subject: [PATCH 06/21] [FIX] base_iban: no 'bank' field in
 res.partner.bank.type

bzr revid: olt@tinyerp.com-20101005071057-zqw6a06i8pczozge
---
 addons/base_iban/base_iban_data.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/base_iban/base_iban_data.xml b/addons/base_iban/base_iban_data.xml
index 4269bb83ac6..dae3999505e 100644
--- a/addons/base_iban/base_iban_data.xml
+++ b/addons/base_iban/base_iban_data.xml
@@ -3,12 +3,11 @@
     <data>
 
         <!--
-		Default bank account description
-		-->
+        Default bank account description
+        -->
         <record id="bank_iban" model="res.partner.bank.type">
             <field name="name">IBAN Account</field>
             <field name="code">iban</field>
-            <field name="bank" ref="base.res_bank_1"/>
         </record>
         <record id="bank_iban_field" model="res.partner.bank.type.field">
             <field name="name">iban</field>

From 4a1157c0572d2f2e2feb43fd7e7dd7fa73f15ef0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 5 Oct 2010 09:54:18 +0200
Subject: [PATCH 07/21] [IMP] useability improvements

bzr revid: fp@tinyerp.com-20101005075418-0t33zy0trdmiwbfj
---
 addons/base_calendar/base_calendar_view.xml   |  4 +++-
 addons/crm/crm_lead_data.xml                  |  3 ++-
 addons/crm/crm_meeting_view.xml               |  3 ++-
 addons/crm/crm_opportunity.py                 |  9 ++++----
 addons/crm/crm_opportunity_view.xml           | 22 ++++++-------------
 addons/crm/crm_view.xml                       |  1 +
 addons/hr/hr_installer.xml                    |  2 +-
 addons/hr/installer.py                        |  3 +--
 addons/mail_gateway/mail_gateway_view.xml     | 21 +-----------------
 addons/marketing/marketing_view.xml           |  3 +--
 addons/marketing/marketing_wizard.py          |  4 +---
 addons/product/product_view.xml               |  3 ++-
 addons/profile_tools/installer.py             | 10 ++++-----
 addons/profile_tools/misc_tools_installer.xml |  5 ++---
 addons/project/installer.py                   | 10 +++------
 addons/project/project_installer.xml          |  6 ++---
 addons/project_timesheet/__openerp__.py       |  2 +-
 addons/sale_crm/wizard/crm_make_sale.py       |  3 ++-
 addons/sale_crm/wizard/crm_make_sale_view.xml |  9 ++++----
 19 files changed, 46 insertions(+), 77 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 2a0ed14080f..ba91c4b75dd 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -163,7 +163,8 @@
         <!-- Invitation menu -->
 
            <menuitem id="menu_attendee_invitations"
-            name="Event Invitations" parent="base.menu_calendar_configuration"
+            parent="base.menu_calendar_configuration"
+            groups="base.group_extended"
             sequence="10" action="action_view_attendee_form" />
 
         <!--        ALARM FORM VIEW-->
@@ -496,6 +497,7 @@
 
         <menuitem id="menu_events"
                 name="Events" parent="base.menu_calendar_configuration"
+                groups="base.group_extended"
                 sequence="5" action="action_view_event" />
 
      </data>
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index cb80a7d28e9..2a49e43e683 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -33,9 +33,10 @@
         </record>
 
         <record model="crm.case.stage" id="stage_lead5">
-            <field name="name">Win</field>
+            <field name="name">Won</field>
             <field eval="'100'" name="probability"/>
             <field eval="'5'" name="sequence"/>
+            <field eval="1" name="on_change"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 2821024bfbf..98b311592b7 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -13,7 +13,8 @@
         <field name="context">{'object_id':'crm.meeting'}</field>
     </record>
 
-     <menuitem action="crm_meeting_categ_action" name="Categories of Meeting"
+     <menuitem action="crm_meeting_categ_action"
+        groups="base.group_extended"
         id="menu_crm_case_meeting-act" parent="base.menu_calendar_configuration" sequence="1"/>
 
     <!-- CRM Meetings Form View -->
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 771212a171d..2b0062eb9d5 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -85,10 +85,11 @@ class crm_opportunity(osv.osv):
         """
         res = super(crm_opportunity, self).case_close(cr, uid, ids, args)
         stage_id = super(crm_opportunity, self).stage_next(cr, uid, ids, context={'force_domain': [('probability', '=', 0)]})
-        if not stage_id:
-            raise osv.except_osv(_('Warning !'), _('There is no stage for lost opportunities defined for this Sale Team.'))
-        value = self.onchange_stage_id(cr, uid, ids, stage_id, context={})['value']
-        value.update({'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'), 'stage_id': stage_id})
+        value = {}
+        if stage_id:
+            value = self.onchange_stage_id(cr, uid, ids, stage_id, context={}).get('value', {})
+            value['stage_id'] = stage_id
+        value.update({'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
 
         res = self.write(cr, uid, ids, value)
         for (id, name) in self.name_get(cr, uid, ids):
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index b52694d8b20..66b6f04553b 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -14,14 +14,14 @@
                             <label string="Stage:" align="1.0"/>
                             <group colspan="1" col="4">
                                 <field name="stage_id" nolabel="1"
+                                    widget="selection"
                                     on_change="onchange_stage_id(stage_id)"
-                                    domain="[('object_id.model', '=', 'crm.lead')]"
-                                    readonly="1" />
+                                    domain="[('object_id.model', '=', 'crm.lead')]"/>
                                 <button name="stage_previous"
-                                states="open,pending" type="object"
-                                icon="gtk-go-back" string="" />
-                                <button name="stage_next" states="open,pending"
-                                type="object" icon="gtk-go-forward" string="" />
+                                    states="draft,open,pending" type="object"
+                                    icon="gtk-go-back" string="" />
+                                <button name="stage_next" states="draft,open,pending"
+                                    type="object" icon="gtk-go-forward" string="" />
                             </group>
                             <field name="user_id"/>
 
@@ -88,7 +88,7 @@
                                     groups="base.group_extended"
                                     icon="gtk-go-up" />
                                 <button name="case_cancel" string="Cancel"
-                                    states="draft,open,pending" type="object"
+                                    states="draft" type="object"
                                     icon="gtk-close" />
                                 <button name="case_mark_lost" string="Mark Lost"
                                     states="open,pending" type="object"
@@ -283,14 +283,6 @@
                             string="Pending"  help="Pending Opportunities"
                             domain="[('state','=','pending')]"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-today" string="Today"
-                            domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                            help="Todays' Opportunities" />
-                        <filter icon="terp-go-week" string="7 Days"
-                            help="Opportunities created during last 7 days"
-                            domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))]"
-                        />
-                        <separator orientation="vertical"/>
                         <field name="name" string="Opportunity"/>
                         <field name="partner_id"/>
                         <field name="user_id">
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index bb15b3631b8..daafc19a621 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -202,6 +202,7 @@
 
          <menuitem action="crm_case_resource_type_act"
             id="menu_crm_case_resource_type_act" sequence="4"
+            groups="base.group_extended"
             parent="base.menu_sale_config_sales" />
 
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 490523b4e12..0f396e65a8b 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -27,8 +27,8 @@
             <field name="hr_recruitment"/>
             <field name="hr_timesheet_sheet"/>
             <field name="hr_contract"/>
-            <field name="hr_evaluation"/>
             <field name="hr_attendance"/>
+            <field name="hr_evaluation" groups="base.group_extended"/>
             <field name="hr_payroll" groups="base.group_extended"/>
             <field name="hr_payroll_account" groups="base.group_extended"/>
           </group>
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index 1d650d814e9..1bd615b8699 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -51,8 +51,7 @@ class hr_installer(osv.osv_memory):
     _defaults = {
         'hr_holidays': True,
         'hr_expense': True,
-        }
-
+    }
 hr_installer()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 706996ed55a..ab118295db5 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -135,16 +135,6 @@
         </record>
 
          <!--        Emails action-->
-        <record model="ir.actions.act_window" id="action_view_mailgate_message">
-            <field name="name">Emails</field>
-            <field name="res_model">mailgate.message</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('history', '=', True)]</field>
-            <field name="view_id" ref="view_mailgate_message_tree"/>
-            <field name="context">{"search_default_user_id":uid}</field>
-        </record>
-
         <record model="ir.actions.act_window" id="action_view_mailgate_thread">
             <field name="name">Mailgateway Threads</field>
             <field name="res_model">mailgate.thread</field>
@@ -196,18 +186,9 @@
             view_id="view_mailgate_message_tree"
             />
 
-
-      <menuitem name="Emails" id="menu_base_config_mail"
-        parent="base.menu_base_partner" sequence="5" />
-
-    <menuitem name="Emails" id="menu_mailgate_message"
-        parent="menu_base_config_mail"
-        action="mail_gateway.action_view_mailgate_message"
-       />
-
     <act_window
        id="act_res_partner_open_email" name="Attachments"
-        res_model="ir.attachment"
+       res_model="ir.attachment"
        src_model="mailgate.message"
        domain="[('res_id', '=', res_id),('res_model','=',model)]"/>
 
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index b96ba8fb7e3..6cd35f3a533 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -29,10 +29,9 @@
                             <attribute name="string">Configure</attribute>
                   </xpath>
                   <group colspan="8">
+                        <field name="marketing_campaign" />
                         <field name="email_template" />
                         <field name="crm_profiling" />
-                        <field name="marketing_campaign" />
-                        <field name="marketing_campaign_mailchimp" />
                   </group>
                 </data>
             </field>
diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py
index 8d1a6fa50ed..4b95bbb86da 100644
--- a/addons/marketing/marketing_wizard.py
+++ b/addons/marketing/marketing_wizard.py
@@ -29,10 +29,8 @@ class marketing_installer(osv.osv_memory):
             help="Helps you to design templates of emails and integrate them in your different processes."),
         'marketing_campaign':fields.boolean('Marketing Campaigns',
             help="Helps you to manage marketing campaigns and automate actions and communication steps."),
-        'marketing_campaign_mailchimp':fields.boolean('Mailchimp Integration',
-            help="This modules integrate mailchimp.com's service with OpenERP to automate mass mailings."),
         'crm_profiling':fields.boolean('Profiling Tools',
-            help="Helps you to perform segmentation within partners and design segmentation questionnaires")
+            help="Helps you to perform segmentation of partners and design segmentation questionnaires")
     }
 marketing_installer()
 
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 45ebaa8ee57..7e9ae7ce45e 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -257,11 +257,12 @@
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
             <field name="view_id" ref="product_category_tree_view"/>
-            <field name="help">Products category opens a tree structure view of your products by category.</field>
+            <field name="help">This is a hyerarchical structure of your product's categories, you can enter a category to browse all products in this category and his children.</field>
         </record>
         <menuitem
             action="product_category_action"
             id="product.menu_products_category"
+            groups="base.group_extended"
             parent="base.menu_product"
             sequence="0"/>
         <record id="product_category_action_form" model="ir.actions.act_window">
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
index 06be50a903f..54fd0602802 100644
--- a/addons/profile_tools/installer.py
+++ b/addons/profile_tools/installer.py
@@ -25,15 +25,13 @@ class misc_tools_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     _columns = {
-        'lunch':fields.boolean('Lunch',help='Helps to manage Lunch Orders.'),
-        'subscription':fields.boolean('Recurring Documents',help='Helps to add subscription on documents.'),
-        'survey':fields.boolean('Survey',help='Manages Custom Surveys.'),
-        'idea':fields.boolean('Idea',help='Manages ideas and votes'),
-        'audittrail':fields.boolean('Audit Trail',help="Lets you to track user's operations on specific Objects."),
+        'lunch':fields.boolean('Lunch',help='A simple module to help you to manage Lunch orders.'),
+        'subscription':fields.boolean('Recurring Documents',help='Helps to generate automatically recurring documents.'),
+        'survey':fields.boolean('Survey',help='Allows you to organize surveys.'),
+        'idea':fields.boolean('Ideas Box',help='Promote ideas of the employees, votes and discussion on best ideas.'),
     }
     _defaults = {
         'lunch': True,
     }
-
 misc_tools_installer()
 
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index c9b5f744b77..bc445e7818f 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -26,10 +26,9 @@
           </xpath>
           <group colspan="8">
             <field name="lunch"/>
-            <field name="subscription"/>
-            <field name="survey"/>
             <field name="idea"/>
-            <field name="audittrail"/>
+            <field name="survey"/>
+            <field name="subscription" groups="base.group_extended"/>
           </group>
         </data>
       </field>
diff --git a/addons/project/installer.py b/addons/project/installer.py
index 4662ebeda5d..7a147737768 100644
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
@@ -34,14 +34,10 @@ class project_installer(osv.osv_memory):
         'hr_timesheet_sheet': fields.boolean('Timesheets',
             help="Tracks and helps employees encode and validate timesheets "
                  "and attendances."),
-        'hr_timesheet_invoice': fields.boolean('Invoice Based on Hours',
-            help="Helps generate invoices based on human resources "
-                 "costs and general expenses."),
+        'project_timesheet': fields.boolean('Bill Time on Tasks',
+            help="Helps generate invoices based on time spent on tasks, if activated on the project."),
         'account_budget': fields.boolean('Budgets',
             help="Helps accountants manage analytic and crossover budgets."),
-        'project_messages': fields.boolean('Project Messages',
-            help="Lets employees send messages to other members of the "
-                 "projects they're working on."),
         'project_issue': fields.boolean('Issues Tracker',
             help="Automatically synchronizes project tasks and crm cases."),
         # Methodologies
@@ -50,7 +46,7 @@ class project_installer(osv.osv_memory):
                  "in the SCRUM methodology."),
         'project_gtd': fields.boolean('Getting Things Done',
             help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
-        }
+    }
 
     _defaults={
         'project_issue': True,
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 2c22a4b6743..2b46cc0ab5f 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -27,11 +27,11 @@
             <field name="project_issue"/>
             <field name="project_long_term" groups="base.group_extended"/>
             <field name="hr_timesheet_sheet"/>
-            <field name="hr_timesheet_invoice"/>
+            <field name="project_timesheet"/>
             <field name="account_budget" groups="base.group_extended"/>
-            <field name="project_messages" groups="base.group_extended"/>
+            <newline/>
             <separator string="Methodologies" colspan="4"/>
-            <field name="project_scrum" groups="base.group_extended"/>
+            <field name="project_scrum"/>
             <field name="project_gtd"/>
           </group>
         </data>
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index 021d30da687..e1be86fe661 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -30,7 +30,7 @@
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'project', 'hr_timesheet_sheet', 'hr_timesheet_invoice'],
+    'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice'],
     'init_xml': [],
     'update_xml': ["security/ir.model.access.csv","process/project_timesheet_process.xml", "report/task_report_view.xml", "project_timesheet_view.xml"],
     'demo_xml': [],
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index ca6c8cb64c8..089a2389703 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -180,10 +180,11 @@ class crm_make_sale(osv.osv_memory):
         'partner_id': fields.many2one('res.partner', 'Customer', required=True), 
         'sale_order_line': fields.one2many('sale.order.make.line', 'opportunity_order_id', 'Product Line'), 
         'analytic_account': fields.many2one('account.analytic.account', 'Analytic Account'), 
-        'close': fields.boolean('Close Case', help='Check this to close the case after having created the sale order.'), 
+        'close': fields.boolean('Close Opportunity', help='Check this to close the opportunity after having created the sale order.'), 
     }
     _defaults = {
          'shop_id': _get_shop_id, 
+         'close': lambda *args: 1, 
          'partner_id': _selectPartner, 
     }
 
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index c6b589145c7..54550a08bf1 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -9,13 +9,13 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
               <form string="Create a Sale Order" >
-              		<group width="660" height="300">
                     <group colspan="4">
                         <field name="partner_id" required="1"/>
                         <field name="shop_id" required="1" widget="selection"/>
-                        <field name="analytic_account" domain="[('parent_id','!=',False)]" />
-                        <field name="close" required="1"/>
-                    	</group>
+                        <field name="analytic_account" domain="[('type','=','normal')]"
+                            groups="base.group_extended"/>
+                        <field name="close"/>
+                    </group>
                             <field colspan="4" mode="tree,form,graph" name="sale_order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sale Order Lines">
                                     <notebook>
@@ -65,7 +65,6 @@
                     <button special="cancel" string="_Close" icon="gtk-cancel"/>
                     <button name="makeOrder" string="_Create" type="object" icon='gtk-ok'/>
                 </group>
-                </group>
             </form>
           </field>
        </record>

From 4988819428f5a692a216264561c8a2b5fa975e27 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 5 Oct 2010 09:59:22 +0200
Subject: [PATCH 08/21] [IMP] removed board on users

bzr revid: fp@tinyerp.com-20101005075922-d0n6h4g0kz25p0bn
---
 addons/account/__openerp__.py           |  1 -
 addons/account/board_account_demo.xml   | 13 -------------
 addons/crm/__openerp__.py               |  1 -
 addons/crm/board_crm_demo.xml           | 14 --------------
 addons/event/__openerp__.py             |  2 +-
 addons/event/board_association_demo.xml | 10 ----------
 addons/mrp/__openerp__.py               |  1 -
 addons/mrp/board_manufacturing_demo.xml |  9 ---------
 addons/project/board_project_demo.xml   |  9 +++------
 9 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 addons/account/board_account_demo.xml
 delete mode 100644 addons/crm/board_crm_demo.xml
 delete mode 100644 addons/event/board_association_demo.xml
 delete mode 100644 addons/mrp/board_manufacturing_demo.xml

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 823bb56a7a9..271cc92e41c 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -120,7 +120,6 @@ module named account_voucher.
         'project/analytic_account_demo.xml',
         'demo/account_minimal.xml',
         'account_unit_test.xml',
-        'board_account_demo.xml',
     ],
     'test': [
         'test/account_customer_invoice.yml',
diff --git a/addons/account/board_account_demo.xml b/addons/account/board_account_demo.xml
deleted file mode 100644
index 93bfed6d56d..00000000000
--- a/addons/account/board_account_demo.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-        <!--
-		Administrator shortcut
-		Demo user startup menu
-		-->
-        <record id="base.user_root" model="res.users">
-            <field name="action_id" ref="open_board_account"/>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 5de8de6de68..89dc61bef59 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -119,7 +119,6 @@ Create dashboard for CRM that includes:
         'crm_meeting_demo.xml',
         'crm_opportunity_demo.xml',
         'crm_phonecall_demo.xml',
-        'board_crm_demo.xml',
     ],
     'test': [
             'test/test_crm_lead.yml',
diff --git a/addons/crm/board_crm_demo.xml b/addons/crm/board_crm_demo.xml
deleted file mode 100644
index fd8bb480d68..00000000000
--- a/addons/crm/board_crm_demo.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data noupdate="1">
-
-        <!--
-         Administrator shortcut
-         Demo user startup menu
-         -->
-        <record model="res.users" id="base.user_root">
-            <field name="action_id" ref="open_board_crm"/>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index fdf64388a19..4e65009f422 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -53,7 +53,7 @@
         'board_association_view.xml',
         'res_partner_view.xml',
     ],
-    'demo_xml': ['event_demo.xml', 'board_association_demo.xml'],
+    'demo_xml': ['event_demo.xml'],
     'test': ['test/test_event.yml'],
     'installable': True,
     'active': False,
diff --git a/addons/event/board_association_demo.xml b/addons/event/board_association_demo.xml
deleted file mode 100644
index 1e66696aa8b..00000000000
--- a/addons/event/board_association_demo.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-	<data noupdate="1">
-
-		<record model="res.users" id="base.user_root">
-			<field name="action_id" ref="open_board_associations_manager"/>
-		</record>
-	</data>
-</openerp>
-
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index c56466501e0..f267764970a 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -85,7 +85,6 @@
     ],
     'demo_xml': [
          'mrp_demo.xml',
-         'board_manufacturing_demo.xml'
     ],
     'test': [
          'test/mrp_procurement.yml',
diff --git a/addons/mrp/board_manufacturing_demo.xml b/addons/mrp/board_manufacturing_demo.xml
deleted file mode 100644
index af8f07d2871..00000000000
--- a/addons/mrp/board_manufacturing_demo.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-        <record id="base.user_root" model="res.users">
-            <field name="action_id" ref="open_board_manufacturing"/>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/project/board_project_demo.xml b/addons/project/board_project_demo.xml
index 6a063405ff3..85bf3140d26 100644
--- a/addons/project/board_project_demo.xml
+++ b/addons/project/board_project_demo.xml
@@ -3,12 +3,9 @@
     <data noupdate="1">
 
         <!--
-		 Administrator shortcut
-		 Demo user startup menu
-		 -->
-        <record id="base.user_root" model="res.users">
-            <field name="action_id" ref="open_board_project"/>
-        </record>
+         Administrator shortcut
+         Demo user startup menu
+         -->
 
         <record id="note_project" model="board.note">
             <field name="name">Don't forget the new development policies.</field>

From f291106692e566de1e318e0807ae3e7128265d3c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 5 Oct 2010 09:59:48 +0200
Subject: [PATCH 09/21] [IMP] mrp_repair: no need to rountrip via string to get
 today's datetime

bzr revid: xmo@openerp.com-20101005075948-1rq455369nr0rz6b
---
 addons/mrp_repair/mrp_repair.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 6cec29650f3..010cb725c5c 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -687,7 +687,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         if type == 'add':
             stock_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Stock')])[0]
             to_invoice = False
-            if guarantee_limit and datetime.strptime(date.today().strftime('%Y-%m-%d'), '%Y-%m-%d') > datetime.strptime(guarantee_limit, '%Y-%m-%d'):
+            if guarantee_limit and datetime.now() > datetime.strptime(guarantee_limit, '%Y-%m-%d'):
                 to_invoice=True
 
             return {'value': {

From a392e830d7a4621b7d4eec6941bcba6c41de70d9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 5 Oct 2010 10:00:13 +0200
Subject: [PATCH 10/21] [IMP] mrp_repair: reverse boolean test to reduce
 nesting

bzr revid: xmo@openerp.com-20101005080013-7ssjz1tnlqe0cqdz
---
 addons/mrp_repair/mrp_repair.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 010cb725c5c..6fe86fd3f2b 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -684,22 +684,24 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
                     }
             }
         produc_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Production')])[0]
-        if type == 'add':
-            stock_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Stock')])[0]
-            to_invoice = False
-            if guarantee_limit and datetime.now() > datetime.strptime(guarantee_limit, '%Y-%m-%d'):
-                to_invoice=True
 
+        if type != 'add':
             return {'value': {
-                        'to_invoice': to_invoice,
-                        'location_id': stock_id,
-                        'location_dest_id': produc_id
-                    }
-            }
-        return {'value': {
                 'to_invoice': False,
                 'location_id': produc_id,
                 'location_dest_id': False
+                }
+            }
+
+        stock_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Stock')])[0]
+        to_invoice = False
+        if guarantee_limit and datetime.now() > datetime.strptime(guarantee_limit, '%Y-%m-%d'):
+            to_invoice=True
+
+        return {'value': {
+            'to_invoice': to_invoice,
+            'location_id': stock_id,
+            'location_dest_id': produc_id
             }
         }
 

From be1a8c1e604749abf7ee3480839b37552209b85e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 5 Oct 2010 10:01:07 +0200
Subject: [PATCH 11/21] [FIX] mrp_repair: typo in variable name

bzr revid: xmo@openerp.com-20101005080107-reomihila8y8g9uj
---
 addons/mrp_repair/mrp_repair.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 6fe86fd3f2b..a4bfe9457e7 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -683,12 +683,12 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
                         'location_dest_id': False
                     }
             }
-        produc_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Production')])[0]
+        product_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Production')])[0]
 
         if type != 'add':
             return {'value': {
                 'to_invoice': False,
-                'location_id': produc_id,
+                'location_id': product_id,
                 'location_dest_id': False
                 }
             }
@@ -701,7 +701,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         return {'value': {
             'to_invoice': to_invoice,
             'location_id': stock_id,
-            'location_dest_id': produc_id
+            'location_dest_id': product_id
             }
         }
 

From 14559bb42e5d4a48ee76dc88f3c539fec5ac620f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 5 Oct 2010 10:03:12 +0200
Subject: [PATCH 12/21] [IMP] mrp_repair: simplify boolean temp variable
 setting

bzr revid: xmo@openerp.com-20101005080312-h3nzrhvjogoc7o6q
---
 addons/mrp_repair/mrp_repair.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index a4bfe9457e7..1a9705ce122 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -683,8 +683,8 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
                         'location_dest_id': False
                     }
             }
-        product_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Production')])[0]
 
+        product_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Production')])[0]
         if type != 'add':
             return {'value': {
                 'to_invoice': False,
@@ -694,10 +694,8 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
             }
 
         stock_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Stock')])[0]
-        to_invoice = False
-        if guarantee_limit and datetime.now() > datetime.strptime(guarantee_limit, '%Y-%m-%d'):
-            to_invoice=True
-
+        to_invoice = (guarantee_limit and
+                      datetime.strptime(guarantee_limit, '%Y-%m-%d') < datetime.now()):
         return {'value': {
             'to_invoice': to_invoice,
             'location_id': stock_id,

From 2300f9b49d9fe3a432bb90201ba4d4f7099949ec Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 5 Oct 2010 10:05:02 +0200
Subject: [PATCH 13/21] [IMP] mrp_repair: make indentation of return dicts
 coherent in onchange_operation_type

bzr revid: xmo@openerp.com-20101005080502-3lehfh2fk7dn5vw5
---
 addons/mrp_repair/mrp_repair.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 1a9705ce122..af44f19052a 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -679,9 +679,9 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         """
         if not type:
             return {'value': {
-                        'location_id': False,
-                        'location_dest_id': False
-                    }
+                'location_id': False,
+                'location_dest_id': False
+                }
             }
 
         product_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Production')])[0]

From 491585cfc27a31741c0fb89535f5b3537733209e Mon Sep 17 00:00:00 2001
From: "RME(OpenERP),JMA(OpenERP)" <>
Date: Tue, 5 Oct 2010 14:12:35 +0530
Subject: [PATCH 14/21] [FIX] account_payment : Missing reference of statement
 line variable fixed

bzr revid: ach@tinyerp.com-20101005084235-5x5wluw3jun63hn1
---
 .../wizard/account_payment_populate_statement.py                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index d223c58316f..7ebb9d933de 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -114,7 +114,7 @@ class account_payment_populate_statement(osv.osv_memory):
                     'voucher_id': voucher_id,
                     }, context=context)
 
-            line_obj.write(cr, uid, [line.id], {'bank_statement_line_id': st_line_id})
+                line_obj.write(cr, uid, [line.id], {'bank_statement_line_id': st_line_id})
         return {'type': 'ir.actions.act_window_close'}
 
 account_payment_populate_statement()

From c36a3d33908bf17dd4ade84985a9c7d7ee213456 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 5 Oct 2010 11:10:22 +0200
Subject: [PATCH 15/21] [FIX] mrp_repair: syntax error typo

bzr revid: xmo@openerp.com-20101005091022-dmwju7zimmja2fzg
---
 addons/mrp_repair/mrp_repair.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index af44f19052a..f7a6837aace 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -695,7 +695,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
 
         stock_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Stock')])[0]
         to_invoice = (guarantee_limit and
-                      datetime.strptime(guarantee_limit, '%Y-%m-%d') < datetime.now()):
+                      datetime.strptime(guarantee_limit, '%Y-%m-%d') < datetime.now())
         return {'value': {
             'to_invoice': to_invoice,
             'location_id': stock_id,

From f8309947a439362dc42672f78c852bbbd5a6b1a1 Mon Sep 17 00:00:00 2001
From: Yogesh Sakhreliya <ysa@tinyerp.com>
Date: Tue, 5 Oct 2010 15:46:39 +0530
Subject: [PATCH 16/21] [REM] remove role_ids field in process xml file.

bzr revid: ysa@tinyerp.com-20101005101639-wnw7ho4fpoigqivt
---
 .../process/customer_invoice_process.xml      |  8 ---
 addons/account/process/statement_process.xml  |  3 -
 .../process/supplier_invoice_process.xml      | 55 ++++++++----------
 .../process/base_contact_process.xml          |  3 -
 .../crm/process/crm_configuration_process.xml |  3 -
 addons/hr/process/hr_process.xml              |  2 -
 .../hr_expense/process/hr_expense_process.xml | 52 ++++++++---------
 .../process/hr_holidays_process.xml           | 56 +++++++++----------
 .../membership/process/membership_process.xml | 39 ++++++-------
 addons/mrp/process/procurement_process.xml    | 20 ++-----
 .../mrp/process/service_product_process.xml   |  1 -
 .../mrp/process/stockable_product_process.xml |  2 -
 .../process/mrp_operation_process.xml         |  4 --
 addons/process/process_view.xml               |  3 -
 addons/product/process/product_process.xml    |  1 -
 addons/project/process/task_process.xml       | 47 ++++++++--------
 .../process/project_scrum_process.xml         |  1 -
 .../process/project_timesheet_process.xml     |  3 -
 addons/sale_crm/process/sale_crm_process.xml  |  4 --
 19 files changed, 115 insertions(+), 192 deletions(-)

diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index 51e8254d20e..b34dca0dbb9 100644
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -122,7 +122,6 @@
         -->
 
         <record id="process_transition_confirmstatementfromdraft0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirm statement&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The accountant confirms the statement.&quot;&quot;&quot;" name="note"/>
@@ -131,7 +130,6 @@
         </record>
 
         <record id="process_transition_analyticinvoice0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From analytic accounts&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft invoices.&quot;&quot;&quot;" name="note"/>
@@ -140,7 +138,6 @@
         </record>
 
         <record id="process_transition_customerinvoice0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Draft invoices are checked, validated and printed.&quot;&quot;&quot;" name="note"/>
@@ -150,7 +147,6 @@
         </record>
 
         <record id="process_transition_validentries0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Accountant validates the accounting entries coming from the invoice.&quot;&quot;&quot;" name="note"/>
@@ -159,7 +155,6 @@
         </record>
 
         <record id="process_transition_entriesreconcile0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Accounting entries&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Accounting entries are the first input of the reconciliation.&quot;&quot;&quot;" name="note"/>
@@ -168,7 +163,6 @@
         </record>
 
         <record id="process_transition_statemententries0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Manual or automatic creation of payment entries according to the statements&quot;&quot;&quot;" name="note"/>
@@ -177,7 +171,6 @@
         </record>
 
         <record id="process_transition_paymentreconcile0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Payment entries&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Payment entries are the second input of the reconciliation.&quot;&quot;&quot;" name="note"/>
@@ -186,7 +179,6 @@
         </record>
 
         <record id="process_transition_reconcilepaid0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Payment&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;As soon as the reconciliation is done, the invoice can be paid.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml
index 704f9f47025..01fd4bc1bfe 100644
--- a/addons/account/process/statement_process.xml
+++ b/addons/account/process/statement_process.xml
@@ -65,7 +65,6 @@
     -->
 
     	<record id="process_transition_filestatement0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Automatic import of the bank statement&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Import of the statement in the system from an electronic file&quot;&quot;&quot;" name="note"/>
@@ -74,7 +73,6 @@
         </record>
 
         <record id="process_transition_invoicemanually0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Manual entry&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;A statement with manual entries becomes a draft statement.&quot;&quot;&quot;" name="note"/>
@@ -84,7 +82,6 @@
         </record>
 
         <record id="process_transition_invoiceimport0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Import from invoice or payment&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Import of the statement in the system from a supplier or customer invoice&quot;&quot;&quot;" name="note"/>
diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml
index e24431c48b4..8635b083d72 100644
--- a/addons/account/process/supplier_invoice_process.xml
+++ b/addons/account/process/supplier_invoice_process.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-        
-        <!--    
-            Process    
+
+        <!--
+            Process
         -->
-        
+
         <record id="process_process_supplierinvoiceprocess0" model="process.process">
             <field eval="1" name="active"/>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;Supplier Invoice&quot;&quot;&quot;" name="name"/>
         </record>
-        
-        <!--    
+
+        <!--
             Process Node
         -->
-        
+
         <record id="process_node_analyticcost0" model="process.node">
             <field name="menu_id" ref="account.account_analytic_def_account"/>
             <field name="model_id" ref="analytic.model_account_analytic_account"/>
@@ -26,7 +26,7 @@
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'close')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_supplierdraftinvoices0" model="process.node">
             <field name="menu_id" ref="account.menu_action_invoice_tree2"/>
             <field name="model_id" ref="account.model_account_invoice"/>
@@ -37,7 +37,7 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_supplierinvoiceinvoice0" model="process.node">
             <field name="menu_id" ref="account.menu_finance_payables"/>
             <field name="model_id" ref="account.model_account_invoice"/>
@@ -48,7 +48,7 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_supplierbankstatement0" model="process.node">
             <field name="menu_id" ref="account.menu_bank_statement_tree"/>
             <field name="model_id" ref="account.model_account_bank_statement"/>
@@ -60,7 +60,7 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_supplieraccountingentries0" model="process.node">
             <field name="menu_id" ref="account.menu_action_move_journal_line_form"/>
             <field name="model_id" ref="account.model_account_move"/>
@@ -70,7 +70,7 @@
             <field name="process_id" ref="process_process_supplierinvoiceprocess0"/>
             <field eval="0" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_supplierpaymentorder0" model="process.node">
             <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_line"/>
@@ -81,7 +81,7 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_supplierreconciliation0" model="process.node">
             <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_reconcile"/>
@@ -92,7 +92,7 @@
             <field eval="&quot;&quot;&quot;object.state=='valid'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_supplierpaidinvoice0" model="process.node">
             <field name="menu_id" ref="account.menu_action_invoice_tree1"/>
             <field name="model_id" ref="account.model_account_invoice"/>
@@ -103,22 +103,20 @@
             <field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-        
-        <!--    
+
+        <!--
             Process Transition
         -->
-        
+
 		<record id="process_transition_supplieranalyticcost0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From analytic accounts&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft supplier invoices.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_supplierdraftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_analyticcost0"/>
         </record>
-        
+
         <record id="process_transition_suppliercustomerinvoice0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Draft invoices are validated. &quot;&quot;&quot;" name="note"/>
@@ -126,51 +124,46 @@
             <field model="process.node" name="source_node_id" ref="process_node_supplierdraftinvoices0"/>
             <field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/>
         </record>
-    
+
         <record id="process_transition_suppliervalidentries0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Accountant validates the accounting entries coming from the invoice. &quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_supplieraccountingentries0"/>
             <field model="process.node" name="source_node_id" ref="process_node_supplierinvoiceinvoice0"/>
         </record>
-    
+
         <record id="process_transition_supplierentriesreconcile0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Accounting entries&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Accounting entries are an input of the reconciliation.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_supplierreconciliation0"/>
             <field model="process.node" name="source_node_id" ref="process_node_supplieraccountingentries0"/>
         </record>
-        
+
         <record id="process_transition_paymentorderbank0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Payment entries&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The payment order is sent to the bank.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_supplierbankstatement0"/>
             <field model="process.node" name="source_node_id" ref="process_node_supplierpaymentorder0"/>
         </record>
-        
+
         <record id="process_transition_paymentorderreconcilation0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Bank statements are entered in the system.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_supplierreconciliation0"/>
             <field model="process.node" name="source_node_id" ref="process_node_supplierbankstatement0"/>
         </record>
-        
+
         <record id="process_transition_supplierreconcilepaid0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;System payment&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;As soon as the reconciliation is done, the invoice's state turns to “done” (i.e. paid) in the system.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_supplierpaidinvoice0"/>
             <field model="process.node" name="source_node_id" ref="process_node_supplierreconciliation0"/>
         </record>
-        
+
    </data>
 </openerp>
diff --git a/addons/base_contact/process/base_contact_process.xml b/addons/base_contact/process/base_contact_process.xml
index 876905c1812..f5b754e7ad9 100644
--- a/addons/base_contact/process/base_contact_process.xml
+++ b/addons/base_contact/process/base_contact_process.xml
@@ -60,7 +60,6 @@
 	-->
 
 		<record id="process_transition_contacttofunction0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Contact to function&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Defines contacts and functions.&quot;&quot;&quot;" name="note"/>
@@ -69,7 +68,6 @@
 		</record>
 
 		<record id="process_transition_functiontoaddress0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Function to address&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Define functions and address.&quot;&quot;&quot;" name="note"/>
@@ -78,7 +76,6 @@
 		</record>
 
 		<record id="process_transition_partnertoaddress0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Partner to address&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Define partners and their addresses.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/crm/process/crm_configuration_process.xml b/addons/crm/process/crm_configuration_process.xml
index 362c8982b96..790aad82fc8 100644
--- a/addons/crm/process/crm_configuration_process.xml
+++ b/addons/crm/process/crm_configuration_process.xml
@@ -57,7 +57,6 @@
         -->
 
         <record id="process_transition_leadopportunity0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Prospect Opportunity&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Creating business opportunities from Leads&quot;&quot;&quot;" name="note"/>
@@ -66,7 +65,6 @@
         </record>
 
         <record id="process_transition_leadpartner0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Prospect Partner&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Prospect is converting to business partner&quot;&quot;&quot;" name="note"/>
@@ -75,7 +73,6 @@
         </record>
 
         <record id="process_transition_opportunitymeeting0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Opportunity Meeting&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Normal or phone meeting for opportunity&quot;&quot;&quot;" name="note"/>
diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml
index 5376936afe3..1471fbe5352 100644
--- a/addons/hr/process/hr_process.xml
+++ b/addons/hr/process/hr_process.xml
@@ -51,7 +51,6 @@
 		-->
 
 		<record id="process_transition_employeeuser0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Link a user to an employee&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;The field Relate'd user in the Employee form allows to link the OpenERP user (and his rights and role) to the employee.&quot;&quot;&quot;" name="note"/>
@@ -60,7 +59,6 @@
 		</record>
 
 		<record id="process_transition_contactofemployee0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Link the employee to information&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;In the Employee form, there are different kind of information like Contact information.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/hr_expense/process/hr_expense_process.xml b/addons/hr_expense/process/hr_expense_process.xml
index 20d8a60ca1a..bcb9649be4c 100644
--- a/addons/hr_expense/process/hr_expense_process.xml
+++ b/addons/hr_expense/process/hr_expense_process.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-	
+
 		<!--
 			Process
 		-->
-    
+
 		<record id="process_process_expenseprocess0" model="process.process">
 			<field eval="1" name="active"/>
 			<field name="model_id" ref="model_hr_expense_expense"/>
 			<field eval="&quot;&quot;&quot;Expense&quot;&quot;&quot;" name="name"/>
 		</record>
-		
+
 		<!--
 			Process Node
 		-->
-		
+
 		<record id="process_node_draftexpenses0" model="process.node">
 			<field name="menu_id" ref="menu_expense_all"/>
 			<field name="model_id" ref="model_hr_expense_expense"/>
@@ -26,7 +26,7 @@
 			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="1" name="flow_start"/>
 		</record>
-		
+
 		<record id="process_node_confirmedexpenses0" model="process.node">
 			<field name="menu_id" ref="menu_expense_all"/>
 			<field name="model_id" ref="model_hr_expense_expense"/>
@@ -37,7 +37,7 @@
 			<field eval="&quot;&quot;&quot;object.state=='confirm'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 		<record id="process_node_refused0" model="process.node">
 			<field name="menu_id" ref="menu_expense_all"/>
 			<field name="model_id" ref="model_hr_expense_expense"/>
@@ -48,7 +48,7 @@
 			<field eval="&quot;&quot;&quot;object.state=='canceled'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 		<record id="process_node_approved0" model="process.node">
 			<field name="menu_id" ref="menu_expense_all"/>
 			<field name="model_id" ref="model_hr_expense_expense"/>
@@ -59,7 +59,7 @@
 			<field eval="&quot;&quot;&quot;object.state=='accepted'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 		<record id="process_node_supplierinvoice0" model="process.node">
 			<field name="menu_id" ref="account.menu_action_invoice_tree2"/>
 			<field name="model_id" ref="account.model_account_invoice"/>
@@ -70,7 +70,7 @@
 			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 		<record id="process_node_reimbursement0" model="process.node">
 			<field name="menu_id" ref="account.menu_action_invoice_tree2"/>
 			<field name="model_id" ref="account.model_account_invoice"/>
@@ -81,7 +81,7 @@
 			<field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 		<record id="process_node_reinvoicing0" model="process.node">
 			<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
 			<field name="model_id" ref="account.model_account_invoice"/>
@@ -92,96 +92,90 @@
 			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 		<!--
 			Process Transition
 		-->
-		
+
 		<record id="process_transition_confirmexpense0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirm expense&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Expense is confirmed.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_confirmedexpenses0"/>
             <field model="process.node" name="source_node_id" ref="process_node_draftexpenses0"/>
         </record>
-        
+
         <record id="process_transition_refuseexpense0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Refuse expense&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Expense is refused.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_refused0"/>
             <field model="process.node" name="source_node_id" ref="process_node_confirmedexpenses0"/>
         </record>
-		
+
 		<record id="process_transition_approveexpense0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Approve expense&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Expense is approved.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_approved0"/>
             <field model="process.node" name="source_node_id" ref="process_node_confirmedexpenses0"/>
         </record>
-        
+
         <record id="process_transition_approveinvoice0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Supplier Invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Creates supplier invoice.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_supplierinvoice0"/>
             <field model="process.node" name="source_node_id" ref="process_node_approved0"/>
         </record>
-        
+
         <record id="process_transition_reimburseexpense0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Reimburse expense&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;After creating invoice, reimburse expenses&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_reimbursement0"/>
             <field model="process.node" name="source_node_id" ref="process_node_supplierinvoice0"/>
         </record>
-        
+
         <record id="process_transition_reimbursereinvoice0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Reinvoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Create Customer invoice&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_reinvoicing0"/>
             <field model="process.node" name="source_node_id" ref="process_node_reimbursement0"/>
         </record>
-        
+
         <!--
 			Process Transition Action
 		-->
-		
+
 		<record id="process_transition_action_confirm0" model="process.transition.action">
 			<field eval="&quot;&quot;&quot;expense_confirm&quot;&quot;&quot;" name="action"/>
 			<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
 			<field eval="&quot;&quot;&quot;Confirm&quot;&quot;&quot;" name="name"/>
 			<field name="transition_id" ref="process_transition_confirmexpense0"/>
 		</record>
-		
+
 		<record id="process_transition_action_refuse0" model="process.transition.action">
 			<field eval="&quot;&quot;&quot;expense_canceled&quot;&quot;&quot;" name="action"/>
 			<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
 			<field eval="&quot;&quot;&quot;Refuse&quot;&quot;&quot;" name="name"/>
 			<field name="transition_id" ref="process_transition_refuseexpense0"/>
 		</record>
-		
+
 		<record id="process_transition_action_accept0" model="process.transition.action">
 			<field eval="&quot;&quot;&quot;expense_accept&quot;&quot;&quot;" name="action"/>
 			<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
 			<field eval="&quot;&quot;&quot;Accept&quot;&quot;&quot;" name="name"/>
 			<field name="transition_id" ref="process_transition_approveexpense0"/>
 		</record>
-		
+
 		<record id="process_transition_action_supplierinvoice0" model="process.transition.action">
 			<field eval="&quot;&quot;&quot;action_invoice_create&quot;&quot;&quot;" name="action"/>
 			<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
 			<field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
 			<field name="transition_id" ref="process_transition_approveinvoice0"/>
 		</record>
-		
+
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/hr_holidays/process/hr_holidays_process.xml b/addons/hr_holidays/process/hr_holidays_process.xml
index 2026902dd5c..82285ff1209 100644
--- a/addons/hr_holidays/process/hr_holidays_process.xml
+++ b/addons/hr_holidays/process/hr_holidays_process.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>	
-	
+	<data>
+
 		<!--
 			Process
 		-->
-	
+
 		<record id="process_process_holidaysprocess0" model="process.process">
 			<field eval="&quot;&quot;&quot;Holidays&quot;&quot;&quot;" name="name"/>
 			<field name="model_id" ref="hr_holidays.model_hr_holidays"/>
 			<field eval="1" name="active"/>
 		</record>
-		
+
 		<!--
 			Process Node
 		-->
-		
+
 		<record id="process_node_holidaysdefinition0" model="process.node">
 			<field name="menu_id" ref="hr_holidays.menu_open_ask_holidays_new"/>
 			<field name="model_id" ref="hr_holidays.model_hr_holidays_per_user"/>
@@ -25,7 +25,7 @@
 			<field name="process_id" ref="process_process_holidaysprocess0"/>
 			<field eval="1" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_holidaysrequest0" model="process.node">
 			<field name="menu_id" ref="hr_holidays.menu_open_ask_holidays_new"/>
 			<field name="model_id" ref="hr_holidays.model_hr_holidays"/>
@@ -36,7 +36,7 @@
 			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_refused0" model="process.node">
 			<field name="menu_id" ref="hr_holidays.menu_open_ask_holidays_new"/>
 			<field name="model_id" ref="hr_holidays.model_hr_holidays"/>
@@ -47,7 +47,7 @@
 			<field eval="&quot;&quot;&quot;object.state=='refuse'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_approved0" model="process.node">
 			<field name="menu_id" ref="hr_holidays.menu_open_ask_holidays_new"/>
 			<field name="model_id" ref="hr_holidays.model_hr_holidays"/>
@@ -58,7 +58,7 @@
 			<field eval="&quot;&quot;&quot;object.state=='validate'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_calendar0" model="process.node">
 			<field name="menu_id" ref="hr_holidays.menu_open_ask_holidays_new"/>
 			<field name="model_id" ref="hr_holidays.model_hr_holidays"/>
@@ -69,7 +69,7 @@
 			<field eval="&quot;&quot;&quot;object.state=='validate'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_holidays0" model="process.node">
 			<field name="menu_id" ref="hr_holidays.menu_open_ask_holidays"/>
 			<field name="model_id" ref="hr_holidays.model_hr_holidays"/>
@@ -80,7 +80,7 @@
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'validate', 'confirm', 'refuse', 'cancel')&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 		<record id="process_node_legaldeclaration0" model="process.node">
 			<field name="menu_id" ref="hr_holidays.menu_open_ask_holidays"/>
 			<field name="model_id" ref="hr_holidays.model_hr_holidays"/>
@@ -89,91 +89,85 @@
 			<field eval="&quot;&quot;&quot;Legal Declaration Document to declare new employee&quot;&quot;&quot;" name="note"/>
 			<field name="process_id" ref="hr.process_process_employeecontractprocess0"/>
 			<field eval="0" name="flow_start"/>
-		</record>	
-		
+		</record>
+
 		<!--
 			Process Transition
 		-->
-		
-			
+
+
 		<record id="process_transition_employeedeclaration0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Employee Declaration&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Document for employee&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_legaldeclaration0"/>
 			<field model="process.node" name="source_node_id" ref="hr.process_node_employee0"/>
 		</record>
-		
+
 		<record id="process_transition_holidaysdefrequest0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Holidays def Request&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;If holidays available, employee can take it and fill it.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_holidaysrequest0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_holidaysdefinition0"/>
 		</record>
-		
+
 		<record id="process_transition_refusedrequest0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Refused Request&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Request is refused.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_refused0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_holidaysrequest0" />
 		</record>
-		
+
 		<record id="process_transition_approvedrequest0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Approved Request&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Request is approved.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_approved0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_holidaysrequest0"/>
 		</record>
-		
+
 		<record id="process_transition_setholiday0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Set Holiday&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Holiday is set in the calendar.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_calendar0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_approved0"/>
 		</record>
-		
+
 		<record id="process_transition_employeeholidays0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Employee Holidays&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Employee get holidays&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_holidays0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_legaldeclaration0"/>
 		</record>
-		
+
 		<!--
 			Process Transition Action
 		-->
-		
+
 		<record id="process_transition_action_confirm0" model="process.transition.action">
 			<field eval="&quot;&quot;&quot;holidays_confirm&quot;&quot;&quot;" name="action"/>
 			<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
 			<field eval="&quot;&quot;&quot;Confirm&quot;&quot;&quot;" name="name"/>
 			<field name="transition_id" ref="process_transition_holidaysdefrequest0"/>
 		</record>
-		
+
 		<record id="process_transition_action_reufse0" model="process.transition.action">
 			<field eval="&quot;&quot;&quot;holidays_refuse&quot;&quot;&quot;" name="action"/>
 			<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
 			<field eval="&quot;&quot;&quot;Refuse&quot;&quot;&quot;" name="name"/>
 			<field name="transition_id" ref="process_transition_refusedrequest0"/>
 		</record>
-		
+
 		<record id="process_transition_action_validate0" model="process.transition.action">
 			<field eval="&quot;&quot;&quot;holidays_validate&quot;&quot;&quot;" name="action"/>
 			<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
 			<field eval="&quot;&quot;&quot;Validate&quot;&quot;&quot;" name="name"/>
 			<field name="transition_id" ref="process_transition_approvedrequest0"/>
 		</record>
-		
+
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/membership/process/membership_process.xml b/addons/membership/process/membership_process.xml
index 4a6df4c0e03..730f01bd36b 100644
--- a/addons/membership/process/membership_process.xml
+++ b/addons/membership/process/membership_process.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-	
+
 		<!--
 			Process
 		-->
-	
+
 		<record id="process_process_membershipprocess0" model="process.process">
 			<field eval="&quot;&quot;&quot;Membership Process&quot;&quot;&quot;" name="name"/>
 			<field name="model_id" ref="base.model_res_partner"/>
 			<field eval="1" name="active"/>
 		</record>
-		
+
 		<!--
 			Process Node
 		-->
-	
+
 		<record id="process_node_membershipproduct0" model="process.node">
 			<field name="menu_id" ref="membership.menu_membership_products"/>
 			<field name="model_id" ref="product.model_product_product"/>
@@ -25,7 +25,7 @@
 			<field name="process_id" ref="process_process_membershipprocess0"/>
 			<field eval="1" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_waitingmember0" model="process.node">
 			<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
 			<field name="model_id" ref="account.model_account_invoice"/>
@@ -35,7 +35,7 @@
 			<field name="process_id" ref="process_process_membershipprocess0"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_invoicedmember0" model="process.node">
 			<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
 			<field name="model_id" ref="account.model_account_invoice"/>
@@ -45,7 +45,7 @@
 			<field name="process_id" ref="process_process_membershipprocess0"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_paidmember0" model="process.node">
 			<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
 			<field name="model_id" ref="account.model_account_invoice"/>
@@ -56,7 +56,7 @@
 			<field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_setassociation0" model="process.node">
 			<field name="menu_id" ref="membership.menu_members"/>
 			<field name="model_id" ref="base.model_res_partner"/>
@@ -67,7 +67,7 @@
 			<field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_associatedmember0" model="process.node">
 			<field name="menu_id" ref="membership.menu_members"/>
 			<field name="model_id" ref="base.model_res_partner"/>
@@ -78,62 +78,57 @@
 			<field eval="&quot;&quot;&quot;object.state=='associated'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 		<!--
 			Process Transition
 		-->
-	
+
 		<record id="process_transition_producttomember0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Product to member&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Define product for membership.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_waitingmember0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_membershipproduct0"/>
 		</record>
-	
+
 		<record id="process_transition_waitingtoinvoice0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Waiting to invoice&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Draft invoice is now open.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_invoicedmember0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_waitingmember0"/>
 		</record>
-	
+
 		<record id="process_transition_action_create0" model="process.transition.action">
 			<field eval="&quot;&quot;&quot;invoice_open&quot;&quot;&quot;" name="action"/>
 			<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
 			<field eval="&quot;&quot;&quot;Create&quot;&quot;&quot;" name="name"/>
 			<field name="transition_id" ref="process_transition_waitingtoinvoice0"/>
 		</record>
-	
+
 		<record id="process_transition_invoicetopaid0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Invoice to paid&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Invoice is be paid.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_paidmember0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_invoicedmember0"/>
 		</record>
-	
+
 		<record id="process_transition_invoicetoassociate0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;invoice to associate&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Invoiced member may be Associated member.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_associatedmember0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_invoicedmember0"/>
 		</record>
-	
+
 		<record id="process_transition_associationpartner0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Association Partner&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Associated partner.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_associatedmember0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_setassociation0"/>
 		</record>
-		
+
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index ca08481d4e4..5b9c8d8f661 100644
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-    
+
 
         <record id="process_node_productionorder0" model="process.node">
             <field name="menu_id" ref="mrp.menu_mrp_production_action"/>
@@ -14,7 +14,7 @@
             <field eval="1" name="flow_start"/>
         </record>
 
-        
+
         <record id="process_node_minimumstockrule0" model="process.node">
             <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
             <field name="model_id" ref="procurement.model_stock_warehouse_orderpoint"/>
@@ -36,7 +36,7 @@
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_stockproduct1" model="process.node">
             <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
@@ -60,7 +60,7 @@
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_serviceproduct1" model="process.node">
             <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
@@ -128,7 +128,6 @@
             <field eval="0" name="flow_start"/>
         </record>
         <record id="process_transition_servicemto0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Make to Order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;If the service has a 'Produce' supply method, this creates a task in the project management module of OpenERP.&quot;&quot;&quot;" name="note"/>
@@ -137,7 +136,6 @@
         </record>
 
         <record id="process_transition_servicemts0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Make to Stock&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;This is used in case of a service without any impact in the system, a training session for instance.&quot;&quot;&quot;" name="note"/>
@@ -146,7 +144,6 @@
         </record>
 
         <record id="process_transition_stockmts0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Make to Stock&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule.&quot;&quot;&quot;" name="note"/>
@@ -155,7 +152,6 @@
         </record>
 
         <record id="process_transition_stockproduct0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Make to Order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The system creates an order (production or purchased) depending on the sold quantity and the products parameters.&quot;&quot;&quot;" name="note"/>
@@ -164,7 +160,6 @@
         </record>
 
         <record id="process_transition_productionprocureproducts0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement of raw material&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;In order to supply raw material (to be purchased or produced), the production order creates as much procurement orders as components listed in the BOM, through a run of the schedulers (MRP).&quot;&quot;&quot;" name="note"/>
@@ -173,7 +168,6 @@
         </record>
 
         <record id="process_transition_minimumstockprocure0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;'Minimum stock rule' material&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The 'Minimum stock rule' allows the system to create procurement orders automatically as soon as the minimum stock is reached.&quot;&quot;&quot;" name="note"/>
@@ -182,7 +176,6 @@
         </record>
 
         <record id="process_transition_procurestockableproduct0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement of stockable Products&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Depending on the chosen method to supply the stockable products, the procurement order creates a RFQ, a production order, ... &quot;&quot;&quot;" name="note"/>
@@ -191,7 +184,6 @@
         </record>
 
         <record id="process_transition_procureserviceproduct0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement of services&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Depending on the chosen method to 'supply' the service, the procurement order creates a RFQ for a subcontracting purchase order or waits until the service is done (= the delivery of the products).&quot;&quot;&quot;" name="note"/>
@@ -200,7 +192,6 @@
         </record>
 
         <record id="process_transition_purchaseprocure0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Automatic RFQ&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The system launches automatically a RFQ to the preferred supplier.&quot;&quot;&quot;" name="note"/>
@@ -209,7 +200,6 @@
         </record>
 
          <record id="process_transition_producttostockrules0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement rule&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The Minimum Stock Rule is an automatic procurement rule based on a mini and maxi quantity. It's available in the Inventory management menu and configured by product.&quot;&quot;&quot;" name="note"/>
@@ -218,7 +208,6 @@
         </record>
 
         <record id="process_transition_billofmaterialrouting0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Material Routing&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The Bill of Material is linked to a routing, i.e. the succession of work centers.&quot;&quot;&quot;" name="note"/>
@@ -227,7 +216,6 @@
         </record>
 
         <record id="process_transition_bom0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Manufacturing decomposition&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The Bill of Material is the product's decomposition. The components (that are products themselves) can also have their own Bill of Material (multi-level).&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml
index c23ed6e7a65..74353d02e8c 100644
--- a/addons/mrp/process/service_product_process.xml
+++ b/addons/mrp/process/service_product_process.xml
@@ -36,7 +36,6 @@
 		-->
 
 		<record id="process_transition_servicerfq0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;To Buy&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;If the service has a 'Buy' supply method, this creates a RFQ, a subcontracting demand for instance.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
index 9dc45f0515f..c845801194b 100644
--- a/addons/mrp/process/stockable_product_process.xml
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -66,7 +66,6 @@
 		-->
 
 		<record id="process_transition_stockrfq0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;To Buy&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;In case the Supply method of the product is Buy, the system creates a purchase order.&quot;&quot;&quot;" name="note"/>
@@ -75,7 +74,6 @@
 		</record>
 
 		<record id="process_transition_stockproduction0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;To Produce&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;In case the Supply method of the product is Produce, the system creates a production order.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp_operations/process/mrp_operation_process.xml b/addons/mrp_operations/process/mrp_operation_process.xml
index 2b59b87cfaf..686f59fe27f 100644
--- a/addons/mrp_operations/process/mrp_operation_process.xml
+++ b/addons/mrp_operations/process/mrp_operation_process.xml
@@ -72,7 +72,6 @@
 		-->
 
 		<record id="process_transition_productionstart0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Creation of the work order&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;The work orders are created on the basis of the production order.&quot;&quot;&quot;" name="note"/>
@@ -81,7 +80,6 @@
 		</record>
 
 		<record id="process_transition_workstartoperation0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Details of the work order&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;There is 1 work order per work center. The information about the number of cycles or the cycle time.&quot;&quot;&quot;" name="note"/>
@@ -90,7 +88,6 @@
 		</record>
 
 		<record id="process_transition_startdoneoperation0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Operation done&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;When the operation is finished, the operator updates the system by finishing the work order.&quot;&quot;&quot;" name="note"/>
@@ -99,7 +96,6 @@
 		</record>
 
 		<record id="process_transition_startcanceloperation0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Operation cancelled&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;When the operation needs to be cancelled, you can do it in the work order form.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 72cb18499e2..1a5714437b8 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -282,9 +282,6 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Roles Required">
-                        <field name="role_ids" colspan="4" nolabel="1"/>
-                    </page>
                     <page string="Roles from Workflow">
                         <field name="transition_ids" colspan="4" nolabel="1"/>
                     </page>
diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml
index c8f72be4df7..03ce904abad 100644
--- a/addons/product/process/product_process.xml
+++ b/addons/product/process/product_process.xml
@@ -40,7 +40,6 @@
     -->
 
         <record id="process_transition_supplierofproduct0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Supplier of the product&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;1 or several supplier(s) can be linked to a product. All information stands in the product form.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml
index b3490ce4cf1..1c5fba12596 100644
--- a/addons/project/process/task_process.xml
+++ b/addons/project/process/task_process.xml
@@ -2,20 +2,20 @@
 <openerp>
     <data>
 
-    <!--    
+    <!--
         Process
     -->
-    
+
         <record id="process_process_tasksprocess0" model="process.process">
             <field eval="1" name="active"/>
             <field name="model_id" ref="project.model_project_task"/>
             <field eval="&quot;&quot;&quot;Tasks&quot;&quot;&quot;" name="name"/>
         </record>
-        
-    <!--    
+
+    <!--
         Process Node
     -->
-    
+
         <record id="process_node_taskbydelegate0" model="process.node">
             <field name="menu_id" ref="project.menu_action_view_task"/>
             <field name="model_id" ref="project.model_project_task"/>
@@ -26,7 +26,7 @@
             <field eval="&quot;&quot;&quot;object.state in ('open', 'pending')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_drafttask0" model="process.node">
             <field name="menu_id" ref="project.menu_action_view_task"/>
             <field name="model_id" ref="project.model_project_task"/>
@@ -37,7 +37,7 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_opentask0" model="process.node">
             <field name="menu_id" ref="project.menu_action_view_task"/>
             <field name="model_id" ref="project.model_project_task"/>
@@ -48,7 +48,7 @@
             <field eval="&quot;&quot;&quot;object.state=='open'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_donetask0" model="process.node">
             <field name="menu_id" ref="project.menu_action_view_task"/>
             <field name="model_id" ref="project.model_project_task"/>
@@ -59,77 +59,74 @@
             <field eval="&quot;&quot;&quot;object.state=='done'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-    
-    <!--    
+
+    <!--
         Process Transition
     -->
-        
+
         <record id="process_transition_delegate0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Delegate&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Delegates tasks to the other user&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_drafttask0"/>
             <field model="process.node" name="source_node_id" ref="process_node_taskbydelegate0"/>
         </record>
-    
+
         <record id="process_transition_draftopentask0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Draft Open task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;From draft state, it will come into the open state.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_opentask0"/>
             <field model="process.node" name="source_node_id" ref="process_node_drafttask0"/>
         </record>
-    
+
         <record id="process_transition_opendonetask0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Open Done Task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;When task is completed, it will come into the done state.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_donetask0"/>
             <field model="process.node" name="source_node_id" ref="process_node_opentask0"/>
         </record>
-    
-        
-        <!--    
+
+
+        <!--
         	Process Action
     	-->
-        
+
         <record id="process_transition_action_draftopentask0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;do_open&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
             <field eval="&quot;&quot;&quot;Open&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_draftopentask0"/>
         </record>
-        
+
         <record id="process_transition_action_draftcanceltask0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;do_cancel&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
             <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_draftopentask0"/>
         </record>
-        
+
         <record id="process_transition_action_openpendingtask0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;do_pending&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
             <field eval="&quot;&quot;&quot;Set pending&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_opendonetask0"/>
         </record>
-        
+
         <record id="process_transition_action_opendrafttask0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;do_draft&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
             <field eval="&quot;&quot;&quot;Draft&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_opendonetask0"/>
         </record>
-        
+
         <record id="process_transition_action_opencanceltask0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;do_cancel&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
             <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_opendonetask0"/>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/project_scrum/process/project_scrum_process.xml b/addons/project_scrum/process/project_scrum_process.xml
index 9700677c100..b5503f0127c 100644
--- a/addons/project_scrum/process/project_scrum_process.xml
+++ b/addons/project_scrum/process/project_scrum_process.xml
@@ -22,7 +22,6 @@
         -->
 
         <record id="process_transition_backlogtask0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Backlog Task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;From backlog create task.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/project_timesheet/process/project_timesheet_process.xml b/addons/project_timesheet/process/project_timesheet_process.xml
index 4bb6a6de381..aea15d814c1 100644
--- a/addons/project_timesheet/process/project_timesheet_process.xml
+++ b/addons/project_timesheet/process/project_timesheet_process.xml
@@ -43,7 +43,6 @@
         -->
 
         <record id="process_transition_filltimesheet0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Fill Timesheet&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Task summary is comes into the timesheet line&quot;&quot;&quot;" name="note"/>
@@ -52,7 +51,6 @@
         </record>
 
         <record id="process_transition_taskencoding0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Task encoding&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Encode how much time u spent on your task&quot;&quot;&quot;" name="note"/>
@@ -61,7 +59,6 @@
         </record>
 
         <record id="process_transition_taskinvoice0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Task invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;After task is completed, Create its invoice.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml
index 44f78fcdd55..721508a2ba5 100644
--- a/addons/sale_crm/process/sale_crm_process.xml
+++ b/addons/sale_crm/process/sale_crm_process.xml
@@ -39,7 +39,6 @@
 
 
         <record id="process_transition_crmopportunityquotation" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Crm opportunity quotation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Opportunity goes into the quotation&quot;&quot;&quot;" name="note"/>
@@ -49,7 +48,6 @@
 
 
         <record id="process_transition_opportunityquotation0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Opportunity Quotation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Opportunity convert into quotation&quot;&quot;&quot;" name="note"/>
@@ -58,7 +56,6 @@
         </record>
 
         <record id="process_transition_opportunitypricelist0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Opportunity Pricelist&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Opporunity convert to the Pricelist&quot;&quot;&quot;" name="note"/>
@@ -67,7 +64,6 @@
         </record>
 
         <record id="process_transition_opportunityanalytic0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Opportunity Analytic&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Analytic Account&quot;&quot;&quot;" name="note"/>

From 5d8831174421c3965f5427e7dddbb86c04b26193 Mon Sep 17 00:00:00 2001
From: Yogesh Sakhreliya <ysa@tinyerp.com>
Date: Tue, 5 Oct 2010 16:58:43 +0530
Subject: [PATCH 17/21] remove role_ids field in process xml files.

bzr revid: ysa@tinyerp.com-20101005112843-gnz66tqm1kjw2udx
---
 .../process/hr_timesheet_sheet_process.xml                  | 6 ------
 addons/sale/process/sale_process.xml                        | 2 --
 2 files changed, 8 deletions(-)

diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
index 22453dccfa4..7c259016fca 100644
--- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
+++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
@@ -101,7 +101,6 @@
         </record>
 
         <record id="process_transition_attendancetimesheet0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Sign in/out&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The employee signs in and signs out.&quot;&quot;&quot;" name="note"/>
@@ -110,7 +109,6 @@
         </record>
 
         <record id="process_transition_timesheetdraft0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The timesheet line represents the time spent by the employee on a specific service provided.&quot;&quot;&quot;" name="note"/>
@@ -119,7 +117,6 @@
         </record>
 
         <record id="process_transition_confirmtimesheet0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirmation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The employee periodically confirms his own timesheets.&quot;&quot;&quot;" name="note"/>
@@ -129,7 +126,6 @@
         </record>
 
         <record id="process_transition_validatetimesheet0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The project manager validates the timesheets.&quot;&quot;&quot;" name="note"/>
@@ -138,7 +134,6 @@
         </record>
 
         <record id="process_transition_invoiceontimesheet0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Billing&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The invoice is created based on the timesheet.&quot;&quot;&quot;" name="note"/>
@@ -147,7 +142,6 @@
         </record>
 
         <record id="process_transition_tasktimesheet0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Task timesheet&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Moves task entry into the timesheet line&quot;&quot;&quot;" name="note"/>
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 4d6ca31d973..2c61e55c4e4 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -189,7 +189,6 @@
         </record>
 
         <record id="process_transition_saleorderprocurement0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement of sold material&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;For every sale order line, a procurement order is created to supply the sold product.&quot;&quot;&quot;" name="note"/>
@@ -198,7 +197,6 @@
         </record>
 
         <record id="process_transition_saleinvoice0" model="process.transition">
-            <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From a sale order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;A sale order generates an invoice, as soon as it is confirmed by the salesman. Depending on the Invoicing control of the sale order, the invoice is based on delivered or on ordered quantities.&quot;&quot;&quot;" name="note"/>

From 3cb1f0aad6628fa211dcd7e4703f0dceb1c935fe Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 5 Oct 2010 15:06:14 +0200
Subject: [PATCH 18/21] [IMP] event: usability improvements

bzr revid: qdp-launchpad@tinyerp.com-20101005130614-abozhag180chadyo
---
 addons/event/event.py       |  2 +-
 addons/event/event_view.xml | 51 ++++++++++++++++++-------------------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index ea4a9cf9b8b..88910f01914 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -303,7 +303,7 @@ class event_registration(osv.osv):
         'name': fields.char('Summary', size=124,  readonly=True, states={'draft': [('readonly', False)]}),
         'email_cc': fields.text('CC', size=252 , readonly=False, states={'done': [('readonly', True)]}, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
         'nb_register': fields.integer('Quantity', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Number of Registrations or Tickets"),
-        'event_id': fields.many2one('event.event', 'Event Related', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
         "partner_invoice_id": fields.many2one('res.partner', 'Partner Invoiced', readonly=True, states={'draft': [('readonly', False)]}),
         "contact_id": fields.many2one('res.partner.contact', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}), #TODO: filter only the contacts that have a function into the selected partner_id
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index f58a948fad2..27874237332 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -219,27 +219,27 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <group col="10" colspan="4">
-                        <filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'confirm'))]" help="Current Events"/>
-                        <filter icon="terp-camera_test" string="Open" domain="[('state','=','confirm')]" help="Open Events"/>
+                        <filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/>
+                        <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
                         <separator orientation="vertical"/>
-                        <field name="name" string="Event" select="1"/>
-                        <field name="state" select="1"/>
+                        <field name="name" select="1"/>
                         <field name="user_id" widget="selection">
-                               <filter icon="terp-personal"
-                                    string="My Events"
-                                    help="My Events"
-                                    domain="[('user_id','=',uid)]"/>
+                        <filter icon="terp-personal"
+                              string="My Events"
+                                help="My Events"
+                              domain="[('user_id','=',uid)]"/>
                         </field>
                         <field name="date_begin" select="1"/>
+                        <field name="state" select="1"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="12">
+                        <filter string="Responsible"  icon="terp-personal" context="{'group_by': 'user_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
                         <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Responsible"  icon="terp-personal" context="{'group_by': 'user_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Creation" icon="terp-go-month"
+                        <filter string="Beginning Date" icon="terp-go-month"
                             domain="[]" context="{'group_by':'date_begin'}"/>
                     </group>
                 </search>
@@ -287,11 +287,11 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Registration">
-                    <field name="date" string="Date"/>
-                    <field name="event_id"/>
                     <field name="partner_id"/>
+                    <field name="event_id"/>
                     <field name="nb_register"/>
-                    <field name="price_subtotal"/>
+                    <field name="price_subtotal" sum="Total"/>
+                    <field name="user_id"/>
                     <field name="state"/>
                     <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
                     <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
@@ -335,9 +335,9 @@
                             <separator string="" colspan="4"/>
                             <group col="8" colspan="4">
                                 <field name="state" select="1" colspan="2"/>
+                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                 <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
                                 <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Extra Info">
@@ -460,27 +460,26 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <group col="12" colspan="4">
-                        <filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'open'))]" help="Current Registrations"/>
-                        <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Registrations"/>
+                        <filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'open'))]" help="Registrations in unconfirmed or confirmed state"/>
+                        <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
                         <separator orientation="vertical"/>
                         <field name="partner_id" />
                         <field name="event_id" widget="selection"/>
-                        <field name="state" select="1"/>
-
                         <field name="user_id" widget="selection">
-                              <filter icon="terp-personal"
-                                    string="My Registration"
-                                    help="My Registration"
-                                    domain="[('user_id','=',uid)]"/>
+                        <filter icon="terp-personal"
+                              string="My Registrations"
+                                help="My Registrations"
+                              domain="[('user_id','=',uid)]"/>
                         </field>
+                        <field name="state" select="1"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
+                        <filter string="Responsible"  icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Responsible"  icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                    </group>
                 </search>
             </field>

From a0651cce14fd52f59d9a683f2660ddfdc3ec1258 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 5 Oct 2010 17:25:09 +0200
Subject: [PATCH 19/21] [FIX] project_issue bad domain on analysis

bzr revid: al@openerp.com-20101005152509-2lnouq4iifz6g8df
---
 addons/project_issue/report/project_issue_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 39564c90896..365f217dee4 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -101,7 +101,7 @@
                        <separator orientation="vertical"/>
                        <field name="version_id" widget="selection" />
                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                       <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]" />
+                       <field name="type_id" widget="selection"/>
                        <separator orientation="vertical"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                        <newline/>

From fb5d961dddd11118b73a90ad577fdbde483b2fb1 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 5 Oct 2010 18:11:30 +0200
Subject: [PATCH 20/21] [FIX] sale: corrected invoice creation from a sale
 order that already had some invoice generated from line(s)

bzr revid: qdp-launchpad@tinyerp.com-20101005161130-ctum7l1ksxt2k2a2
---
 addons/sale/sale.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index fef8f21000f..ad418a567bc 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -423,8 +423,14 @@ class sale_order(osv.osv):
             pay_term = order.payment_term.id
         else:
             pay_term = False
+        invoiced_sale_line_ids = self.pool.get('sale.order.line').search(cr, uid, [('order_id', '=', order.id), ('invoiced', '=', True)], context=context)
+        from_line_invoice_ids = []
+        for invoiced_sale_line_id in self.pool.get('sale.order.line').browse(cr, uid, invoiced_sale_line_ids, context=context):
+            for invoice_line_id in invoiced_sale_line_id.invoice_lines:
+                if invoice_line_id.invoice_id.id not in from_line_invoice_ids:
+                    from_line_invoice_ids.append(invoice_line_id.invoice_id.id)
         for preinv in order.invoice_ids:
-            if preinv.state not in ('cancel',):
+            if preinv.state not in ('cancel',) and preinv.id not in from_line_invoice_ids:
                 for preline in preinv.invoice_line:
                     inv_line_id = self.pool.get('account.invoice.line').copy(cr, uid, preline.id, {'invoice_id': False, 'price_unit': -preline.price_unit})
                     lines.append(inv_line_id)
@@ -471,7 +477,6 @@ class sale_order(osv.osv):
             lines = []
             for line in o.order_line:
                 if line.invoiced:
-                    #raise osv.except_osv(_('Error !'), _('The Sale Order already has some lines invoiced. You should continue the billing process by line.'))
                     continue
                 elif (line.state in states):
                     lines.append(line.id)

From 5a434b5935261b9e8dfea945eb05b7f6b0146f6a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 6 Oct 2010 01:10:23 +0200
Subject: [PATCH 21/21] [FIX] stock delivery form, invoice_state declared twice

bzr revid: al@openerp.com-20101005231023-mqnlce7x4ldbbqua
---
 addons/stock/stock_view.xml | 1 -
 addons/test.txt             | 8 --------
 addons/test2.text           | 8 --------
 3 files changed, 17 deletions(-)
 delete mode 100644 addons/test.txt
 delete mode 100644 addons/test2.text

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a7ef71c9acd..84670ab514b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -913,7 +913,6 @@
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">
                             <field name="auto_picking" groups="base.group_extended"/>
-                            <field name="invoice_state" groups="base.group_extended"/>
                             <field name="date_done" groups="base.group_extended"/>
                             <field name="move_type" groups="base.group_extended"/>
                             <field name="type" groups="base.group_extended"/>
diff --git a/addons/test.txt b/addons/test.txt
deleted file mode 100644
index 55e60eb73a8..00000000000
--- a/addons/test.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-this is a test file: 
--------------------
-the purpose is to test the buidlbot engine
-
-how to do?
-we simply gonna make several commit in a local branch, and also several commits in the main branch, then merge and see what happens
-
-iii
diff --git a/addons/test2.text b/addons/test2.text
deleted file mode 100644
index 535d2b01d33..00000000000
--- a/addons/test2.text
+++ /dev/null
@@ -1,8 +0,0 @@
-1
-2
-3
-4
-5
-6
-7
-8