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

Merge branch 'develop' into remove-nonprofit

Browse Source
This commit is contained in:
ChillarAnand
2022-02-03 16:38:01 +05:30
parent 899ca8b384 a7a2b82538
commit 325dc92d37
357 changed files with 16064 additions and 5442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/setup/setup_wizard/operations/company_setup.py
View File

@@ -29,10 +29,10 @@ def create_fiscal_year_and_company(args):
'domain': args.get('domains')[0]
}).insert()
def enable_shopping_cart(args):
def enable_shopping_cart(args): # nosemgrep
# Needs price_lists
frappe.get_doc({
"doctype": "Shopping Cart Settings",
"doctype": "E Commerce Settings",
"enabled": 1,
'company': args.get('company_name') ,
'price_list': frappe.db.get_value("Price List", {"selling": 1}),

4
erpnext/setup/setup_wizard/operations/install_fixtures.py
View File

@@ -533,8 +533,8 @@ def create_bank_account(args):
# bank account same as a CoA entry
pass
def update_shopping_cart_settings(args):
shopping_cart = frappe.get_doc("Shopping Cart Settings")
def update_shopping_cart_settings(args): # nosemgrep
shopping_cart = frappe.get_doc("E Commerce Settings")
shopping_cart.update({
"enabled": 1,
'company': args.company_name,