Merge pull request #5010 from rohitwaghchaure/support_week_14_03_5

[Enhancement]Fetch default letter head of company on salary structure and salary slip
9 years ago · 3f11f0ae44
4 changed files with 125 additions and 42 deletions
--- a/erpnext/hr/doctype/salary_slip/salary_slip.js
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.js
@ -2,6 +2,7 @@
 // License: GNU General Public License v3. See license.txt

 cur_frm.add_fetch('employee', 'company', 'company');
+cur_frm.add_fetch('company', 'default_letter_head', 'letter_head');

 // On load
 // -------------------------------------------------------------------
--- a/erpnext/hr/doctype/salary_slip/salary_slip.json
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.json
@ -16,6 +16,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@ -40,6 +41,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Employee", 
@ -66,6 +68,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Employee Name", 
@ -91,6 +94,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Department", 
@ -117,6 +121,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Designation", 
@ -143,6 +148,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Branch", 
@ -162,49 +168,51 @@
   "unique": 0
  }, 
  {
-   "allow_on_submit": 1, 
+   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
-   "fieldname": "letter_head", 
+   "fieldname": "company", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "in_filter": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
   "in_list_view": 0, 
-   "label": "Letter Head", 
+   "label": "Company", 
   "length": 0, 
   "no_copy": 0, 
-   "options": "Letter Head", 
+   "options": "Company", 
   "permlevel": 0, 
-   "print_hide": 1, 
+   "print_hide": 0, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
   "search_index": 0, 
   "set_only_once": 0, 
   "unique": 0
  }, 
  {
-   "allow_on_submit": 0, 
+   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
-   "fieldname": "company", 
+   "fieldname": "letter_head", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Company", 
+   "label": "Letter Head", 
   "length": 0, 
   "no_copy": 0, 
-   "options": "Company", 
+   "options": "Letter Head", 
   "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
   "unique": 0
@ -217,6 +225,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@ -241,6 +250,7 @@
   "fieldtype": "Select", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Month", 
@ -268,6 +278,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Fiscal Year", 
@ -294,6 +305,7 @@
   "fieldtype": "Float", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Working Days", 
@ -319,6 +331,7 @@
   "fieldtype": "Float", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Leave Without Pay", 
@ -344,6 +357,7 @@
   "fieldtype": "Float", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Payment Days", 
@ -369,6 +383,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Bank Name", 
@ -394,6 +409,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Bank Account No.", 
@ -419,6 +435,7 @@
   "fieldtype": "Check", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Email", 
@ -444,6 +461,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amended From", 
@ -470,6 +488,7 @@
   "fieldtype": "Section Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Earning & Deduction", 
@ -494,6 +513,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Earning", 
@ -519,6 +539,7 @@
   "fieldtype": "Table", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Earnings", 
@ -545,6 +566,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Deduction", 
@ -570,6 +592,7 @@
   "fieldtype": "Table", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Deductions", 
@ -596,6 +619,7 @@
   "fieldtype": "Section Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "", 
@ -620,6 +644,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@ -642,6 +667,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@ -664,6 +690,7 @@
   "fieldtype": "Currency", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Arrear Amount", 
@ -690,6 +717,7 @@
   "fieldtype": "Currency", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Leave Encashment Amount", 
@ -716,6 +744,7 @@
   "fieldtype": "Currency", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Gross Pay", 
@ -742,6 +771,7 @@
   "fieldtype": "Currency", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Deduction", 
@ -769,6 +799,7 @@
   "fieldtype": "Currency", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Pay", 
@ -795,6 +826,7 @@
   "fieldtype": "Currency", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Rounded Total", 
@ -820,6 +852,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total in words", 
@ -848,7 +881,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-02-03 01:17:01.042780", 
+ "modified": "2016-03-18 16:02:55.254165", 
 "modified_by": "Administrator", 
 "module": "HR", 
 "name": "Salary Slip", 
--- a/erpnext/hr/doctype/salary_structure/salary_structure.js
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.js
@ -2,6 +2,7 @@
 // License: GNU General Public License v3. See license.txt

 cur_frm.add_fetch('employee', 'company', 'company');
+cur_frm.add_fetch('company', 'default_letter_head', 'letter_head');

 cur_frm.cscript.onload = function(doc, dt, dn){
 	e_tbl = doc.earnings || [];
--- a/erpnext/hr/doctype/salary_structure/salary_structure.json
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.json
@ -16,6 +16,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@ -39,6 +40,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Employee", 
@ -65,6 +67,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Employee Name", 
@ -90,6 +93,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Branch", 
@ -116,6 +120,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Designation", 
@ -142,6 +147,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Department", 
@ -160,6 +166,57 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "letter_head", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Letter Head", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Letter Head", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@ -168,6 +225,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@ -192,6 +250,7 @@
   "fieldtype": "Select", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Is Active", 
@ -218,6 +277,7 @@
   "fieldtype": "Date", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "From Date", 
@ -243,6 +303,7 @@
   "fieldtype": "Date", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "To Date", 
@ -260,30 +321,6 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@ -293,6 +330,7 @@
   "fieldtype": "Section Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Monthly Earning & Deduction", 
@ -318,6 +356,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Earning", 
@ -344,6 +383,7 @@
   "fieldtype": "Table", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Earnings", 
@ -370,6 +410,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Deduction", 
@ -396,6 +437,7 @@
   "fieldtype": "Table", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Deductions", 
@ -422,6 +464,7 @@
   "fieldtype": "Section Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@ -445,6 +488,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@ -468,6 +512,7 @@
   "fieldtype": "Currency", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Earning", 
@ -494,6 +539,7 @@
   "fieldtype": "Currency", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Total Deduction", 
@ -520,6 +566,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@ -543,6 +590,7 @@
   "fieldtype": "Currency", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Net Pay", 
@ -570,7 +618,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-02-03 01:18:16.629324", 
+ "modified": "2016-03-18 16:10:30.031811", 
 "modified_by": "Administrator", 
 "module": "HR", 
 "name": "Salary Structure",