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

Fix for Demo (#11242)

Browse Source 
* [fix] add from date field to salary structure in setup demo data

* switch off mode of payment creation to allow make complete without error
This commit is contained in:
tundebabzy
2017-10-18 08:30:30 +01:00
committed by Rushabh Mehta
parent c4894a5287
commit f92f97b474
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/demo/setup/setup_data.py
View File

@@ -14,6 +14,7 @@ def setup(domain):
setup_holiday_list() setup_holiday_list()
setup_user() setup_user()
setup_employee() setup_employee()
setup_user_roles()
employees = frappe.get_all('Employee', fields=['name', 'date_of_joining']) employees = frappe.get_all('Employee', fields=['name', 'date_of_joining'])
@@ -24,7 +25,6 @@ def setup(domain):
setup_salary_structure(employees[5:], 1) setup_salary_structure(employees[5:], 1)
setup_leave_allocation() setup_leave_allocation()
setup_user_roles()
setup_customer() setup_customer()
setup_supplier() setup_supplier()
setup_warehouse() setup_warehouse()
@@ -32,7 +32,7 @@ def setup(domain):
import_json('Contact') import_json('Contact')
import_json('Lead') import_json('Lead')
setup_currency_exchange() setup_currency_exchange()
setup_mode_of_payment() # setup_mode_of_payment()
setup_account_to_expense_type() setup_account_to_expense_type()
setup_budget() setup_budget()
setup_pos_profile() setup_pos_profile()
@@ -136,6 +136,7 @@ def setup_salary_structure(employees, salary_slip_based_on_timesheet=0):
for e in employees: for e in employees:
ss.append('employees', { ss.append('employees', {
'employee': e.name, 'employee': e.name,
'from_date': "2015-01-01",
'base': random.random() * 10000 'base': random.random() * 10000
}) })