From f92f97b47421170b2fb319c8e6fd3874abcd3c81 Mon Sep 17 00:00:00 2001 From: tundebabzy Date: Wed, 18 Oct 2017 08:30:30 +0100 Subject: [PATCH] Fix for Demo (#11242) * [fix] add from date field to salary structure in setup demo data * switch off mode of payment creation to allow make complete without error --- erpnext/demo/setup/setup_data.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/demo/setup/setup_data.py b/erpnext/demo/setup/setup_data.py index 902bbabd1e1..54bc769bdc9 100644 --- a/erpnext/demo/setup/setup_data.py +++ b/erpnext/demo/setup/setup_data.py @@ -14,6 +14,7 @@ def setup(domain): setup_holiday_list() setup_user() setup_employee() + setup_user_roles() employees = frappe.get_all('Employee', fields=['name', 'date_of_joining']) @@ -24,7 +25,6 @@ def setup(domain): setup_salary_structure(employees[5:], 1) setup_leave_allocation() - setup_user_roles() setup_customer() setup_supplier() setup_warehouse() @@ -32,7 +32,7 @@ def setup(domain): import_json('Contact') import_json('Lead') setup_currency_exchange() - setup_mode_of_payment() + # setup_mode_of_payment() setup_account_to_expense_type() setup_budget() setup_pos_profile() @@ -136,6 +136,7 @@ def setup_salary_structure(employees, salary_slip_based_on_timesheet=0): for e in employees: ss.append('employees', { 'employee': e.name, + 'from_date': "2015-01-01", 'base': random.random() * 10000 })