nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 07:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12

Browse Source 
# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/customer/customer.json
This commit is contained in:
Saif Ur Rehman
2019-01-24 23:40:16 +05:00
parent 74a3370095 41b3756df5
commit 3d275af67b
39 changed files with 593 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/shopping_cart/product_info.py
View File

@@ -6,7 +6,7 @@ from __future__ import unicode_literals
import frappe
from erpnext.shopping_cart.cart import _get_cart_quotation
from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings \
import is_cart_enabled, get_shopping_cart_settings, show_quantity_in_website
import get_shopping_cart_settings, show_quantity_in_website
from erpnext.utilities.product import get_price, get_qty_in_stock
@frappe.whitelist(allow_guest=True)