schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18782 from deepeshgarg007/test_case_fix_v11

Browse Source 
fix: Failing sales and purchase return test cases
This commit is contained in:
Mangesh-Khairnar
2019-08-19 19:21:05 +05:30
committed by GitHub
parent 55b8b4e374 f1618af76c
commit 2ca33d4f51
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/sales_and_purchase_return.py
View File

@@ -24,7 +24,9 @@ def validate_return_against(doc):
else:
ref_doc = frappe.get_doc(doc.doctype, doc.return_against)
if ref_doc.company == doc.company and ref_doc.customer == doc.customer and ref_doc.docstatus == 1:
party_type = "customer" if doc.doctype in ("Sales Invoice", "Delivery Note") else "supplier"
if ref_doc.company == doc.company and ref_doc.get(party_type) == doc.get(party_type) and ref_doc.docstatus == 1:
# validate posting date time
return_posting_datetime = "%s %s" % (doc.posting_date, doc.get("posting_time") or "00:00:00")
ref_posting_datetime = "%s %s" % (ref_doc.posting_date, ref_doc.get("posting_time") or "00:00:00")