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

[salary structure] Cleanup, Fixed Monthly Register Report and other minor changes

Browse Source
This commit is contained in:
Rushabh Mehta
2013-08-06 17:53:41 +05:30
parent 9a921f479b
commit 0b50b48104
11 changed files with 152 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
utilities/demo_docs/Employee.csv Normal file
View File

@@ -0,0 +1,40 @@
Data Import Template,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
Table:,Employee,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
Notes:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
Please do not change the template headings.,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
First data column must be blank.,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
"If you are uploading new records, leave the ""name"" (ID) column blank.",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
"If you are uploading new records, ""Naming Series"" becomes mandatory, if present.",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
Only mandatory fields are necessary for new records. You can delete non-mandatory columns if you wish.,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
"For updating, you can update only selective columns.",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
You can only upload upto 5000 records in one go. (may be less in some cases),,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
DocType:,Employee,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
Column Labels:,ID,Full Name,Date of Joining,Date of Birth,Gender,Company,Status,Naming Series,Salutation,Image,User ID,Employee Number,Employment Type,Holiday List,Scheduled Confirmation Date,Final Confirmation Date,Contract End Date,Date Of Retirement,Branch,Department,Designation,Grade,Email (By company),Notice - Number of Days,Salary Mode,Bank Name,Bank A/C No.,ESIC CARD No,PF Number,Gratuity LIC ID,Reports to,Cell Number,Personal Email,Person To Be Contacted,Relation,Emergency Phone Number,Permanent Accommodation Type,Permanent Address,Current Accommodation Type,Current Address,Bio,PAN Number,Passport Number,Date of Issue,Valid Upto,Place of Issue,Marital Status,Blood Group,Family Background,Health Details,Resignation Letter Date,Relieving Date,Reason for Leaving,Leave Encashed?,Encashment Date,Held On,Reason for Resignation,New Workplace,Feedback
Column Name:,name,employee_name,date_of_joining,date_of_birth,gender,company,status,naming_series,salutation,image,user_id,employee_number,employment_type,holiday_list,scheduled_confirmation_date,final_confirmation_date,contract_end_date,date_of_retirement,branch,department,designation,grade,company_email,notice_number_of_days,salary_mode,bank_name,bank_ac_no,esic_card_no,pf_number,gratuity_lic_id,reports_to,cell_number,personal_email,person_to_be_contacted,relation,emergency_phone_number,permanent_accommodation_type,permanent_address,current_accommodation_type,current_address,bio,pan_number,passport_number,date_of_issue,valid_upto,place_of_issue,marital_status,blood_group,family_background,health_details,resignation_letter_date,relieving_date,reason_for_leaving,leave_encashed,encashment_date,held_on,reason_for_resignation,new_workplace,feedback
Mandatory:,Yes,Yes,Yes,Yes,Yes,Yes,Yes,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No
Type:,Data (text),Data,Date,Date,Select,Select,Select,Select,Select,Select,Link,Data,Link,Link,Date,Date,Date,Date,Link,Link,Link,Link,Data,Int,Select,Data,Data,Data,Data,Data,Link,Data,Data,Data,Data,Data,Select,Small Text,Select,Small Text,Text Editor,Data,Data,Date,Date,Data,Select,Select,Small Text,Small Text,Date,Date,Data,Select,Date,Date,Select,Data,Small Text
Info:,,,,,"One of: Male, Female",Valid Company,"One of: Active, Left",One of: EMP/,"One of: Mr, Ms",One of: attach_files:,Valid Profile,,Valid Employment Type,Valid Holiday List,,,,,Valid Branch,Valid Department,Valid Designation,Valid Grade,,Integer,"One of: Bank, Cash, Cheque",,,,,,Valid Employee,,,,,,"One of: Rented, Owned",,"One of: Rented, Owned",,,,,,,,"One of: Single, Married, Divorced, Widowed","One of: A+, A-, B+, B-, AB+, AB-, O+, O-",,,,,,"One of: Yes, No",,,"One of: Better Prospects, Health Concerns",,
Start entering data below this line,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Dikman Shervashidze Shervashidze,10-10-2001,03-01-1982,Female,Wind Power LLC,Active,EMP/,,,DikmanShervashidze@armyspy.com,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Zukutakitoteka ,09-16-1976,03-02-1959,Female,Wind Power LLC,Active,EMP/,,,Zukutakitoteka@teleworm.us,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Hatsue Kashiwagi,06-16-2000,03-03-1982,Female,Wind Power LLC,Active,EMP/,,,HatsueKashiwagi@cuvox.de,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Nuran Verkleij,07-01-1969,04-04-1945,Female,Wind Power LLC,Active,EMP/,,,NuranVerkleij@einrot.com,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Дмитрий Пирогов,12-24-1999,03-05-1978,Male,Wind Power LLC,Active,EMP/,,,aromn@armyspy.com,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Tilde Lindqvist,08-05-1981,03-06-1964,Female,Wind Power LLC,Active,EMP/,,,TildeLindqvist@cuvox.de,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Michał Sobczak,06-10-2006,03-07-1982,Male,Wind Power LLC,Active,EMP/,,,MichalSobczak@teleworm.us,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Gabrielle Loftus,10-21-1993,03-08-1969,Female,Wind Power LLC,Active,EMP/,,,GabrielleLoftus@superrito.com,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Vakhita Ryzaev,09-06-2005,03-09-1982,Male,Wind Power LLC,Active,EMP/,,,VakhitaRyzaev@teleworm.us,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Charmaine Gaudreau,12-25-2007,03-10-1985,Female,Wind Power LLC,Active,EMP/,,,CharmaineGaudreau@cuvox.de,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Rafaëla Maartens,09-02-2002,03-11-1982,Female,Wind Power LLC,Active,EMP/,,,RafaelaMaartens@cuvox.de,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Nuguse Yohannes,08-24-1984,07-12-1966,Male,Wind Power LLC,Active,EMP/,,,NuguseYohannes@dayrep.com,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Раиса Белякова,12-04-2002,03-13-1982,Female,Wind Power LLC,Active,EMP/,,,panca@armyspy.com,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,胤隆 蔡,03-14-2011,06-14-1991,Male,Wind Power LLC,Active,EMP/,,,CaYinLong@gustr.com,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Freddie Scott,12-14-2004,03-15-1982,Male,Wind Power LLC,Active,EMP/,,,FreddieScott@armyspy.com,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Bergþóra Vigfúsdóttir,05-17-2004,03-16-1982,Female,Wind Power LLC,Active,EMP/,,,BergoraVigfusdottir@superrito.com,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Ward Kalb,05-13-1994,03-17-1973,Male,Wind Power LLC,Active,EMP/,,,WardNajmalDinKalb@cuvox.de,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Wan Mai,12-15-2003,09-18-1982,Female,Wind Power LLC,Active,EMP/,,,WanMai@teleworm.us,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Leon Abdulov,03-15-1999,03-19-1982,Male,Wind Power LLC,Active,EMP/,,,LeonAbdulov@superrito.com,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
,,Sabina Novotná,01-25-1991,03-20-1974,Female,Wind Power LLC,Active,EMP/,,,SabinaNovotna@superrito.com,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
1 Data Import Template
2 Table: Employee
3
4
5 Notes:
6 Please do not change the template headings.
7 First data column must be blank.
8 If you are uploading new records, leave the "name" (ID) column blank.
9 If you are uploading new records, "Naming Series" becomes mandatory, if present.
10 Only mandatory fields are necessary for new records. You can delete non-mandatory columns if you wish.
11 For updating, you can update only selective columns.
12 You can only upload upto 5000 records in one go. (may be less in some cases)
13
14 DocType: Employee
15 Column Labels: ID Full Name Date of Joining Date of Birth Gender Company Status Naming Series Salutation Image User ID Employee Number Employment Type Holiday List Scheduled Confirmation Date Final Confirmation Date Contract End Date Date Of Retirement Branch Department Designation Grade Email (By company) Notice - Number of Days Salary Mode Bank Name Bank A/C No. ESIC CARD No PF Number Gratuity LIC ID Reports to Cell Number Personal Email Person To Be Contacted Relation Emergency Phone Number Permanent Accommodation Type Permanent Address Current Accommodation Type Current Address Bio PAN Number Passport Number Date of Issue Valid Upto Place of Issue Marital Status Blood Group Family Background Health Details Resignation Letter Date Relieving Date Reason for Leaving Leave Encashed? Encashment Date Held On Reason for Resignation New Workplace Feedback
16 Column Name: name employee_name date_of_joining date_of_birth gender company status naming_series salutation image user_id employee_number employment_type holiday_list scheduled_confirmation_date final_confirmation_date contract_end_date date_of_retirement branch department designation grade company_email notice_number_of_days salary_mode bank_name bank_ac_no esic_card_no pf_number gratuity_lic_id reports_to cell_number personal_email person_to_be_contacted relation emergency_phone_number permanent_accommodation_type permanent_address current_accommodation_type current_address bio pan_number passport_number date_of_issue valid_upto place_of_issue marital_status blood_group family_background health_details resignation_letter_date relieving_date reason_for_leaving leave_encashed encashment_date held_on reason_for_resignation new_workplace feedback
17 Mandatory: Yes Yes Yes Yes Yes Yes Yes No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No No
18 Type: Data (text) Data Date Date Select Select Select Select Select Select Link Data Link Link Date Date Date Date Link Link Link Link Data Int Select Data Data Data Data Data Link Data Data Data Data Data Select Small Text Select Small Text Text Editor Data Data Date Date Data Select Select Small Text Small Text Date Date Data Select Date Date Select Data Small Text
19 Info: One of: Male, Female Valid Company One of: Active, Left One of: EMP/ One of: Mr, Ms One of: attach_files: Valid Profile Valid Employment Type Valid Holiday List Valid Branch Valid Department Valid Designation Valid Grade Integer One of: Bank, Cash, Cheque Valid Employee One of: Rented, Owned One of: Rented, Owned One of: Single, Married, Divorced, Widowed One of: A+, A-, B+, B-, AB+, AB-, O+, O- One of: Yes, No One of: Better Prospects, Health Concerns
20 Start entering data below this line
21 Dikman Shervashidze Shervashidze 10-10-2001 03-01-1982 Female Wind Power LLC Active EMP/ DikmanShervashidze@armyspy.com
22 Zukutakitoteka 09-16-1976 03-02-1959 Female Wind Power LLC Active EMP/ Zukutakitoteka@teleworm.us
23 Hatsue Kashiwagi 06-16-2000 03-03-1982 Female Wind Power LLC Active EMP/ HatsueKashiwagi@cuvox.de
24 Nuran Verkleij 07-01-1969 04-04-1945 Female Wind Power LLC Active EMP/ NuranVerkleij@einrot.com
25 Дмитрий Пирогов 12-24-1999 03-05-1978 Male Wind Power LLC Active EMP/ aromn@armyspy.com
26 Tilde Lindqvist 08-05-1981 03-06-1964 Female Wind Power LLC Active EMP/ TildeLindqvist@cuvox.de
27 Michał Sobczak 06-10-2006 03-07-1982 Male Wind Power LLC Active EMP/ MichalSobczak@teleworm.us
28 Gabrielle Loftus 10-21-1993 03-08-1969 Female Wind Power LLC Active EMP/ GabrielleLoftus@superrito.com
29 Vakhita Ryzaev 09-06-2005 03-09-1982 Male Wind Power LLC Active EMP/ VakhitaRyzaev@teleworm.us
30 Charmaine Gaudreau 12-25-2007 03-10-1985 Female Wind Power LLC Active EMP/ CharmaineGaudreau@cuvox.de
31 Rafaëla Maartens 09-02-2002 03-11-1982 Female Wind Power LLC Active EMP/ RafaelaMaartens@cuvox.de
32 Nuguse Yohannes 08-24-1984 07-12-1966 Male Wind Power LLC Active EMP/ NuguseYohannes@dayrep.com
33 Раиса Белякова 12-04-2002 03-13-1982 Female Wind Power LLC Active EMP/ panca@armyspy.com
34 胤隆 蔡 03-14-2011 06-14-1991 Male Wind Power LLC Active EMP/ CaYinLong@gustr.com
35 Freddie Scott 12-14-2004 03-15-1982 Male Wind Power LLC Active EMP/ FreddieScott@armyspy.com
36 Bergþóra Vigfúsdóttir 05-17-2004 03-16-1982 Female Wind Power LLC Active EMP/ BergoraVigfusdottir@superrito.com
37 Ward Kalb 05-13-1994 03-17-1973 Male Wind Power LLC Active EMP/ WardNajmalDinKalb@cuvox.de
38 Wan Mai 12-15-2003 09-18-1982 Female Wind Power LLC Active EMP/ WanMai@teleworm.us
39 Leon Abdulov 03-15-1999 03-19-1982 Male Wind Power LLC Active EMP/ LeonAbdulov@superrito.com
40 Sabina Novotná 01-25-1991 03-20-1974 Female Wind Power LLC Active EMP/ SabinaNovotna@superrito.com