Merge lp:~openerp-dev/openobject-addons/trunk-bug-1132963-sunil into lp:openobject-addons

[sunil prajapati(OpenERP Trainee)]

Hello,
  issue:
  hr_payroll - missing & (and) on get_contract

 solve:
 i have solved hr_payroll -Add '&' (and) on get_contract
 -Fixes problem of final clause in get_contract

Thanks,
Sunil

[lp:~openerp-dev/openobject-addons/trunk-bug-1132963-sunil]

8593. By sunil prajapati(OpenERP Trainee) on 2013-03-11

MERGE with trunk

8594. By sunil prajapati(OpenERP Trainee) on 2013-03-12

MERGE with trunk

Unmerged revisions

8594. By sunil prajapati(OpenERP Trainee) on 2013-03-12

MERGE with trunk

8593. By sunil prajapati(OpenERP Trainee) on 2013-03-11

MERGE with trunk

8592. By sunil prajapati(OpenERP Trainee) on 2013-03-06

[FIX]:addons:hr_payroll add '&' on get_contract function

=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py	2013-01-31 06:33:33 +0000
+++ hr_payroll/hr_payroll.py	2013-03-12 05:32:21 +0000
@@ -378,7 +378,7 @@
         #OR if it starts between the given dates
         clause_2 = ['&',('date_start', '<=', date_to),('date_start','>=', date_from)]
         #OR if it starts before the date_from and finish after the date_end (or never finish)
-        clause_3 = [('date_start','<=', date_from),'|',('date_end', '=', False),('date_end','>=', date_to)]
+        clause_3 = ['&',('date_start','<=', date_from),'|',('date_end', '=', False),('date_end','>=', date_to)]
         clause_final =  [('employee_id', '=', employee.id),'|','|'] + clause_1 + clause_2 + clause_3
         contract_ids = contract_obj.search(cr, uid, clause_final, context=context)
         return contract_ids