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

Fixing a regression in shopping_cart_settings that was caused by the change in structure of Currency Exchange Doctype

Browse Source
This commit is contained in:
Chude Osiegbu 2016-09-20 19:34:10 +01:00
parent 256ec170d0
commit 4a0c840076
1 changed files with 53 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
View File

@ -8,6 +8,7 @@ import frappe
from frappe import _, msgprint from frappe import _, msgprint
from frappe.utils import comma_and from frappe.utils import comma_and
from frappe.model.document import Document from frappe.model.document import Document
from frappe.utils import get_datetime, get_datetime_str, now_datetime
class ShoppingCartSetupError(frappe.ValidationError): pass class ShoppingCartSetupError(frappe.ValidationError): pass
@ -39,10 +40,17 @@ class ShoppingCartSettings(Document):
for currency in price_list_currency_map.values() for currency in price_list_currency_map.values()
if currency != company_currency] if currency != company_currency]
# manqala 20/09/2016: set up selection parameters for query from tabCurrency Exchange
from_currency = [currency for currency in price_list_currency_map.values() if currency != company_currency]
to_currency = company_currency
# manqala end
if expected_to_exist: if expected_to_exist:
exists = frappe.db.sql_list("""select name from `tabCurrency Exchange` # manqala 20/09/2016: modify query so that it uses date in the selection from Currency Exchange.
where name in (%s)""" % (", ".join(["%s"]*len(expected_to_exist)),), # exchange rates defined with date less than the date on which this document is being saved will be selected
tuple(expected_to_exist)) exists = frappe.db.sql_list("""select CONCAT(from_currency,'-',to_currency) from `tabCurrency Exchange`
where from_currency in (%s) and to_currency = "%s" and date <= curdate()""" % (", ".join(["%s"]*len(from_currency)), to_currency), tuple(from_currency))
# manqala end
missing = list(set(expected_to_exist).difference(exists)) missing = list(set(expected_to_exist).difference(exists))