diff --git a/automatic_payroll/__manifest__.py b/automatic_payroll/__manifest__.py index 90c4a3a02..d28528cf3 100644 --- a/automatic_payroll/__manifest__.py +++ b/automatic_payroll/__manifest__.py @@ -1,6 +1,6 @@ { 'name': 'Automatic Payroll', - 'version': '13.0.1.0.0', + 'version': '13.0.1.1.1', 'category': 'Generic Modules/Human Resources', 'description': """Generate payslips automatically""", 'author': 'Cybrosys Techno Solutions', diff --git a/automatic_payroll/doc/RELEASE_NOTES.md b/automatic_payroll/doc/RELEASE_NOTES.md index ee388fb2f..fb912d9b6 100644 --- a/automatic_payroll/doc/RELEASE_NOTES.md +++ b/automatic_payroll/doc/RELEASE_NOTES.md @@ -4,3 +4,8 @@ #### Version 13.0.1.0.0 ##### ADD - Initial Commit + +#### 17.04.2020 +#### Version 13.0.1.1.1 +##### FIX +- Bug Fix diff --git a/automatic_payroll/models/auto_generate_payslips.py b/automatic_payroll/models/auto_generate_payslips.py index 7528668e0..235e1ecc6 100644 --- a/automatic_payroll/models/auto_generate_payslips.py +++ b/automatic_payroll/models/auto_generate_payslips.py @@ -76,18 +76,24 @@ class HrPayslipRunCron(models.Model): }]) generate_payslip = self.env['hr.payslip.employees'] + # print(generate_payslip) contract_ids = self.env['hr.contract'].search([('state', '=', 'open')]) employee_ids = [] for line in contract_ids: + print(line.employee_id.name) employee_ids.append(line.employee_id) - generate_payslip.create([{ - 'name': line.employee_id.id, - 'work_phone': line.employee_id.work_phone or None, - 'work_email': line.employee_id.work_email or None, - 'department_id': line.employee_id.department_id or None, - 'job_id': line.employee_id.job_id or None, - 'parent_id': line.employee_id.parent_id or None, - }]) + generate_payslip.create({ + 'employee_ids': [(4, line.employee_id.id)] + }) + # generate_payslip.create([{ + # 'name': line.employee_id.name, + # 'work_phone': line.employee_id.work_phone or None, + # 'work_email': line.employee_id.work_email or None, + # 'department_id': line.employee_id.department_id or None, + # 'job_id': line.employee_id.job_id or None, + # 'parent_id': line.employee_id.parent_id.name or None, + # }]) + print(generate_payslip) payslips = self.env['hr.payslip'] [run_data] = batch_id.read( ['date_start', 'date_end', 'credit_note']) diff --git a/automatic_payroll/views/res_config_settings_view.xml b/automatic_payroll/views/res_config_settings_view.xml index aaa804ef3..583a7a2d0 100644 --- a/automatic_payroll/views/res_config_settings_view.xml +++ b/automatic_payroll/views/res_config_settings_view.xml @@ -3,12 +3,9 @@ res_config_settings_view res.config.settings - + - -
-
+
@@ -31,8 +28,6 @@
-
-