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

[hotfix] fixes and refactored Quoted Item Comparison report (#10954)

Browse Source
This commit is contained in:
Makarand Bauskar 2017-09-28 12:30:04 +05:30 committed by Nabin Hait
parent a0ba5594f9
commit 53e19075d1
2 changed files with 91 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js
View File

@ -2,29 +2,29 @@
// For license information, please see license.txt // For license information, please see license.txt
frappe.query_reports["Quoted Item Comparison"] = { frappe.query_reports["Quoted Item Comparison"] = {
"filters": [ filters: [
{ {
"fieldname": "supplier_quotation", fieldtype: "Link",
"label": __("Supplier Quotation"), label: __("Supplier Quotation"),
"fieldtype": "Link", options: "Supplier Quotation",
"options": "Supplier Quotation", fieldname: "supplier_quotation",
"default": "", default: "",
"get_query": function () { get_query: () => {
return { filters: { "docstatus": ["<", 2] } } return { filters: { "docstatus": ["<", 2] } }
} }
}, },
{ {
"fieldname": "item", reqd: 1,
"label": __("Item"), default: "",
"fieldtype": "Link", options: "Item",
"options": "Item", label: __("Item"),
"default": "", fieldname: "item",
"reqd": 1, fieldtype: "Link",
"get_query": function () { get_query: () => {
var quote = frappe.query_report_filters_by_name.supplier_quotation.get_value(); let quote = frappe.query_report_filters_by_name.supplier_quotation.get_value();
if (quote != "") { if (quote != "") {
return { return {
query: "erpnext.buying.doctype.quality_inspection.quality_inspection.item_query", query: "erpnext.stock.doctype.quality_inspection.quality_inspection.item_query",
filters: { filters: {
"from": "Supplier Quotation Item", "from": "Supplier Quotation Item",
"parent": quote "parent": quote
@ -39,47 +39,50 @@ frappe.query_reports["Quoted Item Comparison"] = {
} }
} }
], ],
onload: function (report) { onload: (report) => {
// Create a button for setting the default supplier // Create a button for setting the default supplier
report.page.add_inner_button(__("Select Default Supplier"), function () { report.page.add_inner_button(__("Select Default Supplier"), () => {
let reporter = frappe.query_reports["Quoted Item Comparison"];
var reporter = frappe.query_reports["Quoted Item Comparison"];
//Always make a new one so that the latest values get updated //Always make a new one so that the latest values get updated
reporter.make_default_supplier_dialog(report); reporter.make_default_supplier_dialog(report);
report.dialog.show();
setTimeout(function () { report.dialog.input.focus(); }, 1000);
}, 'Tools'); }, 'Tools');
}, },
"make_default_supplier_dialog": function (report) { make_default_supplier_dialog: (report) => {
// Get the name of the item to change // Get the name of the item to change
var filters = report.get_values(); if(!report.data) return;
var item_code = filters.item;
let filters = report.get_values();
let item_code = filters.item;
// Get a list of the suppliers (with a blank as well) for the user to select // Get a list of the suppliers (with a blank as well) for the user to select
var select_options = ""; let suppliers = $.map(report.data, (row, idx)=>{ return row.supplier_name })
for (let supplier of report.data) {
select_options += supplier.supplier_name + '\n'
}
// Create a dialog window for the user to pick their supplier // Create a dialog window for the user to pick their supplier
var d = new frappe.ui.Dialog({ let dialog = new frappe.ui.Dialog({
title: __('Select Default Supplier'), title: __('Select Default Supplier'),
fields: [ fields: [
{ fieldname: 'supplier', fieldtype: 'Select', label: 'Supplier', reqd: 1, options: select_options }, {
{ fieldname: 'ok_button', fieldtype: 'Button', label: 'Set Default Supplier' }, reqd: 1,
label: 'Supplier',
fieldtype: 'Link',
options: 'Supplier',
fieldname: 'supplier',
get_query: () => {
return {
filters: {
'name': ['in', suppliers]
}
}
}
}
] ]
}); });
// On the user clicking the ok button dialog.set_primary_action("Set Default Supplier", () => {
d.fields_dict.ok_button.input.onclick = function () { let values = dialog.get_values();
var btn = d.fields_dict.ok_button.input; if(values) {
var v = report.dialog.get_values();
if (v) {
$(btn).set_working();
// Set the default_supplier field of the appropriate Item to the selected supplier // Set the default_supplier field of the appropriate Item to the selected supplier
frappe.call({ frappe.call({
method: "frappe.client.set_value", method: "frappe.client.set_value",
@ -87,17 +90,17 @@ frappe.query_reports["Quoted Item Comparison"] = {
doctype: "Item", doctype: "Item",
name: item_code, name: item_code,
fieldname: "default_supplier", fieldname: "default_supplier",
value: v.supplier, value: values.supplier,
}, },
callback: function (r) { freeze: true,
$(btn).done_working(); callback: (r) => {
frappe.msgprint("Successfully Set Supplier"); frappe.msgprint("Successfully Set Supplier");
report.dialog.hide(); dialog.hide();
} }
}); });
} }
} });
report.dialog = d; dialog.show();
} }
} }

79
erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py
View File

@ -8,53 +8,55 @@ import frappe
def execute(filters=None): def execute(filters=None):
qty_list = get_quantity_list(filters.item) qty_list = get_quantity_list(filters.item)
data = get_quote_list(filters.item, qty_list) data = get_quote_list(filters.item, qty_list)
columns = get_columns(qty_list) columns = get_columns(qty_list)
return columns, data return columns, data
def get_quote_list(item, qty_list): def get_quote_list(item, qty_list):
out = [] out = []
if item: if not item:
price_data = [] return []
suppliers = []
company_currency = frappe.db.get_default("currency") suppliers = []
float_precision = cint(frappe.db.get_default("float_precision")) or 2 price_data = []
# Get the list of suppliers company_currency = frappe.db.get_default("currency")
for root in frappe.db.sql("""select parent, qty, rate from `tabSupplier Quotation Item` where item_code=%s and docstatus < 2""", item, as_dict=1): float_precision = cint(frappe.db.get_default("float_precision")) or 2
for splr in frappe.db.sql("""SELECT supplier from `tabSupplier Quotation` where name =%s and docstatus < 2""", root.parent, as_dict=1): # Get the list of suppliers
ip = frappe._dict({ for root in frappe.db.sql("""select parent, qty, rate from `tabSupplier Quotation Item`
where item_code=%s and docstatus < 2""", item, as_dict=1):
for splr in frappe.db.sql("""select supplier from `tabSupplier Quotation`
where name =%s and docstatus < 2""", root.parent, as_dict=1):
ip = frappe._dict({
"supplier": splr.supplier, "supplier": splr.supplier,
"qty": root.qty, "qty": root.qty,
"parent": root.parent, "parent": root.parent,
"rate": root.rate}) "rate": root.rate
price_data.append(ip)
suppliers.append(splr.supplier)
#Add a row for each supplier
for root in set(suppliers):
supplier_currency = frappe.db.get_value("Supplier", root, "default_currency")
if supplier_currency:
exchange_rate = get_exchange_rate(supplier_currency, company_currency)
else:
exchange_rate = 1
row = frappe._dict({
"supplier_name": root
}) })
for col in qty_list: price_data.append(ip)
# Get the quantity for this row suppliers.append(splr.supplier)
for item_price in price_data:
if str(item_price.qty) == col.key and item_price.supplier == root: #Add a row for each supplier
row[col.key] = flt(item_price.rate * exchange_rate, float_precision) for root in set(suppliers):
row[col.key + "QUOTE"] = item_price.parent supplier_currency = frappe.db.get_value("Supplier", root, "default_currency")
break if supplier_currency:
else: exchange_rate = get_exchange_rate(supplier_currency, company_currency)
row[col.key] = "" else:
row[col.key + "QUOTE"] = "" exchange_rate = 1
out.append(row)
row = frappe._dict({
"supplier_name": root
})
for col in qty_list:
# Get the quantity for this row
for item_price in price_data:
if str(item_price.qty) == col.key and item_price.supplier == root:
row[col.key] = flt(item_price.rate * exchange_rate, float_precision)
row[col.key + "QUOTE"] = item_price.parent
break
else:
row[col.key] = ""
row[col.key + "QUOTE"] = ""
out.append(row)
return out return out
@ -62,7 +64,8 @@ def get_quantity_list(item):
out = [] out = []
if item: if item:
qty_list = frappe.db.sql("""select distinct qty from `tabSupplier Quotation Item` where ifnull(item_code,'')=%s and docstatus < 2""", item, as_dict=1) qty_list = frappe.db.sql("""select distinct qty from `tabSupplier Quotation Item`
where ifnull(item_code,'')=%s and docstatus < 2""", item, as_dict=1)
qty_list.sort(reverse=False) qty_list.sort(reverse=False)
for qt in qty_list: for qt in qty_list:
col = frappe._dict({ col = frappe._dict({