nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 18:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2016-12-08 14:09:23 +05:30
parent 72c5aec68b 4a0c840076
commit 1cc55fbbcb
18 changed files with 326 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@
from __future__ import unicode_literals
from erpnext.setup.utils import get_exchange_rate
from erpnext.utils import nowdate
import frappe
@@ -39,7 +40,7 @@ def get_quote_list(item, qty_list):
#Add a row for each supplier
for root in set(suppliers):
supplier_currency = frappe.db.get_value("Supplier",root,"default_currency")
exg = get_exchange_rate(supplier_currency,company_currency)
exg = get_exchange_rate(nowdate(),supplier_currency,company_currency)
row = frappe._dict({
"supplier_name": root