[fix] [minor] merge conflict fixed

This commit is contained in:
Akhilesh Darjee
2013-09-11 14:49:38 +05:30
17 changed files with 115 additions and 57 deletions

View File

@@ -11,7 +11,7 @@ from website.helpers.cart import _get_cart_quotation
@webnotes.whitelist(allow_guest=True)
def get_product_info(item_code):
"""get product price / stock info"""
if not webnotes.conn.get_default("shopping_cart_enabled"):
if not cint(webnotes.conn.get_default("shopping_cart_enabled")):
return {}
cart_quotation = _get_cart_quotation()