schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Merge conflicts with e-commerce

Browse Source
This commit is contained in:
marination
2021-10-12 20:29:13 +05:30
parent 6b8dad9454
commit f3650b4f9d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/e_commerce/shopping_cart/utils.py
View File

@@ -22,15 +22,11 @@ def set_cart_count(login_manager):
return return
if show_cart_count(): if show_cart_count():
<<<<<<< HEAD:erpnext/e_commerce/shopping_cart/utils.py
from erpnext.e_commerce.shopping_cart.cart import set_cart_count from erpnext.e_commerce.shopping_cart.cart import set_cart_count
=======
from erpnext.shopping_cart.cart import set_cart_count
# set_cart_count will try to fetch existing cart quotation # set_cart_count will try to fetch existing cart quotation
# or create one if non existent (and create a customer too) # or create one if non existent (and create a customer too)
# cart count is calculated from this quotation's items # cart count is calculated from this quotation's items
>>>>>>> d824a90fac (fix: Avoid automatic customer creation on website user login):erpnext/shopping_cart/utils.py
set_cart_count() set_cart_count()
def clear_cart_count(login_manager): def clear_cart_count(login_manager):