1
=== modified file 'hr_payroll/hr_payroll.py'
2
--- hr_payroll/hr_payroll.py	2013-01-31 06:33:33 +0000
3
+++ hr_payroll/hr_payroll.py	2013-03-12 05:32:21 +0000
4
@@ -378,7 +378,7 @@
5
378
        #OR if it starts between the given dates
378
        #OR if it starts between the given dates
6
379
        clause_2 = ['&',('date_start', '<=', date_to),('date_start','>=', date_from)]
379
        clause_2 = ['&',('date_start', '<=', date_to),('date_start','>=', date_from)]
7
380
        #OR if it starts before the date_from and finish after the date_end (or never finish)
380
        #OR if it starts before the date_from and finish after the date_end (or never finish)
9
381
        clause_3 = [('date_start','<=', date_from),'|',('date_end', '=', False),('date_end','>=', date_to)]
381
        clause_3 = ['&',('date_start','<=', date_from),'|',('date_end', '=', False),('date_end','>=', date_to)]
10
382
        clause_final =  [('employee_id', '=', employee.id),'|','|'] + clause_1 + clause_2 + clause_3
382
        clause_final =  [('employee_id', '=', employee.id),'|','|'] + clause_1 + clause_2 + clause_3
11
383
        contract_ids = contract_obj.search(cr, uid, clause_final, context=context)
383
        contract_ids = contract_obj.search(cr, uid, clause_final, context=context)
12
384
        return contract_ids
384
        return contract_ids
Reviewer	Review Type	Date Requested	Status
OpenERP Core Team		2013-03-06	Pending
Review via email: mp+151899@code.launchpad.net
1	=== modified file 'hr_payroll/hr_payroll.py'
2	--- hr_payroll/hr_payroll.py 2013-01-31 06:33:33 +0000
3	+++ hr_payroll/hr_payroll.py 2013-03-12 05:32:21 +0000
4	@@ -378,7 +378,7 @@
5	378	#OR if it starts between the given dates	378	#OR if it starts between the given dates
6	379	clause_2 = ['&',('date_start', '<=', date_to),('date_start','>=', date_from)]	379	clause_2 = ['&',('date_start', '<=', date_to),('date_start','>=', date_from)]
7	380	#OR if it starts before the date_from and finish after the date_end (or never finish)	380	#OR if it starts before the date_from and finish after the date_end (or never finish)
9	381	clause_3 = [('date_start','<=', date_from),'\|',('date_end', '=', False),('date_end','>=', date_to)]	381	clause_3 = ['&',('date_start','<=', date_from),'\|',('date_end', '=', False),('date_end','>=', date_to)]
10	382	clause_final = [('employee_id', '=', employee.id),'\|','\|'] + clause_1 + clause_2 + clause_3	382	clause_final = [('employee_id', '=', employee.id),'\|','\|'] + clause_1 + clause_2 + clause_3
11	383	contract_ids = contract_obj.search(cr, uid, clause_final, context=context)	383	contract_ids = contract_obj.search(cr, uid, clause_final, context=context)
12	384	return contract_ids	384	return contract_ids