Commit 2a07559b authored by Santiago Apel's avatar Santiago Apel 💬
Browse files

Merge branch 'fix_rule_total_max' into '12.0-stage'

[FIX] total_rule_max input parameter type only tuple

See merge request !26
parents 3f0f0c53 f1547a58
......@@ -528,21 +528,15 @@ class HRPayslip(models.Model):
Get the max total of totals with a rule given from
date_to (by default payslip date_to or today) to the given months back
"""
if type(rule_code) == str:
query = self._build_rule_total_max_query()
total_max = float(self.query_rule_result(query, rule_code, months_back,
date_to, *args, **kwargs))
else:
aux_list = []
for rulecode in rule_code:
query = self._build_rule_total_max_query()
total_max = float(self.query_rule_result(query, rulecode, months_back,
query = self._build_rule_total_max_query()
total_max = float(self.query_rule_result(query, rule_code, months_back,
date_to, *args, **kwargs))
aux_list.append(total_max)
total_max = max(aux_list)
return total_max
return total_max
def rule_month(self, rule_code, months_back=0,
date_to=False, *args, **kwargs):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment