audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] hr_payroll_hibou: sum wage on paid slips

Browse Source
This commit is contained in:
Jared Kipe
2022-09-29 17:47:56 +00:00
parent 3fc96fc203
commit 9fbc5142be
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hr_payroll_hibou/models/browsable_object.py
View File

@@ -35,7 +35,7 @@ class InputLine(BrowsableObject):
self.__browsable_query = """ self.__browsable_query = """
SELECT sum(amount) as sum SELECT sum(amount) as sum
FROM hr_payslip as hp, hr_payslip_input as pi FROM hr_payslip as hp, hr_payslip_input as pi
WHERE hp.employee_id = %s AND hp.state = 'done' WHERE hp.employee_id = %s AND hp.state in ('done', 'paid')
AND hp.{sum_field} >= %s AND hp.date_to <= %s AND hp.id = pi.payslip_id AND pi.code = %s""".format(sum_field=sum_field) AND hp.{sum_field} >= %s AND hp.date_to <= %s AND hp.id = pi.payslip_id AND pi.code = %s""".format(sum_field=sum_field)
def sum(self, code, from_date, to_date=None): def sum(self, code, from_date, to_date=None):
@@ -51,7 +51,7 @@ class WorkedDays(BrowsableObject):
self.__browsable_query = """ self.__browsable_query = """
SELECT sum(number_of_days) as number_of_days, sum(number_of_hours) as number_of_hours SELECT sum(number_of_days) as number_of_days, sum(number_of_hours) as number_of_hours
FROM hr_payslip as hp, hr_payslip_worked_days as pi FROM hr_payslip as hp, hr_payslip_worked_days as pi
WHERE hp.employee_id = %s AND hp.state = 'done' WHERE hp.employee_id = %s AND hp.state in ('done', 'paid')
AND hp.{sum_field} >= %s AND hp.date_to <= %s AND hp.id = pi.payslip_id AND pi.code = %s""".format(sum_field=sum_field) AND hp.{sum_field} >= %s AND hp.date_to <= %s AND hp.id = pi.payslip_id AND pi.code = %s""".format(sum_field=sum_field)
def _sum(self, code, from_date, to_date=None): def _sum(self, code, from_date, to_date=None):
@@ -77,7 +77,7 @@ class Payslips(BrowsableObject):
self.__browsable_query_rule = """ self.__browsable_query_rule = """
SELECT sum(case when hp.credit_note is not True then (pl.total) else (-pl.total) end) SELECT sum(case when hp.credit_note is not True then (pl.total) else (-pl.total) end)
FROM hr_payslip as hp, hr_payslip_line as pl FROM hr_payslip as hp, hr_payslip_line as pl
WHERE hp.employee_id = %s AND hp.state = 'done' WHERE hp.employee_id = %s AND hp.state in ('done', 'paid')
AND hp.{sum_field} >= %s AND hp.date_to <= %s AND hp.id = pl.slip_id AND pl.code = %s""".format(sum_field=sum_field) AND hp.{sum_field} >= %s AND hp.date_to <= %s AND hp.id = pl.slip_id AND pl.code = %s""".format(sum_field=sum_field)
# Original (non-recursive) # Original (non-recursive)
# self.__browsable_query_category = """ # self.__browsable_query_category = """
@@ -105,7 +105,7 @@ class Payslips(BrowsableObject):
SELECT sum(case when hp.credit_note is not True then (pl.total) else (-pl.total) end) SELECT sum(case when hp.credit_note is not True then (pl.total) else (-pl.total) end)
FROM hr_payslip as hp, hr_payslip_line as pl FROM hr_payslip as hp, hr_payslip_line as pl
WHERE hp.employee_id = %s AND hp.state = 'done' WHERE hp.employee_id = %s AND hp.state in ('done', 'paid')
AND hp.{sum_field} >= %s AND hp.date_to <= %s AND hp.id = pl.slip_id AND hp.{sum_field} >= %s AND hp.date_to <= %s AND hp.id = pl.slip_id
AND pl.category_id in (SELECT id from category_ids)""".format(sum_field=sum_field) AND pl.category_id in (SELECT id from category_ids)""".format(sum_field=sum_field)