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

fix: Sider, Linter

Browse Source 
- Moved return to next line
- Space between function import and body

(cherry picked from commit a780f78f38)
This commit is contained in:
marination
2021-10-12 13:18:28 +05:30
committed by mergify-bot
parent 1590ac3ec7
commit 6b8dad9454
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,13 +18,15 @@ def set_cart_count(login_manager):
# make sure user is already a customer # make sure user is already a customer
# before trying to set cart count # before trying to set cart count
user_is_customer = is_customer() user_is_customer = is_customer()
if not user_is_customer: return if not user_is_customer:
return
if show_cart_count(): if show_cart_count():
<<<<<<< HEAD:erpnext/e_commerce/shopping_cart/utils.py <<<<<<< 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 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