diff --git a/erpnext/demo/data/employee.json b/erpnext/demo/data/employee.json index a77d706ae5a..2d2dbe894bc 100644 --- a/erpnext/demo/data/employee.json +++ b/erpnext/demo/data/employee.json @@ -1,92 +1,92 @@ [ - { - "date_of_birth": "1982-01-03", - "date_of_joining": "2001-10-10", - "employee_name": "Diana Prince", - "first_name": "Diana", - "last_name": "Prince", - "gender": "Female", - "user_id": "DianaPrince@example.com" - }, - { - "date_of_birth": "1959-02-03", - "date_of_joining": "1976-09-16", - "employee_name": "Zatanna Zatara", - "gender": "Female", - "user_id": "ZatannaZatara@example.com", - "first_name": "Zatanna", - "last_name": "Zatara" - }, - { - "date_of_birth": "1982-03-03", - "date_of_joining": "2000-06-16", - "employee_name": "Holly Granger", - "gender": "Female", - "user_id": "HollyGranger@example.com", - "first_name": "Holly", - "last_name": "Granger" - }, - { - "date_of_birth": "1945-04-04", - "date_of_joining": "1969-07-01", - "employee_name": "Neptunia Aquaria", - "gender": "Female", - "user_id": "NeptuniaAquaria@example.com", - "first_name": "Neptunia", - "last_name": "Aquaria" - }, - { - "date_of_birth": "1978-05-03", - "date_of_joining": "1999-12-24", - "employee_name": "Arthur Curry", - "gender": "Male", - "user_id": "ArthurCurry@example.com", - "first_name": "Arthur", - "last_name": "Curry" - }, - { - "date_of_birth": "1964-06-03", - "date_of_joining": "1981-08-05", - "employee_name": "Thalia Al Ghul", - "gender": "Female", - "user_id": "ThaliaAlGhul@example.com", - "first_name": "Thalia", - "last_name": "Al Ghul" - }, - { - "date_of_birth": "1982-07-03", - "date_of_joining": "2006-06-10", - "employee_name": "Maxwell Lord", - "gender": "Male", - "user_id": "MaxwellLord@example.com", - "first_name": "Maxwell", - "last_name": "Lord" - }, - { - "date_of_birth": "1969-08-03", - "date_of_joining": "1993-10-21", - "employee_name": "Grace Choi", - "gender": "Female", - "user_id": "GraceChoi@example.com", - "first_name": "Grace", - "last_name": "Choi" - }, - { - "date_of_birth": "1982-09-03", - "date_of_joining": "2005-09-06", - "employee_name": "Vandal Savage", - "gender": "Male", - "user_id": "VandalSavage@example.com", - "first_name": "Vandal", - "last_name": "Savage" - }, - { - "date_of_birth": "1985-10-03", - "date_of_joining": "2007-12-25", - "employee_name": "Caitlin Snow", - "gender": "Female", - "user_id": "CaitlinSnow@example.com", - "first_name": "Caitlin", - "last_name": "Snow" - } + { + "date_of_birth": "1982-01-03", + "date_of_joining": "2001-10-10", + "employee_name": "Diana Prince", + "first_name": "Diana", + "last_name": "Prince", + "gender": "Female", + "user_id": "DianaPrince@example.com" + }, + { + "date_of_birth": "1959-02-03", + "date_of_joining": "1976-09-16", + "employee_name": "Zatanna Zatara", + "gender": "Female", + "user_id": "ZatannaZatara@example.com", + "first_name": "Zatanna", + "last_name": "Zatara" + }, + { + "date_of_birth": "1982-03-03", + "date_of_joining": "2000-06-16", + "employee_name": "Holly Granger", + "gender": "Female", + "user_id": "HollyGranger@example.com", + "first_name": "Holly", + "last_name": "Granger" + }, + { + "date_of_birth": "1945-04-04", + "date_of_joining": "1969-07-01", + "employee_name": "Neptunia Aquaria", + "gender": "Female", + "user_id": "NeptuniaAquaria@example.com", + "first_name": "Neptunia", + "last_name": "Aquaria" + }, + { + "date_of_birth": "1978-05-03", + "date_of_joining": "1999-12-24", + "employee_name": "Arthur Curry", + "gender": "Male", + "user_id": "ArthurCurry@example.com", + "first_name": "Arthur", + "last_name": "Curry" + }, + { + "date_of_birth": "1964-06-03", + "date_of_joining": "1981-08-05", + "employee_name": "Thalia Al Ghul", + "gender": "Female", + "user_id": "ThaliaAlGhul@example.com", + "first_name": "Thalia", + "last_name": "Al Ghul" + }, + { + "date_of_birth": "1982-07-03", + "date_of_joining": "2006-06-10", + "employee_name": "Maxwell Lord", + "gender": "Male", + "user_id": "MaxwellLord@example.com", + "first_name": "Maxwell", + "last_name": "Lord" + }, + { + "date_of_birth": "1969-08-03", + "date_of_joining": "1993-10-21", + "employee_name": "Grace Choi", + "gender": "Female", + "user_id": "GraceChoi@example.com", + "first_name": "Grace", + "last_name": "Choi" + }, + { + "date_of_birth": "1982-09-03", + "date_of_joining": "2005-09-06", + "employee_name": "Vandal Savage", + "gender": "Male", + "user_id": "VandalSavage@example.com", + "first_name": "Vandal", + "last_name": "Savage" + }, + { + "date_of_birth": "1985-10-03", + "date_of_joining": "2007-12-25", + "employee_name": "Caitlin Snow", + "gender": "Female", + "user_id": "CaitlinSnow@example.com", + "first_name": "Caitlin", + "last_name": "Snow" + } ] \ No newline at end of file diff --git a/erpnext/demo/user/hr.py b/erpnext/demo/user/hr.py index aace7734253..79f3c192878 100644 --- a/erpnext/demo/user/hr.py +++ b/erpnext/demo/user/hr.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import frappe, erpnext import random import datetime -from frappe import _ from frappe.utils import random_string, add_days, get_last_day, getdate from erpnext.projects.doctype.timesheet.test_timesheet import make_timesheet from erpnext.projects.doctype.timesheet.timesheet import make_salary_slip, make_sales_invoice diff --git a/erpnext/demo/user/manufacturing.py b/erpnext/demo/user/manufacturing.py index 612dc49131d..a28d061f382 100644 --- a/erpnext/demo/user/manufacturing.py +++ b/erpnext/demo/user/manufacturing.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe, random, erpnext -from datetime import datetime, timedelta +from datetime import timedelta from frappe.utils.make_random import how_many from frappe.desk import query_report from erpnext.manufacturing.doctype.workstation.workstation import WorkstationHolidayError