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

fix: removed filters(not required) (#18729)

Browse Source
This commit is contained in:
Anurag Mishra 2019-08-19 10:31:02 +05:30 committed by Nabin Hait
parent bc5712a1b3
commit 19c3cb0d5b
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/controllers/sales_and_purchase_return.py
View File

@ -18,18 +18,13 @@ def validate_return(doc):
validate_returned_items(doc) validate_returned_items(doc)
def validate_return_against(doc): def validate_return_against(doc):
filters = {"doctype": doc.doctype, "docstatus": 1, "company": doc.company} if not frappe.db.exists(doc.doctype, doc.return_against):
if doc.meta.get_field("customer") and doc.customer:
filters["customer"] = doc.customer
elif doc.meta.get_field("supplier") and doc.supplier:
filters["supplier"] = doc.supplier
if not frappe.db.exists(filters):
frappe.throw(_("Invalid {0}: {1}") frappe.throw(_("Invalid {0}: {1}")
.format(doc.meta.get_label("return_against"), doc.return_against)) .format(doc.meta.get_label("return_against"), doc.return_against))
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:
# 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")