[fix] [minor] stock uom and price list currency in webshop
diff --git a/selling/utils/product.py b/selling/utils/product.py
index 93a7194..3432170 100644
--- a/selling/utils/product.py
+++ b/selling/utils/product.py
@@ -27,7 +27,7 @@
else:
in_stock = -1
- price = price_list and webnotes.conn.sql("""select ip.ref_rate, pl.ref_currency from
+ price = price_list and webnotes.conn.sql("""select ip.ref_rate, pl.currency from
`tabItem Price` ip, `tabPrice List` pl where ip.parent = pl.name and
ip.item_code=%s and ip.parent=%s""",
(item_code, price_list), as_dict=1) or []
@@ -36,10 +36,10 @@
qty = 0
if price:
- price["formatted_price"] = fmt_money(price["ref_rate"], currency=price["ref_currency"])
+ price["formatted_price"] = fmt_money(price["ref_rate"], currency=price["currency"])
- price["ref_currency"] = not cint(webnotes.conn.get_default("hide_currency_symbol")) \
- and (webnotes.conn.get_value("Currency", price.ref_currency, "symbol") or price.ref_currency) \
+ price["currency"] = not cint(webnotes.conn.get_default("hide_currency_symbol")) \
+ and (webnotes.conn.get_value("Currency", price.currency, "symbol") or price.currency) \
or ""
if webnotes.session.user != "Guest":
diff --git a/stock/doctype/item/item.py b/stock/doctype/item/item.py
index 1ece420..008886e 100644
--- a/stock/doctype/item/item.py
+++ b/stock/doctype/item/item.py
@@ -75,8 +75,8 @@
bin_list = webnotes.conn.sql("select * from tabBin where item_code=%s",
self.doc.item_code, as_dict=1)
for bin in bin_list:
- if bin.reserved_qty > 0 or bin.ordered_qty > 0 or bin.indented_qty > 0 \
- or bin.planned_qty > 0 and cstr(bin.stock_uom) != cstr(self.doc.stock_uom):
+ if (bin.reserved_qty > 0 or bin.ordered_qty > 0 or bin.indented_qty > 0 \
+ or bin.planned_qty > 0) and cstr(bin.stock_uom) != cstr(self.doc.stock_uom):
matched = False
break