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

Resolve merge conflicts from enterprise_sprint branch

Browse Source
This commit is contained in:
Saurabh
2018-05-14 21:15:46 +05:30
parent 044d6908cf 8b04d431c0
commit 2ca83d61ea
463 changed files with 35469 additions and 5844 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/utilities/user_progress_utils.py
View File

@@ -63,7 +63,7 @@ def create_suppliers(args_data):
doc = frappe.get_doc({
"doctype":"Supplier",
"supplier_name": supplier,
"supplier_type": _("Local"),
"supplier_group": _("Local"),
"company": defaults.get("company")
}).insert()