fix: conflict
This commit is contained in:
parent
708065cb85
commit
ba6ff6e227
@ -1036,7 +1036,7 @@ def get_total_amount_exchange_rate_base_on_currency(party_account_currency, comp
|
||||
|
||||
def get_bill_no_and_update_amounts(reference_doctype, ref_doc, total_amount, exchange_rate, party_account_currency, company_currency):
|
||||
outstanding_amount, bill_no = None
|
||||
if reference_doctype in ("Sales Invoice", "Purchase Invoice"):
|
||||
if reference_doctype in ("Sales Invoice", "Purchase Invoice"):
|
||||
outstanding_amount = ref_doc.get("outstanding_amount")
|
||||
bill_no = ref_doc.get("bill_no")
|
||||
elif reference_doctype == "Expense Claim":
|
||||
|
@ -137,8 +137,7 @@ def get_gratuity_rule(name):
|
||||
rule = frappe.db.exists("Gratuity Rule", name)
|
||||
if not rule:
|
||||
create_gratuity_rule()
|
||||
else:
|
||||
rule = frappe.get_doc("Gratuity Rule", name)
|
||||
rule = frappe.get_doc("Gratuity Rule", name)
|
||||
rule.applicable_earnings_component = []
|
||||
rule.append("applicable_earnings_component", {
|
||||
"salary_component": "Basic Salary"
|
||||
|
Loading…
x
Reference in New Issue
Block a user