CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 10:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: currency symbol in the Supplier Quotation Comparison report (#37337)

Browse Source 
fix: currency in the Supplier Quotation Comparison report
This commit is contained in:
rohitwaghchaure
2023-10-03 18:53:43 +05:30
committed by GitHub
parent 6daea6ccb2
commit 82e8606b3c
1 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py
View File

@@ -35,8 +35,12 @@ def get_data(filters):
sq_item.parent, sq_item.parent,
sq_item.item_code, sq_item.item_code,
sq_item.qty, sq_item.qty,
sq.currency,
sq_item.stock_qty, sq_item.stock_qty,
sq_item.amount, sq_item.amount,
sq_item.base_rate,
sq_item.base_amount,
sq.price_list_currency,
sq_item.uom, sq_item.uom,
sq_item.stock_uom, sq_item.stock_uom,
sq_item.request_for_quotation, sq_item.request_for_quotation,
@@ -105,7 +109,11 @@ def prepare_data(supplier_quotation_data, filters):
"qty": data.get("qty"), "qty": data.get("qty"),
"price": flt(data.get("amount") * exchange_rate, float_precision), "price": flt(data.get("amount") * exchange_rate, float_precision),
"uom": data.get("uom"), "uom": data.get("uom"),
"price_list_currency": data.get("price_list_currency"),
"currency": data.get("currency"),
"stock_uom": data.get("stock_uom"), "stock_uom": data.get("stock_uom"),
"base_amount": flt(data.get("base_amount"), float_precision),
"base_rate": flt(data.get("base_rate"), float_precision),
"request_for_quotation": data.get("request_for_quotation"), "request_for_quotation": data.get("request_for_quotation"),
"valid_till": data.get("valid_till"), "valid_till": data.get("valid_till"),
"lead_time_days": data.get("lead_time_days"), "lead_time_days": data.get("lead_time_days"),
@@ -183,6 +191,8 @@ def prepare_chart_data(suppliers, qty_list, supplier_qty_price_map):
def get_columns(filters): def get_columns(filters):
currency = frappe.get_cached_value("Company", filters.get("company"), "default_currency")
group_by_columns = [ group_by_columns = [
{ {
"fieldname": "supplier_name", "fieldname": "supplier_name",
@@ -203,11 +213,18 @@ def get_columns(filters):
columns = [ columns = [
{"fieldname": "uom", "label": _("UOM"), "fieldtype": "Link", "options": "UOM", "width": 90}, {"fieldname": "uom", "label": _("UOM"), "fieldtype": "Link", "options": "UOM", "width": 90},
{"fieldname": "qty", "label": _("Quantity"), "fieldtype": "Float", "width": 80}, {"fieldname": "qty", "label": _("Quantity"), "fieldtype": "Float", "width": 80},
{
"fieldname": "currency",
"label": _("Currency"),
"fieldtype": "Link",
"options": "Currency",
"width": 110,
},
{ {
"fieldname": "price", "fieldname": "price",
"label": _("Price"), "label": _("Price"),
"fieldtype": "Currency", "fieldtype": "Currency",
"options": "Company:company:default_currency", "options": "currency",
"width": 110, "width": 110,
}, },
{ {
@@ -221,9 +238,23 @@ def get_columns(filters):
"fieldname": "price_per_unit", "fieldname": "price_per_unit",
"label": _("Price per Unit (Stock UOM)"), "label": _("Price per Unit (Stock UOM)"),
"fieldtype": "Currency", "fieldtype": "Currency",
"options": "Company:company:default_currency", "options": "currency",
"width": 120, "width": 120,
}, },
{
"fieldname": "base_amount",
"label": _("Price ({0})").format(currency),
"fieldtype": "Currency",
"options": "price_list_currency",
"width": 180,
},
{
"fieldname": "base_rate",
"label": _("Price Per Unit ({0})").format(currency),
"fieldtype": "Currency",
"options": "price_list_currency",
"width": 180,
},
{ {
"fieldname": "quotation", "fieldname": "quotation",
"label": _("Supplier Quotation"), "label": _("Supplier Quotation"),