Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22634 from Anurag810/retention-bonus-fixes

Browse Source 
fix: default overwrite property and 'company' is not defined
This commit is contained in:
rohitwaghchaure 2020-07-10 13:41:40 +05:30 committed by GitHub
commit bca8483dc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/payroll/doctype/employee_incentive/employee_incentive.py
View File

@ -13,6 +13,7 @@ class EmployeeIncentive(Document):
additional_salary = frappe.new_doc('Additional Salary') additional_salary = frappe.new_doc('Additional Salary')
additional_salary.employee = self.employee additional_salary.employee = self.employee
additional_salary.salary_component = self.salary_component additional_salary.salary_component = self.salary_component
additional_salary.overwrite_salary_structure_amount = 0
additional_salary.amount = self.incentive_amount additional_salary.amount = self.incentive_amount
additional_salary.payroll_date = self.payroll_date additional_salary.payroll_date = self.payroll_date
additional_salary.company = company additional_salary.company = company

3
erpnext/payroll/doctype/retention_bonus/retention_bonus.py
View File

@ -26,6 +26,7 @@ class RetentionBonus(Document):
additional_salary.amount = self.bonus_amount additional_salary.amount = self.bonus_amount
additional_salary.payroll_date = self.bonus_payment_date additional_salary.payroll_date = self.bonus_payment_date
additional_salary.company = company additional_salary.company = company
additional_salary.overwrite_salary_structure_amount = 0
additional_salary.ref_doctype = self.doctype additional_salary.ref_doctype = self.doctype
additional_salary.ref_docname = self.name additional_salary.ref_docname = self.name
additional_salary.submit() additional_salary.submit()
@ -53,7 +54,7 @@ class RetentionBonus(Document):
'employee': self.employee, 'employee': self.employee,
'salary_component': self.salary_component, 'salary_component': self.salary_component,
'payroll_date': self.bonus_payment_date, 'payroll_date': self.bonus_payment_date,
'company': company, 'company': self.company,
'docstatus': 1, 'docstatus': 1,
'ref_doctype': self.doctype, 'ref_doctype': self.doctype,
'ref_docname': self.name 'ref_docname': self.name