pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merge

Browse Source 
bzr revid: mra@mra-laptop-20110331102726-ouqn5sq5hur501nu
This commit is contained in:
Mustufa Rangwala
2011-03-31 15:57:26 +05:30
parent 71d2458390 14c6473473
commit cb6176a892
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_payroll/hr_payroll.py
+14 -11
View File
@@ -827,12 +827,14 @@ class hr_payslip(osv.osv):
'employee_id': slip.employee_id.id,
'base': line.computational_expression
}
if line.appears_on_payslip:
if line.condition_range_min or line.condition_range_max:
if not ((value < line.condition_range_min) or (value > line.condition_range_max)):
slip_ids = slip_line_pool.search(cr, uid, [('code', '=', line.code), ('slip_id', '=', slip.id)])
if not slip_ids:
if line.appears_on_payslip:
if line.condition_range_min or line.condition_range_max:
if not ((value < line.condition_range_min) or (value > line.condition_range_max)):
slip_line_pool.create(cr, uid, vals, {})
else:
slip_line_pool.create(cr, uid, vals, {})
else:
slip_line_pool.create(cr, uid, vals, {})
basic = contract.wage
number = sequence_obj.get(cr, uid, 'salary.slip')
@@ -1144,13 +1146,14 @@ class hr_payslip(osv.osv):
'employee_id': employee_id.id,
'base': line.computational_expression
}
if line.appears_on_payslip:
if line.condition_range_min or line.condition_range_max:
if not ((value < line.condition_range_min) or (value > line.condition_range_max)):
if vals not in update['value']['line_ids']:
if line.appears_on_payslip:
if line.condition_range_min or line.condition_range_max:
if not ((value < line.condition_range_min) or (value > line.condition_range_max)):
update['value']['line_ids'].append(vals)
else:
update['value']['line_ids'].append(vals)
else:
update['value']['line_ids'].append(vals)
basic = contract.wage
all_basic += basic
final_total += basic + total