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

Minor cleanup

Browse Source
This commit is contained in:
Ben Cornwell-Mott 2017-07-26 23:14:15 -07:00 committed by Nabin Hait
parent f7e42211b9
commit 48058a88e5
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
View File

@ -229,7 +229,6 @@ frappe.ui.form.on("Request for Quotation Supplier",{
} }
}); });
} }
} }
}) })

3
erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
View File

@ -173,7 +173,8 @@ class RequestforQuotation(BuyingController):
WHERE sq.supplier = %(supplier)s WHERE sq.supplier = %(supplier)s
AND sqi.docstatus = 1 AND sqi.docstatus = 1
AND sqi.request_for_quotation_item = %(rqi)s 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: if (sqi_count.count) == 0:
quote_status = _('Pending') quote_status = _('Pending')
supplier.quote_status = quote_status supplier.quote_status = quote_status

9
erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
View File

@ -74,12 +74,15 @@ class SupplierQuotation(BuyingController):
AND sqi.docstatus = 1 AND sqi.docstatus = 1
AND sq.name != %(me)s AND sq.name != %(me)s
AND sqi.request_for_quotation_item = %(rqi)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] AND sqi.parent = sq.name""",
self_count = sum(my_item.request_for_quotation_item == item.name for my_item in self.items) if include_me else 0 {"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: if (sqi_count.count + self_count) == 0:
quote_status = _('Pending') quote_status = _('Pending')
if quote_status == _('Received') and doc_sup.quote_status == _('No Quote'): 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, 'quote_status', quote_status)
frappe.db.set_value('Request for Quotation Supplier', doc_sup.name, 'no_quote', 0) frappe.db.set_value('Request for Quotation Supplier', doc_sup.name, 'no_quote', 0)
elif doc_sup.quote_status != _('No Quote'): elif doc_sup.quote_status != _('No Quote'):