Commit 9f220269 authored by Felipe Carlini's avatar Felipe Carlini
Browse files

Merge branch 'add_discount' into '12.0-stage'

[ADD] discount in payroll base config

See merge request !23
parents 1c7ce767 7fd50bf4
......@@ -23,5 +23,6 @@ class HRPayrollBaseConfig(models.Model):
smvym = fields.Float(string='SMVyM')
max_mopre = fields.Float(string='Maximum Mopre')
min_mopre = fields.Float(string='Minimum Mopre')
discount = fields.Float(string='Discount')
......@@ -445,7 +445,7 @@ class HRPayslip(models.Model):
JOIN hr_payslip AS payslip
ON payslip.id = line.slip_id
WHERE line.employee_id = %s
AND line.code = %s
AND line.code in (%s)
AND line.date BETWEEN %s AND %s
AND payslip.id != %s
AND payslip.state IN ('draft', 'done', 'verify')
......
......@@ -9,6 +9,7 @@
<sheet>
<group string="RRHH Configuration">
<field name="smvym"/>
<field name="discount"/>
<field name="max_mopre"/>
<field name="min_mopre"/>
</group>
......
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