Browse Source

[FIX] Bug Fixed 'automatic_payroll'

pull/165/head
Ajmal JK 5 years ago
parent
commit
3d5ddace10
  1. 2
      automatic_payroll/__manifest__.py
  2. 5
      automatic_payroll/doc/RELEASE_NOTES.md
  3. 22
      automatic_payroll/models/auto_generate_payslips.py
  4. 9
      automatic_payroll/views/res_config_settings_view.xml

2
automatic_payroll/__manifest__.py

@ -1,6 +1,6 @@
{ {
'name': 'Automatic Payroll', 'name': 'Automatic Payroll',
'version': '13.0.1.0.0', 'version': '13.0.1.1.1',
'category': 'Generic Modules/Human Resources', 'category': 'Generic Modules/Human Resources',
'description': """Generate payslips automatically""", 'description': """Generate payslips automatically""",
'author': 'Cybrosys Techno Solutions', 'author': 'Cybrosys Techno Solutions',

5
automatic_payroll/doc/RELEASE_NOTES.md

@ -4,3 +4,8 @@
#### Version 13.0.1.0.0 #### Version 13.0.1.0.0
##### ADD ##### ADD
- Initial Commit - Initial Commit
#### 17.04.2020
#### Version 13.0.1.1.1
##### FIX
- Bug Fix

22
automatic_payroll/models/auto_generate_payslips.py

@ -76,18 +76,24 @@ class HrPayslipRunCron(models.Model):
}]) }])
generate_payslip = self.env['hr.payslip.employees'] generate_payslip = self.env['hr.payslip.employees']
# print(generate_payslip)
contract_ids = self.env['hr.contract'].search([('state', '=', 'open')]) contract_ids = self.env['hr.contract'].search([('state', '=', 'open')])
employee_ids = [] employee_ids = []
for line in contract_ids: for line in contract_ids:
print(line.employee_id.name)
employee_ids.append(line.employee_id) employee_ids.append(line.employee_id)
generate_payslip.create([{ generate_payslip.create({
'name': line.employee_id.id, 'employee_ids': [(4, line.employee_id.id)]
'work_phone': line.employee_id.work_phone or None, })
'work_email': line.employee_id.work_email or None, # generate_payslip.create([{
'department_id': line.employee_id.department_id or None, # 'name': line.employee_id.name,
'job_id': line.employee_id.job_id or None, # 'work_phone': line.employee_id.work_phone or None,
'parent_id': line.employee_id.parent_id 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'] payslips = self.env['hr.payslip']
[run_data] = batch_id.read( [run_data] = batch_id.read(
['date_start', 'date_end', 'credit_note']) ['date_start', 'date_end', 'credit_note'])

9
automatic_payroll/views/res_config_settings_view.xml

@ -3,12 +3,9 @@
<record id="res_config_settings_view_name_form" model="ir.ui.view"> <record id="res_config_settings_view_name_form" model="ir.ui.view">
<field name="name">res_config_settings_view</field> <field name="name">res_config_settings_view</field>
<field name="model">res.config.settings</field> <field name="model">res.config.settings</field>
<field name="inherit_id" ref="hr_payroll_community.res_config_settings_view_form"/> <field name="inherit_id" ref="hr_payroll_community.res_config_settings_view_form_payroll"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//div[hasclass('settings')]" position="inside"> <xpath expr="//div[@data-key='hr_payroll_community']//div[hasclass('o_settings_container')]" position="inside">
<div class="app_settings_block" data-string="Payroll" string="Payroll" data-key="hr_payroll_community"
groups="hr_payroll_community.group_hr_payroll_community_manager">
<div class="row mt16 o_settings_container" id="payroll_settings">
<div class="col-lg-6 col-12 o_setting_box"> <div class="col-lg-6 col-12 o_setting_box">
<div class="o_setting_left_pane"> <div class="o_setting_left_pane">
<field name="generate_payslip"/> <field name="generate_payslip"/>
@ -31,8 +28,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</xpath> </xpath>
</field> </field>
</record> </record>

Loading…
Cancel
Save