From 61191a865cfc5318d55631d87b9255d654aa4f8d Mon Sep 17 00:00:00 2001 From: Wilson Gomez Date: Fri, 22 Sep 2023 08:45:54 -0500 Subject: [PATCH] minor fix --- payroll.py | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/payroll.py b/payroll.py index d38d91c..466e1a4 100644 --- a/payroll.py +++ b/payroll.py @@ -408,7 +408,7 @@ class Payroll(metaclass=PoolMeta): for line in self.lines: to_write = {} - if line.wage_type.provision_cancellation: + if line.wage_type.provision_cancellation and line.wage_type.contract_finish: amount_line = [m.amount for m in self.lines if m.wage_type == line.wage_type.provision_cancellation] move_lines = MoveLine.search([ @@ -786,20 +786,14 @@ class Payroll(metaclass=PoolMeta): PayrollLine.write([wl], { 'amount_60_40': new_unit_value, }) - time_60_40_2 = time.time() - # print(time_60_40_2- time_60_40, 'validar 60 40') - - time_r = time.time() super(Payroll, self).recompute_lines(cache_wage_dict) - time_r2 = time.time() - # print(time_r2- time_r, 'validar recom') line_tax = None # deductions = _ZERO - time_pr = time.time() for line in self.lines: w_provision_cancellation = line.wage_type.provision_cancellation - if w_provision_cancellation: + + if w_provision_cancellation and line.wage_type.contract_finish: amount_line = [m.amount for m in self.lines if m.wage_type == w_provision_cancellation] values = [] @@ -809,28 +803,13 @@ class Payroll(metaclass=PoolMeta): line.write([line], { 'unit_value': amount, }) - time_pr2 = time.time() - # print(time_pr2- time_pr, 'validar provision') - time_up = time.time() self.update_wage_no_salary(cache_wage_dict) - time_up2 = time.time() - # print(time_up2- time_up, 'validar update') - # elif line.wage_type.type_concept == 'tax': - # line_tax = line - # if line_tax: - # unit_value = self._compute_line_tax(line_tax) - # line_tax.write([line_tax], { - # 'unit_value': unit_value, 'quantity': 1 - # }) - time_ro = time.time() for line in self.lines: wage = cache_wage_dict[line.wage_type.id] if not wage['round_amounts']: continue unit_value = self.get_round_amount(wage['round_amounts'], line.unit_value) line.write([line], {'unit_value': unit_value}) - time_ro2 = time.time() - # print(time_ro2- time_ro, 'validar rounds') def check_limit(self, base, field, value_field): Configuration = Pool().get('staff.configuration')