Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

codacy fixes

Browse Source
This commit is contained in:
Zlash65 2018-10-02 12:55:56 +05:30
parent 8b1133cb24
commit 275ef826a4
3 changed files with 91 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
erpnext/demo/data/employee.json
View File

@ -1,92 +1,92 @@
[ [
{ {
"date_of_birth": "1982-01-03", "date_of_birth": "1982-01-03",
"date_of_joining": "2001-10-10", "date_of_joining": "2001-10-10",
"employee_name": "Diana Prince", "employee_name": "Diana Prince",
"first_name": "Diana", "first_name": "Diana",
"last_name": "Prince", "last_name": "Prince",
"gender": "Female", "gender": "Female",
"user_id": "DianaPrince@example.com" "user_id": "DianaPrince@example.com"
}, },
{ {
"date_of_birth": "1959-02-03", "date_of_birth": "1959-02-03",
"date_of_joining": "1976-09-16", "date_of_joining": "1976-09-16",
"employee_name": "Zatanna Zatara", "employee_name": "Zatanna Zatara",
"gender": "Female", "gender": "Female",
"user_id": "ZatannaZatara@example.com", "user_id": "ZatannaZatara@example.com",
"first_name": "Zatanna", "first_name": "Zatanna",
"last_name": "Zatara" "last_name": "Zatara"
}, },
{ {
"date_of_birth": "1982-03-03", "date_of_birth": "1982-03-03",
"date_of_joining": "2000-06-16", "date_of_joining": "2000-06-16",
"employee_name": "Holly Granger", "employee_name": "Holly Granger",
"gender": "Female", "gender": "Female",
"user_id": "HollyGranger@example.com", "user_id": "HollyGranger@example.com",
"first_name": "Holly", "first_name": "Holly",
"last_name": "Granger" "last_name": "Granger"
}, },
{ {
"date_of_birth": "1945-04-04", "date_of_birth": "1945-04-04",
"date_of_joining": "1969-07-01", "date_of_joining": "1969-07-01",
"employee_name": "Neptunia Aquaria", "employee_name": "Neptunia Aquaria",
"gender": "Female", "gender": "Female",
"user_id": "NeptuniaAquaria@example.com", "user_id": "NeptuniaAquaria@example.com",
"first_name": "Neptunia", "first_name": "Neptunia",
"last_name": "Aquaria" "last_name": "Aquaria"
}, },
{ {
"date_of_birth": "1978-05-03", "date_of_birth": "1978-05-03",
"date_of_joining": "1999-12-24", "date_of_joining": "1999-12-24",
"employee_name": "Arthur Curry", "employee_name": "Arthur Curry",
"gender": "Male", "gender": "Male",
"user_id": "ArthurCurry@example.com", "user_id": "ArthurCurry@example.com",
"first_name": "Arthur", "first_name": "Arthur",
"last_name": "Curry" "last_name": "Curry"
}, },
{ {
"date_of_birth": "1964-06-03", "date_of_birth": "1964-06-03",
"date_of_joining": "1981-08-05", "date_of_joining": "1981-08-05",
"employee_name": "Thalia Al Ghul", "employee_name": "Thalia Al Ghul",
"gender": "Female", "gender": "Female",
"user_id": "ThaliaAlGhul@example.com", "user_id": "ThaliaAlGhul@example.com",
"first_name": "Thalia", "first_name": "Thalia",
"last_name": "Al Ghul" "last_name": "Al Ghul"
}, },
{ {
"date_of_birth": "1982-07-03", "date_of_birth": "1982-07-03",
"date_of_joining": "2006-06-10", "date_of_joining": "2006-06-10",
"employee_name": "Maxwell Lord", "employee_name": "Maxwell Lord",
"gender": "Male", "gender": "Male",
"user_id": "MaxwellLord@example.com", "user_id": "MaxwellLord@example.com",
"first_name": "Maxwell", "first_name": "Maxwell",
"last_name": "Lord" "last_name": "Lord"
}, },
{ {
"date_of_birth": "1969-08-03", "date_of_birth": "1969-08-03",
"date_of_joining": "1993-10-21", "date_of_joining": "1993-10-21",
"employee_name": "Grace Choi", "employee_name": "Grace Choi",
"gender": "Female", "gender": "Female",
"user_id": "GraceChoi@example.com", "user_id": "GraceChoi@example.com",
"first_name": "Grace", "first_name": "Grace",
"last_name": "Choi" "last_name": "Choi"
}, },
{ {
"date_of_birth": "1982-09-03", "date_of_birth": "1982-09-03",
"date_of_joining": "2005-09-06", "date_of_joining": "2005-09-06",
"employee_name": "Vandal Savage", "employee_name": "Vandal Savage",
"gender": "Male", "gender": "Male",
"user_id": "VandalSavage@example.com", "user_id": "VandalSavage@example.com",
"first_name": "Vandal", "first_name": "Vandal",
"last_name": "Savage" "last_name": "Savage"
}, },
{ {
"date_of_birth": "1985-10-03", "date_of_birth": "1985-10-03",
"date_of_joining": "2007-12-25", "date_of_joining": "2007-12-25",
"employee_name": "Caitlin Snow", "employee_name": "Caitlin Snow",
"gender": "Female", "gender": "Female",
"user_id": "CaitlinSnow@example.com", "user_id": "CaitlinSnow@example.com",
"first_name": "Caitlin", "first_name": "Caitlin",
"last_name": "Snow" "last_name": "Snow"
} }
] ]

1
erpnext/demo/user/hr.py
View File

@ -2,7 +2,6 @@ from __future__ import unicode_literals
import frappe, erpnext import frappe, erpnext
import random import random
import datetime import datetime
from frappe import _
from frappe.utils import random_string, add_days, get_last_day, getdate 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.test_timesheet import make_timesheet
from erpnext.projects.doctype.timesheet.timesheet import make_salary_slip, make_sales_invoice from erpnext.projects.doctype.timesheet.timesheet import make_salary_slip, make_sales_invoice

2
erpnext/demo/user/manufacturing.py
View File

@ -4,7 +4,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe, random, erpnext import frappe, random, erpnext
from datetime import datetime, timedelta from datetime import timedelta
from frappe.utils.make_random import how_many from frappe.utils.make_random import how_many
from frappe.desk import query_report from frappe.desk import query_report
from erpnext.manufacturing.doctype.workstation.workstation import WorkstationHolidayError from erpnext.manufacturing.doctype.workstation.workstation import WorkstationHolidayError