Presik/trytonpsk-staff_payroll_co
1
0
Fork 0
mirror of https://bitbucket.org/presik/trytonpsk-staff_payroll_co.git synced 2023-12-14 06:42:56 +01:00
Code Issues Projects Releases Wiki Activity

Minor fixes

Browse source
This commit is contained in:
oscar alvarez 2023-05-01 05:26:00 -05:00
parent 745799a2ec
commit 8fa37ef7c6
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
payroll.py
View file

@ -276,7 +276,8 @@ class Payroll(metaclass=PoolMeta):
def get_days(self, start, end, wage_adjust_days_worked=None): def get_days(self, start, end, wage_adjust_days_worked=None):
adjust = 1 adjust = 1
# adjust_days_worked = False # adjust_days_worked = False
adjust_days_worked = attrgetter('position.adjust_days_worked')(self.contract) print("este contrato.--------", self.contract.id)
adjust_days_worked = self.contract.position.adjust_days_worked if self.contract else true
# print('this is', adj) # print('this is', adj)
# if self.contract and self.contract.position: # if self.contract and self.contract.position:
# adjust_days_worked = self.contract.position.adjust_days_worked # adjust_days_worked = self.contract.position.adjust_days_worked
@ -497,10 +498,8 @@ class Payroll(metaclass=PoolMeta):
PayrollLine = pool.get('staff.payroll.line') PayrollLine = pool.get('staff.payroll.line')
MoveLine = pool.get('account.move.line') MoveLine = pool.get('account.move.line')
LoanLine = pool.get('staff.loan.line') LoanLine = pool.get('staff.loan.line')
self.process_loans_to_pay(LoanLine, PayrollLine, MoveLine) self.process_loans_to_pay(LoanLine, PayrollLine, MoveLine)
# Configuration = Pool().get('staff.configuration')
# configuration = Configuration(1)
discounts = self.set_events(cache_wage_dict) discounts = self.set_events(cache_wage_dict)
ctx = { ctx = {
'absenteeism_days': self.absenteeism_days 'absenteeism_days': self.absenteeism_days
@ -523,7 +522,7 @@ class Payroll(metaclass=PoolMeta):
time_r2 = time.time() time_r2 = time.time()
print(time_r2-time_r, 'time recompute lines') print(time_r2-time_r, 'time recompute lines')
if not config.allow_zero_quantities: if not config.allow_zero_quantities:
lines_delete = [ln for ln in self.lines if ln.quantity == 0] lines_delete = [ln for ln in self.lines if ln.quantity == 0]
PayrollLine.delete(lines_delete) PayrollLine.delete(lines_delete)
def set_events(self, cache_wage_dict): def set_events(self, cache_wage_dict):
@ -819,7 +818,7 @@ class Payroll(metaclass=PoolMeta):
# }) # })
time_ro = time.time() time_ro = time.time()
for line in self.lines: for line in self.lines:
wage = cache_wage_dict[line.wage_type.id] wage = cache_wage_dict[line.wage_type.id]
if not wage['round_amounts']: if not wage['round_amounts']:
continue continue
unit_value = self.get_round_amount(wage['round_amounts'], line.unit_value) unit_value = self.get_round_amount(wage['round_amounts'], line.unit_value)

2
tryton.cfg
View file

@ -1,5 +1,5 @@
[tryton] [tryton]
version=6.0.6 version=6.0.7
depends: depends:
company company
account account