Presik
/
trytonpsk-staff_payroll_co
mirror of https://bitbucket.org/presik/trytonpsk-staff_payroll_co.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compare commits

base: Presik:aa1ed8d9b8831db2a9fe80f49bf5bba66a7c4196
Branches Tags
Presik:master
Presik:v6.0
Presik:v5.0
...
compare: Presik:02ab69bf4ed1ffbed2814fcec7f3e75fc0fe40c9
Branches Tags
Presik:master
Presik:v6.0
Presik:v5.0

2 Commits
aa1ed8d9b8 ... 02ab69bf4e

Author SHA1 Message Date
Elvis 02ab69bf4e minor fix 2023-10-04 17:17:30 -05:00
Elvis c9a1e39fca changes in reports 2023-10-04 17:11:41 -05:00
1 changed files with 1 additions and 3 deletions
Show Stats Expand all files Collapse all files

4
payroll.py
View File

@ -1176,7 +1176,7 @@ class PayrollGlobalReport(Report):
raise WageTypeConceptError(
gettext('staff_payroll_co.msg_type_concept_not_exists', s=line.wage_type.name))
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]['total_deductions'] += payroll.total_deductions
parties[employee_id]['net_payment'] += payroll.net_payment
@ -1417,7 +1417,6 @@ class PayrollPaycheckReport(Report):
res[key][w + '_code'] = ''
res[key][w + '_name'] = ''
res[key][w + '_rate'] = 0
res[key]['license_amount'] = 0
res[key]['incapacity_amount'] = 0
res[key]['holidays_amount'] = 0
@ -1469,7 +1468,6 @@ class PayrollPaycheckReport(Report):
concept = line['wage_type.']['type_concept']
if concept in wage_type_default and concept != 'salary':
unit_formula = line['wage_type.']['unit_price_formula']
if unit_formula:
try:
unit_formula = Decimal(