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

Merge branch 'version-13-hotfix' into merge-hotfix-to-pre-release-v13-11-0

Browse Source
This commit is contained in:
Rohit Waghchaure
2021-09-10 12:41:19 +05:30
parent 210fc4481a 3b7e981ccd
commit c25bc3403d
2507 changed files with 25379 additions and 14483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,16 +3,20 @@
from __future__ import unicode_literals
import frappe, os, json
import json
import os
import frappe
from frappe import _
from frappe.desk.doctype.global_search_settings.global_search_settings import (
update_global_search_doctypes,
)
from frappe.desk.page.setup_wizard.setup_wizard import make_records
from frappe.utils import cstr, getdate
from frappe.desk.doctype.global_search_settings.global_search_settings import update_global_search_doctypes
from frappe.utils.nestedset import rebuild_tree
from erpnext.accounts.doctype.account.account import RootNotEditable
from erpnext.regional.address_template.setup import set_up_address_templates
from frappe.utils.nestedset import rebuild_tree
default_lead_sources = ["Existing Customer", "Reference", "Advertisement",
"Cold Calling", "Exhibition", "Supplier Reference", "Mass Mailing",
@@ -512,7 +516,7 @@ def create_bank_account(args):
pass
def update_shopping_cart_settings(args):
shopping_cart = frappe.get_doc("Shopping Cart Settings")
shopping_cart = frappe.get_doc("E Commerce Settings")
shopping_cart.update({
"enabled": 1,
'company': args.company_name,