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

2
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@ -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): 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 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") outstanding_amount = ref_doc.get("outstanding_amount")
bill_no = ref_doc.get("bill_no") bill_no = ref_doc.get("bill_no")
elif reference_doctype == "Expense Claim": elif reference_doctype == "Expense Claim":

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

@ -137,8 +137,7 @@ 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", {
"salary_component": "Basic Salary" "salary_component": "Basic Salary"