From a3e7c38734117e3e46085def3756baebbe296a62 Mon Sep 17 00:00:00 2001 From: bcornwellmott Date: Thu, 5 Jan 2017 09:44:18 -0800 Subject: [PATCH 1/2] Fix number of digits on report Currently the cells can show many digits. --- .../report/quoted_item_comparison/quoted_item_comparison.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py index f627b4a6cd..48ca2d2a34 100644 --- a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py +++ b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals from erpnext.setup.utils import get_exchange_rate +from frappe.utils import flt, cint import frappe def execute(filters=None): @@ -20,6 +21,7 @@ def get_quote_list(item, qty_list): price_data = [] suppliers = [] company_currency = frappe.db.get_default("currency") + float_precision = cint(frappe.db.get_default("float_precision")) or 2 # Get the list of suppliers 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): @@ -46,7 +48,7 @@ def get_quote_list(item, 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] = item_price.rate * exchange_rate + row[col.key] = flt(item_price.rate * exchange_rate, float_precision) row[col.key + "QUOTE"] = item_price.parent break else: From 34e34ed1e8f4c6b9a672d7ab8d410cfb05304398 Mon Sep 17 00:00:00 2001 From: bcornwellmott Date: Fri, 6 Jan 2017 17:21:16 -0800 Subject: [PATCH 2/2] Trigger Restart of build checks --- .../report/quoted_item_comparison/quoted_item_comparison.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py index 48ca2d2a34..44e247e881 100644 --- a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py +++ b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py @@ -21,7 +21,7 @@ def get_quote_list(item, qty_list): price_data = [] suppliers = [] company_currency = frappe.db.get_default("currency") - float_precision = cint(frappe.db.get_default("float_precision")) or 2 + float_precision = cint(frappe.db.get_default("float_precision")) or 2 # Get the list of suppliers 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):