Merge branch 'master' into dev_zhou

2026-01-06 10:41:32 +08:00
parent 3cd9bf9708 d51f882bec
commit b7fbb124f0
706 changed files with 312259 additions and 11 deletions
@@ -22,7 +22,7 @@ class HrSalaryRuleCategory(models.Model):
            raise ValidationError(_('Error! You cannot create recursive hierarchy of Salary Rule Category.'))

    def _sum_salary_rule_category(self, localdict, amount):
-        self.ensure_one()
+        # self.ensure_one()
        if self.parent_id:
            localdict = self.parent_id._sum_salary_rule_category(localdict, amount)
        localdict['categories'][self.code] = localdict['categories'][self.code] + amount