From 688f53badd3a8eb0d6bf354b11022d76a4a0e230 Mon Sep 17 00:00:00 2001
From: Robajz <>
Date: Wed, 12 Sep 2012 14:49:34 +0530
Subject: [PATCH 1/4] [FIX]hr_payroll :set a domain on contract_id for fix
 lp:1045278

lp bug: https://launchpad.net/bugs/1045278 fixed

bzr revid: mma@tinyerp.com-20120912091934-0bfop7t2b7s1mcuq
---
 addons/hr_payroll/hr_payroll_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 58484a91567..27b82385036 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -234,7 +234,7 @@
                         </h2>
                     </div>
                     <group col="4">
-                        <field name="contract_id" domain="[('employee_id','=',employee_id)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
+                        <field name="contract_id" domain="[('employee_id','=',employee_id),('date_start','<=',date_to),'|',('date_end','>=',date_from),('date_end','=',False)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
                         <field name="number"/>
                         <field name="struct_id" attrs="{'required':[('contract_id','&lt;&gt;',False)]}"/>
                         <field name="name"/>

From 9b35e601fdccca7232ce4b32d2b829579a98ea8a Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 12 Sep 2012 16:53:42 +0530
Subject: [PATCH 2/4] [IMP]hr_payroll :improve domain

bzr revid: mma@tinyerp.com-20120912112342-crdvwjejig5xuhx6
---
 addons/hr_payroll/hr_payroll_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 27b82385036..71cdab50b7c 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -234,7 +234,7 @@
                         </h2>
                     </div>
                     <group col="4">
-                        <field name="contract_id" domain="[('employee_id','=',employee_id),('date_start','<=',date_to),'|',('date_end','>=',date_from),('date_end','=',False)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
+                        <field name="contract_id" domain="[('employee_id','=',employee_id),('date_start',' &lt;=',date_to),'|',('date_end','&gt;=',date_from),('date_end','=',False)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
                         <field name="number"/>
                         <field name="struct_id" attrs="{'required':[('contract_id','&lt;&gt;',False)]}"/>
                         <field name="name"/>

From 23a5c5ea3fc5c80f36d832fa80d2df3a21678acc Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 19 Sep 2012 18:25:40 +0530
Subject: [PATCH 3/4] [IMP]hr_payroll : improve domian

bzr revid: mma@tinyerp.com-20120919125540-vawtnggc1xx4u1qf
---
 addons/hr_payroll/hr_payroll_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 71cdab50b7c..762b983c03a 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -234,7 +234,7 @@
                         </h2>
                     </div>
                     <group col="4">
-                        <field name="contract_id" domain="[('employee_id','=',employee_id),('date_start',' &lt;=',date_to),'|',('date_end','&gt;=',date_from),('date_end','=',False)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
+                        <field name="contract_id" domain="['&amp;'('employee_id','=',employee_id),['&amp;'('date_start',' &lt;=',date_to),('date_end','&gt;=',date_from)]]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
                         <field name="number"/>
                         <field name="struct_id" attrs="{'required':[('contract_id','&lt;&gt;',False)]}"/>
                         <field name="name"/>

From 933bbca9481dec9662ac104170d4a976c69e44b7 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 19 Sep 2012 18:27:02 +0530
Subject: [PATCH 4/4] [IMP]hr_payroll : little improvement

bzr revid: mma@tinyerp.com-20120919125702-3t0lbcirsiylgu34
---
 addons/hr_payroll/hr_payroll_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 762b983c03a..066b14e7a06 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -234,7 +234,7 @@
                         </h2>
                     </div>
                     <group col="4">
-                        <field name="contract_id" domain="['&amp;'('employee_id','=',employee_id),['&amp;'('date_start',' &lt;=',date_to),('date_end','&gt;=',date_from)]]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
+                        <field name="contract_id" domain="['&amp;',('employee_id','=',employee_id),['&amp;', ('date_start',' &lt;=',date_to),('date_end','&gt;=',date_from)]]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
                         <field name="number"/>
                         <field name="struct_id" attrs="{'required':[('contract_id','&lt;&gt;',False)]}"/>
                         <field name="name"/>