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

Merge pull request #6045 from bcornwellmott/quotereportcurrency

Browse Source 
Quoted item currency
This commit is contained in:
Rushabh Mehta 2016-08-10 14:26:25 +05:30 committed by GitHub
commit 6646960e31
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,8 @@
# For license information, please see license.txt # For license information, please see license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
from erpnext.setup.utils import get_exchange_rate
import frappe import frappe
def execute(filters=None): def execute(filters=None):
@ -22,6 +24,7 @@ def get_quote_list(item, qty_list):
if item: if item:
price_data = [] price_data = []
suppliers = [] suppliers = []
company_currency = frappe.db.get_default("currency")
# Get the list of suppliers # 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 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): for splr in frappe.db.sql("""SELECT supplier from `tabSupplier Quotation` where name =%s and docstatus < 2""", root.parent, as_dict=1):
@ -35,6 +38,9 @@ def get_quote_list(item, qty_list):
#Add a row for each supplier #Add a row for each supplier
for root in set(suppliers): for root in set(suppliers):
supplier_currency = frappe.db.get_value("Supplier",root,"default_currency")
exg = get_exchange_rate(supplier_currency,company_currency)
row = frappe._dict({ row = frappe._dict({
"supplier_name": root "supplier_name": root
}) })
@ -42,7 +48,7 @@ def get_quote_list(item, qty_list):
# Get the quantity for this row # Get the quantity for this row
for item_price in price_data: for item_price in price_data:
if str(item_price.qty) == col.key and item_price.supplier == root: if str(item_price.qty) == col.key and item_price.supplier == root:
row[col.key] = item_price.rate row[col.key] = item_price.rate * exg
row[col.key + "QUOTE"] = item_price.parent row[col.key + "QUOTE"] = item_price.parent
break break
else: else: