mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-30 18:34:48 +00:00
Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
@@ -30,7 +30,6 @@ prob = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
def make(reset=False, simulate=True):
|
def make(reset=False, simulate=True):
|
||||||
webnotes.connect()
|
|
||||||
#webnotes.print_messages = True
|
#webnotes.print_messages = True
|
||||||
webnotes.mute_emails = True
|
webnotes.mute_emails = True
|
||||||
webnotes.rollback_on_exception = True
|
webnotes.rollback_on_exception = True
|
||||||
@@ -38,7 +37,7 @@ def make(reset=False, simulate=True):
|
|||||||
if reset:
|
if reset:
|
||||||
setup()
|
setup()
|
||||||
if simulate:
|
if simulate:
|
||||||
simulate()
|
_simulate()
|
||||||
|
|
||||||
def setup():
|
def setup():
|
||||||
install()
|
install()
|
||||||
@@ -50,7 +49,7 @@ def setup():
|
|||||||
# make_opening_stock()
|
# make_opening_stock()
|
||||||
# make_opening_accounts()
|
# make_opening_accounts()
|
||||||
|
|
||||||
def simulate():
|
def _simulate():
|
||||||
global runs_for
|
global runs_for
|
||||||
current_date = webnotes.utils.getdate(start_date)
|
current_date = webnotes.utils.getdate(start_date)
|
||||||
|
|
||||||
@@ -411,7 +410,4 @@ def import_data(dt, submit=False):
|
|||||||
if submit:
|
if submit:
|
||||||
webnotes.form_dict["params"] = json.dumps({"_submit": 1})
|
webnotes.form_dict["params"] = json.dumps({"_submit": 1})
|
||||||
webnotes.uploaded_file = os.path.join(os.path.dirname(__file__), "demo_docs", doctype+".csv")
|
webnotes.uploaded_file = os.path.join(os.path.dirname(__file__), "demo_docs", doctype+".csv")
|
||||||
upload()
|
upload()
|
||||||
|
|
||||||
if __name__=="__main__":
|
|
||||||
make()
|
|
||||||
@@ -6,7 +6,14 @@ import webnotes, os
|
|||||||
import utilities.demo.make_demo
|
import utilities.demo.make_demo
|
||||||
|
|
||||||
def make_demo_app():
|
def make_demo_app():
|
||||||
|
webnotes.mute_emails = 1
|
||||||
|
webnotes.connect()
|
||||||
|
utilities.demo.make_demo.make(reset=True, simulate=False)
|
||||||
|
# setup demo user etc so that the site it up faster, while the data loads
|
||||||
|
make_demo_user()
|
||||||
|
make_demo_login_page()
|
||||||
|
make_demo_on_login_script()
|
||||||
|
utilities.demo.make_demo.make(reset=False, simulate=True)
|
||||||
|
|
||||||
def make_demo_user():
|
def make_demo_user():
|
||||||
roles = ["Accounts Manager", "Analytics", "Expense Approver", "Accounts User",
|
roles = ["Accounts Manager", "Analytics", "Expense Approver", "Accounts User",
|
||||||
@@ -111,11 +118,4 @@ def make_demo_on_login_script():
|
|||||||
webnotes.conn.commit()
|
webnotes.conn.commit()
|
||||||
|
|
||||||
if __name__=="__main__":
|
if __name__=="__main__":
|
||||||
# webnotes.connect()
|
make_demo_app()
|
||||||
webnotes.mute_emails = 1
|
|
||||||
utilities.demo.make_demo.make(reset=True, simulate=False)
|
|
||||||
# setup demo user etc so that the site it up faster, while the data loads
|
|
||||||
make_demo_user()
|
|
||||||
make_demo_login_page()
|
|
||||||
make_demo_on_login_script()
|
|
||||||
utilities.demo.make_demo.make(reset=False, simulate=True)
|
|
||||||
Reference in New Issue
Block a user