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

Merge branch 'staging' into develop

Browse Source
This commit is contained in:
Sagar Vora
2019-01-29 18:39:14 +05:30
parent f1ff5c24ff 3f1fb9ca7e
commit f97c5dad82
355 changed files with 6308 additions and 4924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/demo/setup/education.py
View File

@@ -1,5 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe, json
from frappe.utils.make_random import get_random
@@ -162,7 +163,7 @@ def make_assessment_groups():
def get_json_path(doctype):
return frappe.get_app_path('erpnext', 'demo', 'data', frappe.scrub(doctype) + '.json')
def weighted_choice(weights):
totals = []
running_total = 0

1
erpnext/demo/setup/healthcare.py
View File

@@ -1,5 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe, json
from frappe.utils.make_random import get_random