minor fix
This commit is contained in:
parent
5b5160c6ad
commit
f7cedb74be
|
@ -1887,6 +1887,7 @@ class Exo2276Report(Report):
|
|||
|
||||
_cesanpag = 0
|
||||
_total_benefit = 0
|
||||
_other = 0
|
||||
lines_liquid = LiquidationLine.search_read([
|
||||
('liquidation.employee.party', '=', party.id),
|
||||
('liquidation.liquidation_date', '>=', data['start_period']),
|
||||
|
@ -1896,10 +1897,13 @@ class Exo2276Report(Report):
|
|||
for l in lines_liquid:
|
||||
if l['wage.']['type_concept'] in ['unemployment', 'interest']:
|
||||
_cesanpag += l['amount']
|
||||
elif l['wage.']['type_concept'] == 'convencional_bonus':
|
||||
_other += l['amount']
|
||||
else:
|
||||
_total_benefit += l['amount']
|
||||
new_objects[party.id]['cesanpag'] = _cesanpag
|
||||
new_objects[party.id]['total_benefit'] += _total_benefit
|
||||
new_objects[party.id]['others_payments'] += _other
|
||||
|
||||
report_context['records'] = new_objects.values()
|
||||
report_context['end_period'] = end_period
|
||||
|
@ -1984,7 +1988,7 @@ class Exo2276Report(Report):
|
|||
vals['others_payments'] = (vals['other'] + vals['commission']
|
||||
+ vals['bonus'] + vals['allowance']
|
||||
+ vals['various'] + vals['food']
|
||||
+ vals['transport'] + vals['convencional_bonus'])
|
||||
+ vals['transport'])
|
||||
# vals['total_benefit'] = vals['holidays'] + vals['bonus_service']
|
||||
vals['total_retirement'] = vals['fsp'] + vals['retirement']
|
||||
vals['total_salary'] = sum([
|
||||
|
|
Loading…
Reference in New Issue