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

fix: Failing sales and purchase return test cases

Browse Source
This commit is contained in:
deepeshgarg007 2019-08-19 14:38:15 +05:30
parent 5efedd7a60
commit c80e5fe7a1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/controllers/sales_and_purchase_return.py
View File

@ -24,7 +24,12 @@ def validate_return_against(doc):
else: else:
ref_doc = frappe.get_doc(doc.doctype, doc.return_against) 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: if doc.doctype == "Sales Invoice":
party_type == "customer"
else:
party_type == "supplier"
if ref_doc.company == doc.company and ref_doc.get(pary_type) == doc.get(party_type) and ref_doc.docstatus == 1:
# validate posting date time # validate posting date time
return_posting_datetime = "%s %s" % (doc.posting_date, doc.get("posting_time") or "00:00:00") 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") ref_posting_datetime = "%s %s" % (ref_doc.posting_date, ref_doc.get("posting_time") or "00:00:00")