mirror of
https://bitbucket.org/presik/trytonpsk-staff_payroll_co.git
synced 2023-12-14 06:42:56 +01:00
Compare commits
2 commits
aa1ed8d9b8
...
02ab69bf4e
Author | SHA1 | Date | |
---|---|---|---|
|
02ab69bf4e | ||
|
c9a1e39fca |
|
@ -1176,7 +1176,7 @@ class PayrollGlobalReport(Report):
|
||||||
raise WageTypeConceptError(
|
raise WageTypeConceptError(
|
||||||
gettext('staff_payroll_co.msg_type_concept_not_exists', s=line.wage_type.name))
|
gettext('staff_payroll_co.msg_type_concept_not_exists', s=line.wage_type.name))
|
||||||
parties[employee_id][concept] += line.amount
|
parties[employee_id][concept] += line.amount
|
||||||
parties[employee_id]['worked_days'] += Decimal(payroll.worked_days_effective)
|
parties[employee_id]['worked_days'] += Decimal(math.ceil(payroll.worked_days_effective))
|
||||||
parties[employee_id]['gross_payments'] += payroll.gross_payments
|
parties[employee_id]['gross_payments'] += payroll.gross_payments
|
||||||
parties[employee_id]['total_deductions'] += payroll.total_deductions
|
parties[employee_id]['total_deductions'] += payroll.total_deductions
|
||||||
parties[employee_id]['net_payment'] += payroll.net_payment
|
parties[employee_id]['net_payment'] += payroll.net_payment
|
||||||
|
@ -1417,7 +1417,6 @@ class PayrollPaycheckReport(Report):
|
||||||
res[key][w + '_code'] = ''
|
res[key][w + '_code'] = ''
|
||||||
res[key][w + '_name'] = ''
|
res[key][w + '_name'] = ''
|
||||||
res[key][w + '_rate'] = 0
|
res[key][w + '_rate'] = 0
|
||||||
|
|
||||||
res[key]['license_amount'] = 0
|
res[key]['license_amount'] = 0
|
||||||
res[key]['incapacity_amount'] = 0
|
res[key]['incapacity_amount'] = 0
|
||||||
res[key]['holidays_amount'] = 0
|
res[key]['holidays_amount'] = 0
|
||||||
|
@ -1469,7 +1468,6 @@ class PayrollPaycheckReport(Report):
|
||||||
concept = line['wage_type.']['type_concept']
|
concept = line['wage_type.']['type_concept']
|
||||||
if concept in wage_type_default and concept != 'salary':
|
if concept in wage_type_default and concept != 'salary':
|
||||||
unit_formula = line['wage_type.']['unit_price_formula']
|
unit_formula = line['wage_type.']['unit_price_formula']
|
||||||
|
|
||||||
if unit_formula:
|
if unit_formula:
|
||||||
try:
|
try:
|
||||||
unit_formula = Decimal(
|
unit_formula = Decimal(
|
||||||
|
|
Loading…
Reference in a new issue