Skip to content

test_period_generation fix15#246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ingindIsrael merged 3 commits into from
Mar 24, 2022
Merged

test_period_generation fix15 #246

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ceb7789
test_period_generation fix15
ingindIsrael Mar 24, 2022
b92bfeb
Merge branch 'development' of https://github.com/ingindIsrael/api int…
ingindIsrael Mar 24, 2022
97dd0ef
Merge branch 'master' into development
ingindIsrael Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions api/serializers/payment_serializer.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -679,23 +679,23 @@ def generate_periods_and_payments(employer, generate_since=None):
overtime = clocked_hours - projected_hours
print("justo sobre payment")
payment = PayrollPeriodPayment()
payment.payroll_period=period,
payment.payroll_period=period
print('payment.payroll_period=period###', payment.payroll_period)
payment.employee=clockin.employee,
payment.employee=clockin.employee
print('payment.payment.employee###', payment.payroll_period)
payment.employer=employer,
payment.employer=employer
print('payment.employer###', payment.payroll_period)
payment.shift=clockin.shift,
payment.shift=clockin.shift
print('payment.shift###', payment.shift)
payment.clockin=clockin,
payment.clockin=clockin
print('payment.clockin###', payment.clockin)
payment.regular_hours=regular_hours,
payment.regular_hours=regular_hours
print('payment.regular_hours###', payment.regular_hours)
payment.over_time=overtime,
payment.over_time=overtime
print('payment.over_time###', payment.over_time)
payment.hourly_rate=clockin.shift.minimum_hourly_rate,
payment.hourly_rate=clockin.shift.minimum_hourly_rate
print('payment.hourly_rate###', payment.hourly_rate)
payment.total_amount=round((regular_hours + overtime) * clockin.shift.minimum_hourly_rate, 2),
payment.total_amount=round((regular_hours + overtime) * clockin.shift.minimum_hourly_rate, 2)
print('payment.total_amount###', payment.total_amount)
payment.splited_payment=False if clockin.ended_at is None or (clockin.started_at == starting_time and ending_time == clockin.ended_at) else True
print('payment.splited_payment###', payment.splited_payment)
Expand Down