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

Added Company in HR Module

Browse Source
This commit is contained in:
Ravi Dey
2011-06-27 11:26:39 +05:30
parent fe3b600315
commit 74c9c4d476
12 changed files with 1685 additions and 805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
payroll/doctype/appraisal/appraisal.js
View File

@@ -1,3 +1,5 @@
cur_frm.add_fetch('employee', 'company', 'company');
cur_frm.cscript.onload = function(doc,cdt,cdn){
if(!doc.status) set_multiple(dt,dn,{status:'Draft'});
if(doc.employee) cur_frm.cscript.employee(doc,cdt,cdn);
@@ -140,4 +142,4 @@ cur_frm.cscript.calculate_total = function(doc,cdt,cdn){
}
doc.total_score = flt(total);
refresh_field('total_score');
}
}

96
payroll/doctype/appraisal/appraisal.txt
View File

@@ -1,6 +1,6 @@
[
{
'_last_update': None,
'_last_update': '1308808105',
'allow_attach': None,
'allow_copy': None,
'allow_email': None,
@@ -29,17 +29,17 @@
'istable': None,
'max_attachments': None,
'menu_index': None,
'modified': '2010-09-20 14:06:57',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'module': 'Payroll',
'name': 'Appraisal',
'name_case': '',
'name_case': None,
'owner': 'ashwini@webnotestech.com',
'parent': None,
'parent_node': None,
'parentfield': None,
'parenttype': None,
'print_outline': '',
'print_outline': None,
'read_only': None,
'read_only_onload': None,
'search_fields': 'status, employee, employee_name',
@@ -48,12 +48,12 @@
'server_code_compiled': None,
'server_code_core': None,
'server_code_error': ' ',
'show_in_menu': None,
'show_in_menu': 0,
'smallicon': None,
'subject': '',
'tag_fields': '',
'subject': None,
'tag_fields': None,
'use_template': None,
'version': 159
'version': 160
},
{
'amend': 1,
@@ -65,7 +65,7 @@
'execute': None,
'idx': 1,
'match': None,
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'PERM00658',
'owner': 'ashwini@webnotestech.com',
@@ -74,7 +74,7 @@
'parenttype': 'DocType',
'permlevel': 0,
'read': 1,
'role': 'Administrator',
'role': 'System Manager',
'submit': 1,
'write': 1
},
@@ -88,7 +88,7 @@
'execute': None,
'idx': 2,
'match': None,
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'PERM00659',
'owner': 'ashwini@webnotestech.com',
@@ -97,7 +97,7 @@
'parenttype': 'DocType',
'permlevel': 1,
'read': 1,
'role': 'Administrator',
'role': 'System Manager',
'submit': None,
'write': None
},
@@ -111,7 +111,7 @@
'execute': None,
'idx': 3,
'match': None,
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'PERM00660',
'owner': 'ashwini@webnotestech.com',
@@ -134,7 +134,7 @@
'execute': None,
'idx': 4,
'match': None,
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'PERM00661',
'owner': 'ashwini@webnotestech.com',
@@ -157,7 +157,7 @@
'execute': None,
'idx': 5,
'match': None,
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'PERM00662',
'owner': 'ashwini@webnotestech.com',
@@ -180,7 +180,7 @@
'execute': None,
'idx': 6,
'match': None,
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'PERM00663',
'owner': 'ashwini@webnotestech.com',
@@ -203,7 +203,7 @@
'execute': None,
'idx': 7,
'match': None,
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'PERM00664',
'owner': 'ashwini@webnotestech.com',
@@ -226,7 +226,7 @@
'execute': None,
'idx': 8,
'match': None,
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'PERM00665',
'owner': 'ashwini@webnotestech.com',
@@ -255,7 +255,7 @@
'idx': 1,
'in_filter': None,
'label': 'Employee Details',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'FL03790',
'no_column': None,
@@ -291,7 +291,7 @@
'idx': 2,
'in_filter': 1,
'label': 'Status',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'FL03791',
'no_column': None,
@@ -308,7 +308,7 @@
'report_hide': None,
'reqd': 1,
'search_index': 1,
'trigger': '',
'trigger': None,
'width': None
},
{
@@ -327,7 +327,7 @@
'idx': 3,
'in_filter': 1,
'label': 'Employee',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'FL03792',
'no_column': None,
@@ -363,7 +363,7 @@
'idx': 4,
'in_filter': 1,
'label': 'Employee Name',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'FL03793',
'no_column': None,
@@ -399,7 +399,7 @@
'idx': 5,
'in_filter': 1,
'label': 'Fiscal Year',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'FL03794',
'no_column': None,
@@ -429,20 +429,20 @@
'docstatus': 0,
'doctype': 'DocField',
'fieldname': 'company',
'fieldtype': 'Link',
'fieldtype': 'Select',
'hidden': None,
'icon': None,
'idx': 6,
'in_filter': 1,
'label': 'Company',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'FL03795',
'no_column': None,
'no_copy': None,
'oldfieldname': 'company',
'oldfieldtype': 'Link',
'options': 'Company',
'options': 'Link:Company',
'owner': 'ashwini@webnotestech.com',
'parent': 'Appraisal',
'parentfield': 'fields',
@@ -470,8 +470,8 @@
'icon': None,
'idx': 7,
'in_filter': None,
'label': '',
'modified': '2010-09-01 15:47:54',
'label': None,
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'FL03796',
'no_column': None,
@@ -507,7 +507,7 @@
'idx': 8,
'in_filter': 1,
'label': 'Start Date',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'FL03797',
'no_column': None,
@@ -543,7 +543,7 @@
'idx': 9,
'in_filter': 1,
'label': 'End Date',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'FL03798',
'no_column': None,
@@ -579,14 +579,14 @@
'idx': 10,
'in_filter': 0,
'label': 'Approver',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'FL03799',
'no_column': None,
'no_copy': None,
'oldfieldname': 'kra_approver',
'oldfieldtype': 'Select',
'options': '',
'options': None,
'owner': 'ashwini@webnotestech.com',
'parent': 'Appraisal',
'parentfield': 'fields',
@@ -615,7 +615,7 @@
'idx': 11,
'in_filter': None,
'label': 'Amended From',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'FL03800',
'no_column': None,
@@ -651,7 +651,7 @@
'idx': 12,
'in_filter': None,
'label': 'Amendment Date',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'FL03801',
'no_column': None,
@@ -687,14 +687,14 @@
'idx': 13,
'in_filter': None,
'label': 'Declare Completed',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'FL03802',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
'oldfieldtype': 'Button',
'options': '',
'options': None,
'owner': 'ashwini@webnotestech.com',
'parent': 'Appraisal',
'parentfield': 'fields',
@@ -722,8 +722,8 @@
'icon': None,
'idx': 14,
'in_filter': None,
'label': '',
'modified': '2010-09-01 15:47:54',
'label': None,
'modified': '2011-06-24 18:47:36',
'modified_by': 'Administrator',
'name': 'FL03803',
'no_column': None,
@@ -759,7 +759,7 @@
'idx': 15,
'in_filter': None,
'label': 'KRA Template',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:37',
'modified_by': 'Administrator',
'name': 'FL03804',
'no_column': None,
@@ -776,7 +776,7 @@
'report_hide': None,
'reqd': None,
'search_index': None,
'trigger': '',
'trigger': None,
'width': None
},
{
@@ -795,7 +795,7 @@
'idx': 16,
'in_filter': None,
'label': 'Fetch Template',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:37',
'modified_by': 'Administrator',
'name': 'FL03805',
'no_column': None,
@@ -831,14 +831,14 @@
'idx': 17,
'in_filter': None,
'label': 'Update',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:37',
'modified_by': 'Administrator',
'name': 'FL03806',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
'oldfieldtype': 'Button',
'options': '',
'options': None,
'owner': 'ashwini@webnotestech.com',
'parent': 'Appraisal',
'parentfield': 'fields',
@@ -867,7 +867,7 @@
'idx': 18,
'in_filter': None,
'label': 'Appraisal Details',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:37',
'modified_by': 'Administrator',
'name': 'FL03807',
'no_column': None,
@@ -884,7 +884,7 @@
'report_hide': None,
'reqd': None,
'search_index': None,
'trigger': '',
'trigger': None,
'width': None
},
{
@@ -903,7 +903,7 @@
'idx': 19,
'in_filter': None,
'label': 'Calculate Total Score',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:37',
'modified_by': 'Administrator',
'name': 'FL03808',
'no_column': None,
@@ -939,7 +939,7 @@
'idx': 20,
'in_filter': None,
'label': 'Total Score',
'modified': '2010-09-01 15:47:54',
'modified': '2011-06-24 18:47:37',
'modified_by': 'Administrator',
'name': 'FL03809',
'no_column': None,