From 48058a88e5a0416ae58b7bfd3e6a1da8197247a1 Mon Sep 17 00:00:00 2001 From: Ben Cornwell-Mott Date: Wed, 26 Jul 2017 23:14:15 -0700 Subject: [PATCH] Minor cleanup --- .../request_for_quotation/request_for_quotation.js | 1 - .../request_for_quotation/request_for_quotation.py | 3 ++- .../doctype/supplier_quotation/supplier_quotation.py | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js index 6b37edafc7..8509d77e20 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js @@ -229,7 +229,6 @@ frappe.ui.form.on("Request for Quotation Supplier",{ } }); } - } }) diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py index a8e897c2dd..4a88191edc 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py @@ -173,7 +173,8 @@ class RequestforQuotation(BuyingController): WHERE sq.supplier = %(supplier)s AND sqi.docstatus = 1 AND sqi.request_for_quotation_item = %(rqi)s - AND sqi.parent = sq.name""", {"supplier": supplier.supplier, "rqi": item.name}, as_dict=1)[0] + AND sqi.parent = sq.name""", + {"supplier": supplier.supplier, "rqi": item.name}, as_dict=1)[0] if (sqi_count.count) == 0: quote_status = _('Pending') supplier.quote_status = quote_status diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py index 5e17dce610..4de2c00596 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py @@ -74,12 +74,15 @@ class SupplierQuotation(BuyingController): AND sqi.docstatus = 1 AND sq.name != %(me)s AND sqi.request_for_quotation_item = %(rqi)s - AND sqi.parent = sq.name""", {"supplier": self.supplier, "rqi": item.name, 'me': self.name}, as_dict=1)[0] - self_count = sum(my_item.request_for_quotation_item == item.name for my_item in self.items) if include_me else 0 + AND sqi.parent = sq.name""", + {"supplier": self.supplier, "rqi": item.name, 'me': self.name}, as_dict=1)[0] + self_count = sum(my_item.request_for_quotation_item == item.name + for my_item in self.items) if include_me else 0 if (sqi_count.count + self_count) == 0: quote_status = _('Pending') if quote_status == _('Received') and doc_sup.quote_status == _('No Quote'): - frappe.msgprint(_("{0} indicates that {1} will not provide a quotation, but all items have been quoted. Updating the RFQ quote status.").format(doc.name, self.supplier)) + frappe.msgprint(_("{0} indicates that {1} will not provide a quotation, but all items \ + have been quoted. Updating the RFQ quote status.").format(doc.name, self.supplier)) frappe.db.set_value('Request for Quotation Supplier', doc_sup.name, 'quote_status', quote_status) frappe.db.set_value('Request for Quotation Supplier', doc_sup.name, 'no_quote', 0) elif doc_sup.quote_status != _('No Quote'):