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

fix: conflict

Browse Source
This commit is contained in:
Anurag Mishra 2020-12-02 13:32:02 +05:30
parent 708065cb85
commit ba6ff6e227
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/payroll/doctype/gratuity/test_gratuity.py
View File

@ -137,7 +137,6 @@ def get_gratuity_rule(name):
rule = frappe.db.exists("Gratuity Rule", name) rule = frappe.db.exists("Gratuity Rule", name)
if not rule: if not rule:
create_gratuity_rule() create_gratuity_rule()
else:
rule = frappe.get_doc("Gratuity Rule", name) rule = frappe.get_doc("Gratuity Rule", name)
rule.applicable_earnings_component = [] rule.applicable_earnings_component = []
rule.append("applicable_earnings_component", { rule.append("applicable_earnings_component", {