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

Merge branch 'master' of git@github.com:webnotes/erpnext

Browse Source
This commit is contained in:
nabinhait 2011-06-27 13:15:50 +05:30
commit b1d972f30c
15 changed files with 1724 additions and 838 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
maintenance/doctype/support_ticket/support_ticket.txt
View File

@ -1,6 +1,6 @@
[
{
'_last_update': '1308898257',
'_last_update': '1308914721',
'allow_attach': None,
'allow_copy': None,
'allow_email': None,
@ -29,7 +29,7 @@
'istable': None,
'max_attachments': None,
'menu_index': None,
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'module': 'Maintenance',
'name': 'Support Ticket',
@ -51,9 +51,9 @@
'show_in_menu': 0,
'smallicon': None,
'subject': '%(subject)s',
'tag_fields': 'status',
'tag_fields': 'status,allocated_to',
'use_template': None,
'version': 140
'version': 143
},
{
'amend': 0,
@ -65,7 +65,7 @@
'execute': None,
'idx': 1,
'match': None,
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'PERM00823',
'owner': 'Administrator',
@ -88,7 +88,7 @@
'execute': None,
'idx': 2,
'match': 'customer',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'PERM00824',
'owner': 'Administrator',
@ -111,7 +111,7 @@
'execute': None,
'idx': 3,
'match': None,
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'PERM00825',
'owner': 'Administrator',
@ -134,7 +134,7 @@
'execute': None,
'idx': 4,
'match': 'allocated_to',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'PERM00826',
'owner': 'Administrator',
@ -157,7 +157,7 @@
'execute': None,
'idx': 5,
'match': None,
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'PERM00827',
'owner': 'Administrator',
@ -186,7 +186,7 @@
'idx': 1,
'in_filter': 0,
'label': 'Status',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL04803',
'no_column': None,
@ -222,7 +222,7 @@
'idx': 2,
'in_filter': 1,
'label': 'Subject',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL04804',
'no_column': None,
@ -258,7 +258,7 @@
'idx': 3,
'in_filter': 1,
'label': 'Raised By (Email)',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL04805',
'no_column': None,
@ -294,7 +294,7 @@
'idx': 4,
'in_filter': None,
'label': 'Description',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL04806',
'no_column': None,
@ -330,7 +330,7 @@
'idx': 5,
'in_filter': None,
'label': 'Problem Description',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL05248',
'no_column': None,
@ -366,7 +366,7 @@
'idx': 6,
'in_filter': None,
'label': 'Thread HTML',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL05356',
'no_column': None,
@ -402,7 +402,7 @@
'idx': 7,
'in_filter': None,
'label': 'New Response',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL04808',
'no_column': None,
@ -438,7 +438,7 @@
'idx': 8,
'in_filter': None,
'label': 'Send',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL04809',
'no_column': None,
@ -474,7 +474,7 @@
'idx': 9,
'in_filter': None,
'label': 'Additional Info',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL05357',
'no_column': None,
@ -510,7 +510,7 @@
'idx': 10,
'in_filter': None,
'label': None,
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL05358',
'no_column': None,
@ -546,7 +546,7 @@
'idx': 11,
'in_filter': 1,
'label': 'Customer',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL04812',
'no_column': None,
@ -582,7 +582,7 @@
'idx': 12,
'in_filter': 1,
'label': 'Customer Name',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL04813',
'no_column': None,
@ -618,7 +618,7 @@
'idx': 13,
'in_filter': None,
'label': 'Address',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL05399',
'no_column': None,
@ -654,7 +654,7 @@
'idx': 14,
'in_filter': None,
'label': 'Contact Name',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL05401',
'no_column': None,
@ -690,7 +690,7 @@
'idx': 15,
'in_filter': None,
'label': 'Mobile No',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL05400',
'no_column': None,
@ -726,7 +726,7 @@
'idx': 16,
'in_filter': None,
'label': 'Contact Email',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL04814',
'no_column': None,
@ -762,7 +762,7 @@
'idx': 17,
'in_filter': None,
'label': 'Opening Date',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL04815',
'no_column': None,
@ -798,7 +798,7 @@
'idx': 18,
'in_filter': None,
'label': 'Opening Time',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL04816',
'no_column': None,
@ -834,7 +834,7 @@
'idx': 19,
'in_filter': None,
'label': None,
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL05359',
'no_column': None,
@ -870,7 +870,7 @@
'idx': 20,
'in_filter': 1,
'label': 'Allocated To',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL04818',
'no_column': None,
@ -906,7 +906,7 @@
'idx': 21,
'in_filter': None,
'label': 'Resolution Details',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL04819',
'no_column': None,
@ -942,7 +942,7 @@
'idx': 22,
'in_filter': 0,
'label': 'Resolution Date',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL04820',
'no_column': None,
@ -978,7 +978,7 @@
'idx': 23,
'in_filter': None,
'label': 'Resolution Time',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL04821',
'no_column': None,
@ -1014,7 +1014,7 @@
'idx': 24,
'in_filter': None,
'label': 'Content Type',
'modified': '2011-06-24 12:24:09',
'modified': '2011-06-27 11:30:33',
'modified_by': 'Administrator',
'name': 'FL05251',
'no_column': None,

BIN
material_management/__init__.pyc
View File

Binary file not shown.

BIN
material_management/doctype/__init__.pyc
View File

Binary file not shown.

15
patches/patch.py
View File

@ -1,6 +1,6 @@
# REMEMBER to update this
# ========================
last_patch = 296
last_patch = 299
#-------------------------------------------
@ -1179,3 +1179,16 @@ def execute(patch_no):
elif patch_no == 296:
sql("delete from tabDocField where parent='Support Ticket' and fieldname='contact_no'")
reload_doc('maintenance', 'doctype', 'support_ticket')
elif patch_no == 297:
reload_doc('payroll', 'doctype', 'employee')
reload_doc('payroll', 'doctype', 'attendance')
reload_doc('payroll', 'doctype', 'expense_voucher')
reload_doc('payroll', 'doctype', 'appraisal')
reload_doc('payroll', 'doctype', 'salary_structure')
reload_doc('payroll', 'doctype', 'salary_slip')
elif patch_no == 298:
sql("update `tabDocField` set options = 'Link:Company' where parent = 'Attendance' and fieldname = 'company'")
sql("update `tabDocField` set options = 'Link:Company' where parent = 'Expense Voucher' and fieldname = 'company'")
sql("update `tabDocField` set options = 'Link:Company' where parent = 'Appraisal' and fieldname = 'company'")
elif patch_no == 299:
sql("update `tabDocPerm` set `match` = NULL where parent = 'Employee' and role = 'Employee'")

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,

2
payroll/doctype/attendance/attendance.js
View File

@ -1,3 +1,5 @@
cur_frm.add_fetch('employee', 'company', 'company');
//get employee's name based on employee id selected
cur_frm.cscript.employee = function(doc,cdt,cdn){
if(doc.employee) get_server_fields('get_emp_name', '', '', doc, cdt, cdn, 1);

488
payroll/doctype/attendance/attendance.txt
View File

File diff suppressed because one or more lines are too long

789
payroll/doctype/employee/employee.txt
View File

File diff suppressed because it is too large Load Diff

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

@ -1,5 +1,7 @@
cur_frm.add_fetch('employee', 'company', 'company');
cur_frm.cscript.onload = function(doc,cdt,cdn){
cur_frm.cscript.get_tips(doc, cdt, cdn);
//cur_frm.cscript.get_tips(doc, cdt, cdn);
if(!doc.approval_status) set_multiple(cdt,cdn,{approval_status:'Draft'});
if(doc.employee) cur_frm.cscript.employee(doc,cdt,cdn);

304
payroll/doctype/expense_voucher/expense_voucher.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-10-14 11:41:31',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'module': 'Payroll',
'name': 'Expense Voucher',
'name_case': '',
'name_case': None,
'owner': 'harshada@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': 'approval_status,employee,employee_name',
@ -48,31 +48,31 @@
'server_code_compiled': None,
'server_code_core': None,
'server_code_error': ' ',
'show_in_menu': None,
'show_in_menu': 0,
'smallicon': None,
'subject': 'From %(employee_name)s for %(total_claimed_amount)s (claimed)',
'tag_fields': 'approval_status',
'use_template': None,
'version': 133
'version': 134
},
{
'amend': 1,
'cancel': 1,
'create': 1,
'creation': '2011-03-05 17:16:47',
'creation': '2011-05-12 23:27:50',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': None,
'idx': 1,
'match': 'owner',
'modified': '2011-03-05 17:16:47',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'PERM00815',
'owner': 'Administrator',
'name': '000011972',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Expense Voucher',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': None,
'permlevel': 0,
'read': 1,
'role': 'Employee',
'submit': 1,
@ -82,20 +82,20 @@
'amend': 1,
'cancel': 1,
'create': 1,
'creation': '2011-03-05 17:16:47',
'creation': '2011-05-29 14:17:03',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': None,
'idx': 2,
'match': None,
'modified': '2011-03-05 17:16:47',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'PERM00816',
'owner': 'Administrator',
'name': 'PERM00841',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Expense Voucher',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': None,
'permlevel': 0,
'read': 1,
'role': 'HR Manager',
'submit': 1,
@ -105,47 +105,185 @@
'amend': 1,
'cancel': 1,
'create': 1,
'creation': '2011-03-05 17:16:47',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': None,
'match': None,
'modified': '2011-03-05 17:16:47',
'modified_by': 'Administrator',
'name': 'PERM00817',
'owner': 'Administrator',
'parent': 'Expense Voucher',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': None,
'read': 1,
'role': 'HR User',
'submit': 1,
'write': 1
},
{
'amend': None,
'cancel': None,
'create': None,
'creation': '2010-09-03 16:45:05',
'creation': '2011-05-29 14:17:03',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 3,
'match': '',
'modified': '2010-09-03 16:45:05',
'match': 'owner',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'PERM00677',
'owner': 'harshada@webnotestech.com',
'name': 'PERM00840',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Expense Voucher',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': 1,
'permlevel': 0,
'read': 1,
'role': 'All',
'submit': None,
'write': None
'role': 'Employee',
'submit': 1,
'write': 1
},
{
'amend': 1,
'cancel': 1,
'create': 1,
'creation': '2011-05-29 14:16:33',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 4,
'match': None,
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'PERM00839',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Expense Voucher',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': 0,
'read': 1,
'role': 'System Manager',
'submit': 1,
'write': 1
},
{
'amend': 1,
'cancel': 0,
'create': 1,
'creation': '2011-02-27 18:38:25',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 5,
'match': None,
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'PERM00817',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Expense Voucher',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': 0,
'read': 1,
'role': 'HR User',
'submit': 0,
'write': 1
},
{
'amend': 1,
'cancel': 1,
'create': 1,
'creation': '2011-02-27 18:38:25',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 6,
'match': None,
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'PERM00816',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Expense Voucher',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': 0,
'read': 1,
'role': 'HR Manager',
'submit': 1,
'write': 1
},
{
'amend': 1,
'cancel': 1,
'create': 1,
'creation': '2011-02-27 18:38:25',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 7,
'match': 'owner',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'PERM00815',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Expense Voucher',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': 0,
'read': 1,
'role': 'Employee',
'submit': 1,
'write': 1
},
{
'amend': 1,
'cancel': 0,
'create': 1,
'creation': '2011-05-12 23:27:50',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 8,
'match': None,
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': '000011974',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Expense Voucher',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': 0,
'read': 1,
'role': 'HR User',
'submit': 0,
'write': 1
},
{
'amend': 1,
'cancel': 1,
'create': 1,
'creation': '2011-05-12 23:27:50',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 9,
'match': None,
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': '000011973',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Expense Voucher',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': 0,
'read': 1,
'role': 'HR Manager',
'submit': 1,
'write': 1
},
{
'amend': 1,
'cancel': 0,
'create': 1,
'creation': '2011-05-29 14:17:03',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 10,
'match': None,
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'PERM00842',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Expense Voucher',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': 0,
'read': 1,
'role': 'HR User',
'submit': 0,
'write': 1
},
{
'allow_on_submit': None,
@ -163,7 +301,7 @@
'idx': 1,
'in_filter': None,
'label': 'Details',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03870',
'no_column': None,
@ -199,7 +337,7 @@
'idx': 2,
'in_filter': 1,
'label': 'Approval Status',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03871',
'no_column': None,
@ -216,7 +354,7 @@
'report_hide': None,
'reqd': None,
'search_index': 1,
'trigger': '',
'trigger': None,
'width': None
},
{
@ -235,7 +373,7 @@
'idx': 3,
'in_filter': 1,
'label': 'From Employee',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03872',
'no_column': None,
@ -271,7 +409,7 @@
'idx': 4,
'in_filter': 1,
'label': 'Employee Name',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03873',
'no_column': None,
@ -307,7 +445,7 @@
'idx': 5,
'in_filter': 1,
'label': 'Fiscal Year',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03874',
'no_column': None,
@ -337,20 +475,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-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03875',
'no_column': None,
'no_copy': None,
'oldfieldname': 'company',
'oldfieldtype': 'Link',
'options': 'Company',
'options': 'Link:Company',
'owner': 'ashwini@webnotestech.com',
'parent': 'Expense Voucher',
'parentfield': 'fields',
@ -378,8 +516,8 @@
'icon': None,
'idx': 7,
'in_filter': None,
'label': '',
'modified': '2010-09-03 16:45:05',
'label': None,
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03876',
'no_column': None,
@ -415,7 +553,7 @@
'idx': 8,
'in_filter': 1,
'label': 'Posting Date',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03877',
'no_column': None,
@ -451,14 +589,14 @@
'idx': 9,
'in_filter': None,
'label': 'Approver',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03878',
'no_column': None,
'no_copy': None,
'oldfieldname': 'exp_approver',
'oldfieldtype': 'Select',
'options': '',
'options': None,
'owner': 'harshada@webnotestech.com',
'parent': 'Expense Voucher',
'parentfield': 'fields',
@ -487,7 +625,7 @@
'idx': 10,
'in_filter': None,
'label': 'Remark',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03879',
'no_column': None,
@ -504,7 +642,7 @@
'report_hide': None,
'reqd': None,
'search_index': None,
'trigger': '',
'trigger': None,
'width': None
},
{
@ -523,7 +661,7 @@
'idx': 11,
'in_filter': None,
'label': 'Amended From',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03880',
'no_column': None,
@ -540,7 +678,7 @@
'report_hide': 1,
'reqd': None,
'search_index': None,
'trigger': '',
'trigger': None,
'width': '160px'
},
{
@ -559,7 +697,7 @@
'idx': 12,
'in_filter': None,
'label': 'Amendment Date',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03881',
'no_column': None,
@ -576,7 +714,7 @@
'report_hide': 1,
'reqd': None,
'search_index': None,
'trigger': '',
'trigger': None,
'width': '160px'
},
{
@ -595,7 +733,7 @@
'idx': 13,
'in_filter': None,
'label': 'Approve',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03882',
'no_column': None,
@ -631,7 +769,7 @@
'idx': 14,
'in_filter': None,
'label': 'Reject',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03883',
'no_column': None,
@ -667,7 +805,7 @@
'idx': 15,
'in_filter': None,
'label': 'Expense Details',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03884',
'no_column': None,
@ -703,7 +841,7 @@
'idx': 16,
'in_filter': None,
'label': 'Calculate Total Amount',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03885',
'no_column': None,
@ -739,7 +877,7 @@
'idx': 17,
'in_filter': 0,
'label': 'Total Claimed Amount',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03886',
'no_column': None,
@ -756,7 +894,7 @@
'report_hide': None,
'reqd': 0,
'search_index': None,
'trigger': '',
'trigger': None,
'width': '160px'
},
{
@ -775,7 +913,7 @@
'idx': 18,
'in_filter': 0,
'label': 'Total Sanctioned Amount',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03887',
'no_column': None,
@ -792,7 +930,7 @@
'report_hide': None,
'reqd': None,
'search_index': None,
'trigger': '',
'trigger': None,
'width': '160px'
},
{
@ -811,14 +949,14 @@
'idx': 19,
'in_filter': None,
'label': 'Update Voucher',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03888',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
'oldfieldtype': 'Button',
'options': '',
'options': None,
'owner': 'harshada@webnotestech.com',
'parent': 'Expense Voucher',
'parentfield': 'fields',
@ -847,7 +985,7 @@
'idx': 20,
'in_filter': None,
'label': 'Expense Voucher Details',
'modified': '2010-09-03 16:45:05',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03889',
'no_column': None,
@ -864,7 +1002,7 @@
'report_hide': None,
'reqd': None,
'search_index': None,
'trigger': '',
'trigger': None,
'width': None
},
{
@ -883,7 +1021,7 @@
'idx': 21,
'in_filter': None,
'label': 'Employees Email Id',
'modified': '2010-10-15 14:56:33',
'modified': '2011-06-24 18:24:25',
'modified_by': 'Administrator',
'name': 'FL03982',
'no_column': None,

2
payroll/doctype/salary_slip/salary_slip.js
View File

@ -1,3 +1,5 @@
cur_frm.add_fetch('employee', 'company', 'company');
// On load
// -------------------------------------------------------------------
cur_frm.cscript.onload = function(doc,dt,dn){

418
payroll/doctype/salary_slip/salary_slip.txt
View File

@ -1,6 +1,6 @@
[
{
'_last_update': '1303273503',
'_last_update': '1308808105',
'allow_attach': None,
'allow_copy': None,
'allow_email': None,
@ -29,7 +29,7 @@
'istable': None,
'max_attachments': None,
'menu_index': None,
'modified': '2011-02-18 14:16:13',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'module': 'Payroll',
'name': 'Salary Slip',
@ -53,57 +53,57 @@
'subject': 'For %(employee_name)s, %(designation)s',
'tag_fields': None,
'use_template': None,
'version': 372
'version': 388
},
{
'amend': 0,
'cancel': 0,
'create': 0,
'creation': '2011-02-21 09:23:54',
'creation': '2011-02-17 13:25:56',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': None,
'idx': 1,
'match': 'owner',
'modified': '2011-02-21 09:23:54',
'modified_by': 'Administrator',
'name': 'PERM00797',
'owner': 'Administrator',
'parent': 'Salary Slip',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': None,
'read': 1,
'role': 'Employee',
'submit': 0,
'write': 0
},
{
'amend': 0,
'cancel': 0,
'create': 0,
'creation': '2011-02-21 09:23:54',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': None,
'match': 'owner',
'modified': '2011-02-21 09:23:54',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'PERM00798',
'owner': 'Administrator',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Salary Slip',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': None,
'permlevel': 0,
'read': 1,
'role': 'Employee',
'submit': 0,
'write': 0
},
{
'amend': 1,
'cancel': 1,
'create': 1,
'creation': '2011-05-31 10:10:38',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 2,
'match': None,
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'PERM00853',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Salary Slip',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': 0,
'read': 1,
'role': 'System Manager',
'submit': 1,
'write': 1
},
{
'amend': 0,
'cancel': None,
'cancel': 0,
'create': 1,
'creation': '2010-08-08 17:09:20',
'docstatus': 0,
@ -111,7 +111,7 @@
'execute': None,
'idx': 3,
'match': None,
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'PERM00455',
'owner': 'harshada@webnotestech.com',
@ -125,8 +125,8 @@
'write': 1
},
{
'amend': 1,
'cancel': 1,
'amend': 0,
'cancel': 0,
'create': 1,
'creation': '2010-08-08 17:09:20',
'docstatus': 0,
@ -134,7 +134,7 @@
'execute': None,
'idx': 4,
'match': None,
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'PERM00456',
'owner': 'harshada@webnotestech.com',
@ -148,16 +148,16 @@
'write': 1
},
{
'amend': None,
'cancel': None,
'create': None,
'amend': 0,
'cancel': 0,
'create': 0,
'creation': '2010-08-08 17:09:20',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 5,
'match': None,
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'PERM00457',
'owner': 'harshada@webnotestech.com',
@ -167,20 +167,20 @@
'permlevel': 1,
'read': 1,
'role': 'HR User',
'submit': None,
'write': None
'submit': 0,
'write': 0
},
{
'amend': None,
'cancel': None,
'create': None,
'amend': 0,
'cancel': 0,
'create': 0,
'creation': '2010-08-08 17:09:20',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 6,
'match': None,
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'PERM00458',
'owner': 'harshada@webnotestech.com',
@ -190,13 +190,13 @@
'permlevel': 1,
'read': 1,
'role': 'HR Manager',
'submit': None,
'write': None
'submit': 0,
'write': 0
},
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-02-21 09:23:57',
'creation': '2011-04-05 17:13:17',
'default': None,
'depends_on': None,
'description': None,
@ -209,9 +209,9 @@
'idx': 1,
'in_filter': None,
'label': 'Basic Info',
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL04663',
'name': '000002460',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@ -232,7 +232,7 @@
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-02-21 09:23:57',
'creation': '2011-04-05 17:13:17',
'default': None,
'depends_on': None,
'description': None,
@ -245,9 +245,9 @@
'idx': 2,
'in_filter': None,
'label': None,
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL04664',
'name': '000002461',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@ -281,7 +281,7 @@
'idx': 3,
'in_filter': 1,
'label': 'Employee',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02891',
'no_column': None,
@ -298,8 +298,8 @@
'report_hide': None,
'reqd': 1,
'search_index': 0,
'trigger': '',
'width': ''
'trigger': None,
'width': None
},
{
'allow_on_submit': None,
@ -317,7 +317,7 @@
'idx': 4,
'in_filter': 1,
'label': 'Employee Name',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02893',
'no_column': None,
@ -353,7 +353,7 @@
'idx': 5,
'in_filter': 1,
'label': 'Department',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02894',
'no_column': None,
@ -389,7 +389,7 @@
'idx': 6,
'in_filter': 1,
'label': 'Designation',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02895',
'no_column': None,
@ -425,7 +425,7 @@
'idx': 7,
'in_filter': 1,
'label': 'Branch',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02896',
'no_column': None,
@ -461,7 +461,7 @@
'idx': 8,
'in_filter': 1,
'label': 'Grade',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02897',
'no_column': None,
@ -497,7 +497,7 @@
'idx': 9,
'in_filter': None,
'label': 'PF No.',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02898',
'no_column': None,
@ -533,7 +533,7 @@
'idx': 10,
'in_filter': None,
'label': 'ESIC No.',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02899',
'no_column': None,
@ -556,7 +556,43 @@
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-02-21 09:23:57',
'creation': '2011-04-19 11:19:04',
'default': None,
'depends_on': None,
'description': None,
'docstatus': 0,
'doctype': 'DocField',
'fieldname': 'letter_head',
'fieldtype': 'Link',
'hidden': None,
'icon': None,
'idx': 11,
'in_filter': None,
'label': 'Letter Head',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': '000003743',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
'oldfieldtype': None,
'options': 'Letter Head',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Salary Slip',
'parentfield': 'fields',
'parenttype': 'DocType',
'permlevel': 0,
'print_hide': None,
'report_hide': None,
'reqd': None,
'search_index': None,
'trigger': None,
'width': None
},
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-04-05 17:13:17',
'default': None,
'depends_on': None,
'description': None,
@ -566,12 +602,12 @@
'fieldtype': 'Column Break',
'hidden': None,
'icon': None,
'idx': 11,
'idx': 12,
'in_filter': None,
'label': None,
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL04665',
'name': '000002462',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@ -602,10 +638,10 @@
'fieldtype': 'Link',
'hidden': None,
'icon': None,
'idx': 12,
'idx': 13,
'in_filter': 1,
'label': 'Fiscal Year',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02884',
'no_column': None,
@ -622,8 +658,44 @@
'report_hide': None,
'reqd': 1,
'search_index': 1,
'trigger': '',
'width': ''
'trigger': None,
'width': None
},
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-06-27 11:12:33',
'default': None,
'depends_on': None,
'description': None,
'docstatus': 0,
'doctype': 'DocField',
'fieldname': 'company',
'fieldtype': 'Select',
'hidden': None,
'icon': None,
'idx': 14,
'in_filter': 1,
'label': 'Company',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL05405',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
'oldfieldtype': None,
'options': 'Link:Company',
'owner': 'Administrator',
'parent': 'Salary Slip',
'parentfield': 'fields',
'parenttype': 'DocType',
'permlevel': 0,
'print_hide': None,
'report_hide': None,
'reqd': 1,
'search_index': None,
'trigger': None,
'width': None
},
{
'allow_on_submit': None,
@ -638,10 +710,10 @@
'fieldtype': 'Select',
'hidden': None,
'icon': None,
'idx': 13,
'idx': 15,
'in_filter': 1,
'label': 'Month',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02886',
'no_column': None,
@ -674,10 +746,10 @@
'fieldtype': 'Int',
'hidden': None,
'icon': None,
'idx': 14,
'idx': 16,
'in_filter': None,
'label': 'Total days in month',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02903',
'no_column': None,
@ -699,7 +771,7 @@
},
{
'allow_on_submit': None,
'colour': None,
'colour': 'White:FFF',
'creation': '2010-08-08 17:09:20',
'default': None,
'depends_on': None,
@ -710,10 +782,10 @@
'fieldtype': 'Currency',
'hidden': None,
'icon': None,
'idx': 15,
'idx': 17,
'in_filter': None,
'label': 'Leave Without Pay',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02904',
'no_column': None,
@ -746,10 +818,10 @@
'fieldtype': 'Float',
'hidden': None,
'icon': None,
'idx': 16,
'idx': 18,
'in_filter': None,
'label': 'Payment days',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02907',
'no_column': None,
@ -782,10 +854,10 @@
'fieldtype': 'Data',
'hidden': None,
'icon': None,
'idx': 17,
'idx': 19,
'in_filter': None,
'label': 'Bank Name',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02905',
'no_column': None,
@ -818,10 +890,10 @@
'fieldtype': 'Data',
'hidden': None,
'icon': None,
'idx': 18,
'idx': 20,
'in_filter': None,
'label': 'Bank Account No.',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02906',
'no_column': None,
@ -854,10 +926,10 @@
'fieldtype': 'Check',
'hidden': None,
'icon': None,
'idx': 19,
'idx': 21,
'in_filter': None,
'label': 'Email',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02908',
'no_column': None,
@ -874,7 +946,7 @@
'report_hide': 1,
'reqd': None,
'search_index': None,
'trigger': '',
'trigger': None,
'width': None
},
{
@ -890,10 +962,10 @@
'fieldtype': 'Data',
'hidden': 0,
'icon': None,
'idx': 20,
'idx': 22,
'in_filter': None,
'label': 'Amended From',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02901',
'no_column': None,
@ -926,10 +998,10 @@
'fieldtype': 'Date',
'hidden': 0,
'icon': None,
'idx': 21,
'idx': 23,
'in_filter': None,
'label': 'Amendment Date',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02902',
'no_column': None,
@ -952,7 +1024,7 @@
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-02-21 09:23:57',
'creation': '2011-04-05 17:13:17',
'default': None,
'depends_on': None,
'description': None,
@ -962,12 +1034,12 @@
'fieldtype': 'Section Break',
'hidden': None,
'icon': None,
'idx': 22,
'idx': 24,
'in_filter': None,
'label': 'Earning & Deduction',
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL04666',
'name': '000002463',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@ -988,7 +1060,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
'creation': '2011-02-21 09:23:57',
'creation': '2011-04-05 17:13:17',
'default': None,
'depends_on': None,
'description': None,
@ -998,12 +1070,12 @@
'fieldtype': 'Column Break',
'hidden': None,
'icon': None,
'idx': 23,
'idx': 25,
'in_filter': None,
'label': 'Earning',
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL04667',
'name': '000002464',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@ -1034,10 +1106,10 @@
'fieldtype': 'Table',
'hidden': None,
'icon': None,
'idx': 24,
'idx': 26,
'in_filter': None,
'label': 'Earning Details',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02914',
'no_column': None,
@ -1054,13 +1126,13 @@
'report_hide': None,
'reqd': None,
'search_index': None,
'trigger': '',
'trigger': None,
'width': None
},
{
'allow_on_submit': None,
'colour': 'White:FFF',
'creation': '2011-02-21 09:23:57',
'creation': '2011-04-05 17:13:17',
'default': None,
'depends_on': None,
'description': None,
@ -1070,12 +1142,12 @@
'fieldtype': 'Column Break',
'hidden': None,
'icon': None,
'idx': 25,
'idx': 27,
'in_filter': None,
'label': 'Deduction',
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL04668',
'name': '000002465',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@ -1106,10 +1178,10 @@
'fieldtype': 'Table',
'hidden': None,
'icon': None,
'idx': 26,
'idx': 28,
'in_filter': None,
'label': 'Deduction Details',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02917',
'no_column': None,
@ -1127,12 +1199,12 @@
'reqd': None,
'search_index': None,
'trigger': None,
'width': ''
'width': None
},
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-02-21 09:23:57',
'creation': '2011-04-05 17:13:17',
'default': None,
'depends_on': None,
'description': None,
@ -1142,12 +1214,12 @@
'fieldtype': 'Section Break',
'hidden': None,
'icon': None,
'idx': 27,
'idx': 29,
'in_filter': None,
'label': 'Totals',
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL04669',
'name': '000002466',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@ -1168,7 +1240,7 @@
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-02-21 09:23:57',
'creation': '2011-04-05 17:13:17',
'default': None,
'depends_on': None,
'description': None,
@ -1178,12 +1250,12 @@
'fieldtype': 'Column Break',
'hidden': None,
'icon': None,
'idx': 28,
'idx': 30,
'in_filter': None,
'label': None,
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL04670',
'name': '000002467',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@ -1214,10 +1286,10 @@
'fieldtype': 'Currency',
'hidden': None,
'icon': None,
'idx': 29,
'idx': 31,
'in_filter': None,
'label': 'Arrear Amount',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02909',
'no_column': None,
@ -1240,7 +1312,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
'creation': '2011-02-21 09:23:54',
'creation': '2011-02-17 13:25:56',
'default': None,
'depends_on': None,
'description': None,
@ -1250,16 +1322,16 @@
'fieldtype': 'Currency',
'hidden': None,
'icon': None,
'idx': 30,
'idx': 32,
'in_filter': None,
'label': 'Leave Encashment Amount',
'modified': '2011-02-21 09:23:54',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL04572',
'name': 'FL04573',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
'oldfieldtype': None,
'oldfieldname': 'encashment_amount',
'oldfieldtype': 'Currency',
'options': None,
'owner': 'harshada@webnotestech.com',
'parent': 'Salary Slip',
@ -1286,10 +1358,10 @@
'fieldtype': 'Currency',
'hidden': None,
'icon': None,
'idx': 31,
'idx': 33,
'in_filter': None,
'label': 'Gross Pay',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02920',
'no_column': None,
@ -1322,10 +1394,10 @@
'fieldtype': 'Currency',
'hidden': None,
'icon': None,
'idx': 32,
'idx': 34,
'in_filter': None,
'label': 'Total Deduction',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02922',
'no_column': None,
@ -1348,7 +1420,7 @@
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-02-21 09:23:57',
'creation': '2011-04-05 17:13:17',
'default': None,
'depends_on': None,
'description': None,
@ -1358,12 +1430,12 @@
'fieldtype': 'Column Break',
'hidden': None,
'icon': None,
'idx': 33,
'idx': 35,
'in_filter': None,
'label': None,
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL04671',
'name': '000002468',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@ -1394,10 +1466,10 @@
'fieldtype': 'Currency',
'hidden': None,
'icon': None,
'idx': 34,
'idx': 36,
'in_filter': None,
'label': 'Net Pay',
'modified': '2010-08-08 17:09:20',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': 'FL02924',
'no_column': None,
@ -1414,7 +1486,79 @@
'report_hide': None,
'reqd': None,
'search_index': None,
'trigger': '',
'trigger': None,
'width': None
},
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-04-05 17:13:17',
'default': None,
'depends_on': None,
'description': None,
'docstatus': 0,
'doctype': 'DocField',
'fieldname': 'rounded_total',
'fieldtype': 'Currency',
'hidden': None,
'icon': None,
'idx': 37,
'in_filter': None,
'label': 'Rounded Total',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': '000002458',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
'oldfieldtype': None,
'options': None,
'owner': 'Administrator',
'parent': 'Salary Slip',
'parentfield': 'fields',
'parenttype': 'DocType',
'permlevel': 1,
'print_hide': None,
'report_hide': None,
'reqd': None,
'search_index': None,
'trigger': None,
'width': None
},
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-04-05 17:13:17',
'default': None,
'depends_on': None,
'description': 'Net Pay (in words) will be visible once you save the Salary Slip.',
'docstatus': 0,
'doctype': 'DocField',
'fieldname': 'total_in_words',
'fieldtype': 'Data',
'hidden': None,
'icon': None,
'idx': 38,
'in_filter': None,
'label': 'Total in words',
'modified': '2011-06-27 11:12:33',
'modified_by': 'Administrator',
'name': '000002459',
'no_column': None,
'no_copy': None,
'oldfieldname': 'net_pay_in_words',
'oldfieldtype': 'Data',
'options': None,
'owner': 'Administrator',
'parent': 'Salary Slip',
'parentfield': 'fields',
'parenttype': 'DocType',
'permlevel': 1,
'print_hide': None,
'report_hide': None,
'reqd': None,
'search_index': None,
'trigger': None,
'width': None
}
]

2
payroll/doctype/salary_structure/salary_structure.js
View File

@ -1,3 +1,5 @@
cur_frm.add_fetch('employee', 'company', 'company');
// On load
//=======================================================================
cur_frm.cscript.onload = function(doc, dt, dn){

372
payroll/doctype/salary_structure/salary_structure.txt
View File

@ -1,6 +1,6 @@
[
{
'_last_update': None,
'_last_update': '1308808105',
'allow_attach': None,
'allow_copy': None,
'allow_email': None,
@ -29,7 +29,7 @@
'istable': None,
'max_attachments': None,
'menu_index': None,
'modified': '2011-02-18 14:17:16',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'module': 'Payroll',
'name': 'Salary Structure',
@ -51,90 +51,136 @@
'show_in_menu': 0,
'smallicon': None,
'subject': 'For %(employee_name)s',
'tag_fields': '',
'tag_fields': None,
'use_template': None,
'version': 585
'version': 586
},
{
'amend': 0,
'cancel': 1,
'create': 1,
'creation': '2011-04-26 17:22:35',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 1,
'match': None,
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': '000005552',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Salary Structure',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': 0,
'read': 1,
'role': 'System Manager',
'submit': 0,
'write': 1
},
{
'amend': 0,
'cancel': 0,
'create': 0,
'creation': '2011-02-21 09:23:54',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': None,
'match': 'owner',
'modified': '2011-02-21 09:23:54',
'modified_by': 'Administrator',
'name': 'PERM00795',
'owner': 'Administrator',
'parent': 'Salary Structure',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': None,
'read': 1,
'role': 'Employee',
'submit': 0,
'write': 0
},
{
'amend': 0,
'cancel': 0,
'create': 0,
'creation': '2011-02-21 09:23:54',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': None,
'match': 'owner',
'modified': '2011-02-21 09:23:54',
'modified_by': 'Administrator',
'name': 'PERM00796',
'owner': 'Administrator',
'parent': 'Salary Structure',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': None,
'read': 1,
'role': 'Employee',
'submit': 0,
'write': 0
},
{
'amend': None,
'cancel': None,
'create': None,
'creation': '2010-12-30 13:02:27',
'creation': '2011-04-26 17:22:57',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 2,
'match': None,
'modified': '2010-12-30 13:02:27',
'match': 'owner',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'PERM00785',
'owner': 'Administrator',
'name': '000005553',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Salary Structure',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': 1,
'permlevel': 0,
'read': 1,
'role': 'All',
'submit': None,
'role': 'Employee',
'submit': 0,
'write': 0
},
{
'amend': None,
'cancel': None,
'amend': 0,
'cancel': 0,
'create': 0,
'creation': '2011-05-12 23:34:49',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 3,
'match': 'owner',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': '000011977',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Salary Structure',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': 0,
'read': 1,
'role': 'Employee',
'submit': 0,
'write': 0
},
{
'amend': 0,
'cancel': 0,
'create': 0,
'creation': '2011-02-17 13:25:56',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 4,
'match': 'owner',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'PERM00795',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Salary Structure',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': 0,
'read': 1,
'role': 'Employee',
'submit': 0,
'write': 0
},
{
'amend': 0,
'cancel': 0,
'create': 0,
'creation': '2011-02-17 13:25:56',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 5,
'match': 'owner',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'PERM00796',
'owner': 'sanjeeva@vencesystem.com',
'parent': 'Salary Structure',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': 0,
'read': 1,
'role': 'Employee',
'submit': 0,
'write': 0
},
{
'amend': 0,
'cancel': 0,
'create': 1,
'creation': '2010-12-30 13:02:27',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 3,
'idx': 6,
'match': None,
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'PERM00786',
'owner': 'harshada@webnotestech.com',
@ -144,20 +190,20 @@
'permlevel': 0,
'read': 1,
'role': 'HR User',
'submit': None,
'submit': 0,
'write': 1
},
{
'amend': None,
'cancel': None,
'amend': 0,
'cancel': 0,
'create': 1,
'creation': '2010-12-30 13:02:27',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 4,
'idx': 7,
'match': None,
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'PERM00787',
'owner': 'harshada@webnotestech.com',
@ -167,20 +213,20 @@
'permlevel': 0,
'read': 1,
'role': 'HR Manager',
'submit': None,
'submit': 0,
'write': 1
},
{
'amend': None,
'cancel': None,
'create': None,
'amend': 0,
'cancel': 0,
'create': 0,
'creation': '2010-12-30 13:02:27',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 5,
'idx': 8,
'match': None,
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'PERM00788',
'owner': 'harshada@webnotestech.com',
@ -190,20 +236,20 @@
'permlevel': 1,
'read': 1,
'role': 'HR Manager',
'submit': None,
'write': None
'submit': 0,
'write': 0
},
{
'amend': None,
'cancel': None,
'create': None,
'amend': 0,
'cancel': 0,
'create': 0,
'creation': '2010-12-30 13:02:27',
'docstatus': 0,
'doctype': 'DocPerm',
'execute': None,
'idx': 6,
'idx': 9,
'match': None,
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'PERM00789',
'owner': 'harshada@webnotestech.com',
@ -213,13 +259,13 @@
'permlevel': 1,
'read': 1,
'role': 'HR User',
'submit': None,
'write': None
'submit': 0,
'write': 0
},
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-02-21 09:23:57',
'creation': '2011-02-18 22:32:31',
'default': None,
'depends_on': None,
'description': None,
@ -232,9 +278,9 @@
'idx': 1,
'in_filter': None,
'label': 'Basic Info',
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04654',
'name': 'FL04655',
'no_column': None,
'no_copy': None,
'oldfieldname': 'basic_info',
@ -255,7 +301,7 @@
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-02-21 09:23:57',
'creation': '2011-02-18 22:32:31',
'default': None,
'depends_on': None,
'description': None,
@ -268,9 +314,9 @@
'idx': 2,
'in_filter': None,
'label': None,
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04655',
'name': 'FL04656',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@ -304,7 +350,7 @@
'idx': 3,
'in_filter': 1,
'label': 'Employee',
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04446',
'no_column': None,
@ -340,7 +386,7 @@
'idx': 4,
'in_filter': None,
'label': 'Employee Name',
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04447',
'no_column': None,
@ -376,7 +422,7 @@
'idx': 5,
'in_filter': 1,
'label': 'Branch',
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04448',
'no_column': None,
@ -393,7 +439,7 @@
'report_hide': None,
'reqd': 0,
'search_index': None,
'trigger': '',
'trigger': None,
'width': None
},
{
@ -412,7 +458,7 @@
'idx': 6,
'in_filter': 1,
'label': 'Designation',
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04449',
'no_column': None,
@ -429,7 +475,7 @@
'report_hide': None,
'reqd': 0,
'search_index': None,
'trigger': '',
'trigger': None,
'width': None
},
{
@ -448,7 +494,7 @@
'idx': 7,
'in_filter': 1,
'label': 'Department',
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04450',
'no_column': None,
@ -465,7 +511,7 @@
'report_hide': None,
'reqd': 0,
'search_index': None,
'trigger': '',
'trigger': None,
'width': None
},
{
@ -480,11 +526,11 @@
'fieldname': 'grade',
'fieldtype': 'Select',
'hidden': None,
'icon': '',
'icon': None,
'idx': 8,
'in_filter': 1,
'label': 'Grade',
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04451',
'no_column': None,
@ -501,13 +547,13 @@
'report_hide': None,
'reqd': 0,
'search_index': None,
'trigger': '',
'trigger': None,
'width': None
},
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-02-21 09:23:57',
'creation': '2011-02-18 22:32:31',
'default': None,
'depends_on': None,
'description': None,
@ -520,9 +566,9 @@
'idx': 9,
'in_filter': None,
'label': None,
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04656',
'name': 'FL04657',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@ -556,7 +602,7 @@
'idx': 10,
'in_filter': 1,
'label': 'Is Active',
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04453',
'no_column': None,
@ -573,7 +619,7 @@
'report_hide': None,
'reqd': 1,
'search_index': None,
'trigger': '',
'trigger': None,
'width': None
},
{
@ -592,7 +638,7 @@
'idx': 11,
'in_filter': None,
'label': 'From Date',
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04454',
'no_column': None,
@ -628,7 +674,7 @@
'idx': 12,
'in_filter': None,
'label': 'To Date',
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04455',
'no_column': None,
@ -664,7 +710,7 @@
'idx': 13,
'in_filter': 1,
'label': 'CTC',
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04456',
'no_column': None,
@ -681,13 +727,49 @@
'report_hide': None,
'reqd': 1,
'search_index': None,
'trigger': '',
'trigger': None,
'width': None
},
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-02-21 09:23:57',
'creation': '2011-06-27 11:09:01',
'default': None,
'depends_on': None,
'description': None,
'docstatus': 0,
'doctype': 'DocField',
'fieldname': 'company',
'fieldtype': 'Select',
'hidden': None,
'icon': None,
'idx': 14,
'in_filter': 1,
'label': 'Company',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL05404',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
'oldfieldtype': None,
'options': 'Link:Company',
'owner': 'Administrator',
'parent': 'Salary Structure',
'parentfield': 'fields',
'parenttype': 'DocType',
'permlevel': 0,
'print_hide': None,
'report_hide': None,
'reqd': 1,
'search_index': None,
'trigger': None,
'width': None
},
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-02-18 22:32:31',
'default': None,
'depends_on': None,
'description': 'You can create more earning and deduction type from Setup --> HR',
@ -697,12 +779,12 @@
'fieldtype': 'Section Break',
'hidden': None,
'icon': None,
'idx': 14,
'idx': 15,
'in_filter': None,
'label': 'Earning & Deduction',
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04657',
'name': 'FL04658',
'no_column': None,
'no_copy': None,
'oldfieldname': 'earning_deduction',
@ -723,7 +805,7 @@
{
'allow_on_submit': None,
'colour': 'White:FFF',
'creation': '2011-02-21 09:23:57',
'creation': '2011-02-18 22:32:31',
'default': None,
'depends_on': None,
'description': None,
@ -733,12 +815,12 @@
'fieldtype': 'Column Break',
'hidden': 0,
'icon': None,
'idx': 15,
'idx': 16,
'in_filter': None,
'label': 'Earning',
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04658',
'name': 'FL04659',
'no_column': None,
'no_copy': None,
'oldfieldname': 'col_brk2',
@ -769,10 +851,10 @@
'fieldtype': 'Table',
'hidden': 0,
'icon': None,
'idx': 16,
'idx': 17,
'in_filter': None,
'label': 'Earning1',
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04459',
'no_column': None,
@ -789,13 +871,13 @@
'report_hide': None,
'reqd': None,
'search_index': None,
'trigger': '',
'trigger': None,
'width': None
},
{
'allow_on_submit': None,
'colour': 'White:FFF',
'creation': '2011-02-21 09:23:57',
'creation': '2011-02-18 22:32:31',
'default': None,
'depends_on': None,
'description': None,
@ -805,12 +887,12 @@
'fieldtype': 'Column Break',
'hidden': 0,
'icon': None,
'idx': 17,
'idx': 18,
'in_filter': None,
'label': 'Deduction',
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04659',
'name': 'FL04660',
'no_column': None,
'no_copy': None,
'oldfieldname': 'col_brk3',
@ -841,10 +923,10 @@
'fieldtype': 'Table',
'hidden': 0,
'icon': None,
'idx': 18,
'idx': 19,
'in_filter': None,
'label': 'Deduction1',
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04462',
'no_column': None,
@ -861,13 +943,13 @@
'report_hide': None,
'reqd': None,
'search_index': None,
'trigger': '',
'trigger': None,
'width': None
},
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-02-21 09:23:57',
'creation': '2011-02-18 22:32:31',
'default': None,
'depends_on': None,
'description': None,
@ -877,12 +959,12 @@
'fieldtype': 'Section Break',
'hidden': None,
'icon': None,
'idx': 19,
'idx': 20,
'in_filter': None,
'label': None,
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04660',
'name': 'FL04661',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@ -903,7 +985,7 @@
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-02-21 09:23:57',
'creation': '2011-02-18 22:32:31',
'default': None,
'depends_on': None,
'description': None,
@ -913,12 +995,12 @@
'fieldtype': 'Column Break',
'hidden': None,
'icon': None,
'idx': 20,
'idx': 21,
'in_filter': None,
'label': None,
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04661',
'name': 'FL04662',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@ -949,10 +1031,10 @@
'fieldtype': 'Currency',
'hidden': None,
'icon': None,
'idx': 21,
'idx': 22,
'in_filter': None,
'label': 'Total Earning',
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04465',
'no_column': None,
@ -985,10 +1067,10 @@
'fieldtype': 'Currency',
'hidden': None,
'icon': None,
'idx': 22,
'idx': 23,
'in_filter': None,
'label': 'Total Deduction',
'modified': '2010-12-30 13:02:27',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04468',
'no_column': None,
@ -1011,7 +1093,7 @@
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-02-21 09:23:57',
'creation': '2011-02-18 22:32:31',
'default': None,
'depends_on': None,
'description': None,
@ -1021,12 +1103,12 @@
'fieldtype': 'Column Break',
'hidden': None,
'icon': None,
'idx': 23,
'idx': 24,
'in_filter': None,
'label': None,
'modified': '2011-02-21 09:23:57',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04662',
'name': 'FL04663',
'no_column': None,
'no_copy': None,
'oldfieldname': None,
@ -1047,7 +1129,7 @@
{
'allow_on_submit': None,
'colour': None,
'creation': '2011-02-21 09:23:54',
'creation': '2011-02-17 13:25:56',
'default': None,
'depends_on': None,
'description': None,
@ -1057,10 +1139,10 @@
'fieldtype': 'Currency',
'hidden': None,
'icon': None,
'idx': 24,
'idx': 25,
'in_filter': None,
'label': 'Net Pay',
'modified': '2011-02-21 09:23:54',
'modified': '2011-06-27 11:09:01',
'modified_by': 'Administrator',
'name': 'FL04559',
'no_column': None,