minor fix

This commit is contained in:
Camilo Sarmiento 2020-04-28 10:33:54 -05:00
parent 1ef8e94a38
commit c6cf6a64b7
4 changed files with 1549 additions and 23 deletions

File diff suppressed because it is too large Load diff

View file

@ -1551,33 +1551,30 @@ class Exo2276(Wizard):
class Exo2276Report(Report):
__name__ = 'staff.payroll_exo2276.report'
@classmethod
def get_domain_payroll(cls, data=None):
Period = Pool().get('staff.payroll.period')
periods = Period.search([
('start', '>=', data['start_period']),
('end', '<=', data['end_period']),
])
periods_ids = [p.id for p in periods]
domain = [
('period', 'in', periods_ids),
('state', '=', 'posted'),
]
return domain
@classmethod
def get_context(cls, records, data):
report_context = super(Exo2276Report, cls).get_context(records, data)
pool = Pool()
user = pool.get('res.user')(Transaction().user)
Payroll = pool.get('staff.payroll')
Period = pool.get('staff.payroll.period')
Fiscalyear = pool.get('account.fiscalyear')
Company = pool.get('company.company')
fiscalyear = Fiscalyear.search([
('start_date', '>=', data['start_period']),
('end_date', '<=', data['end_period']),
])
periods = Period.search([
('start', '>=', data['start_period']),
('end', '<=', data['end_period']),
])
periods_ids = [p.id for p in periods]
# dom = [
# ('period', 'in', periods_ids),
# ('state', '=' 'posted'),
# ]
payrolls = Payroll.search([
('period', 'in', periods_ids),
('state', '=', 'posted'),
])
domain_ = cls.get_domain_payroll(data)
payrolls = Payroll.search([domain_])
# company = Company(data[company])
new_objects = {}
lines_dom = []
@ -1738,6 +1735,7 @@ class IncomeWithholdingsStart(ModelView):
start_period = fields.Many2One('staff.payroll.period', 'Start Period', required=True)
end_period = fields.Many2One('staff.payroll.period', 'End Period', required=True)
company = fields.Many2One('company.company', 'Company', required=True)
employee = fields.Many2One('company.employee', 'Employee')
@staticmethod
def default_company():
@ -1755,10 +1753,14 @@ class IncomeWithholdings(Wizard):
print_ = StateReport('staff.payroll.income_withholdings_report')
def do_print_(self, action):
employee_id = None
if self.start.employee:
employee_id = self.start.employee.id
data = {
'company': self.start.company.id,
'start_period': self.start.start_period.start,
'end_period': self.start.end_period.end,
'employee_id': employee_id,
}
return action, data
@ -1770,3 +1772,13 @@ class IncomeWithholdingsReport(Exo2276Report):
'Income Withholding Report'
__name__ = 'staff.payroll.income_withholdings_report'
@classmethod
def get_domain_payroll(cls, data=None):
Employee = Pool().get('company.employee')
domain_ = super(IncomeWithholdingsReport, cls).get_domain_payroll(data)
if data['employee_id']:
employee = Employee(data['employee_id'])
if employee:
domain_.append(('employee', '=', data['employee_id']))
return domain_

View file

@ -4,8 +4,10 @@ this repository contains the full copyright notices and license terms. -->
<form >
<label name="start_period"/>
<field name="start_period"/>
<label name="end_period"/>
<field name="end_period"/>
<label name="company"/>
<field name="company"/>
<label name="end_period"/>
<field name="end_period"/>
<label name="employee"/>
<field name="employee"/>
</form>