Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

2026-05-18 20:49:19 +00:00 · 2013-07-10 15:16:30 +05:30
parent a0af48f101 3429b609a7
commit cb04d0cd14
86 changed files with 627 additions and 224 deletions
--- a/hr/doctype/appraisal_goal/appraisal_goal.txt
+++ b/hr/doctype/appraisal_goal/appraisal_goal.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-02-22 01:27:44", 
  "docstatus": 0, 
-  "modified": "2013-03-07 07:03:18", 
+  "modified": "2013-07-10 14:54:03", 
  "modified_by": "Administrator", 
  "owner": "ashwini@webnotestech.com"
 }, 
@@ -15,6 +15,7 @@
 }, 
 {
  "doctype": "DocField", 
+  "in_list_view": 1, 
  "name": "__common__", 
  "parent": "Appraisal Goal", 
  "parentfield": "fields", 
--- a/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt
+++ b/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-02-22 01:27:44", 
  "docstatus": 0, 
-  "modified": "2013-03-07 07:03:18", 
+  "modified": "2013-07-10 14:54:03", 
  "modified_by": "Administrator", 
  "owner": "ashwini@webnotestech.com"
 }, 
@@ -15,6 +15,7 @@
 }, 
 {
  "doctype": "DocField", 
+  "in_list_view": 1, 
  "name": "__common__", 
  "parent": "Appraisal Template Goal", 
  "parentfield": "fields", 
--- a/hr/doctype/employee_education/employee_education.txt
+++ b/hr/doctype/employee_education/employee_education.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-02-22 01:27:45", 
  "docstatus": 0, 
-  "modified": "2013-03-07 07:03:21", 
+  "modified": "2013-07-10 14:54:08", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -14,6 +14,7 @@
 }, 
 {
  "doctype": "DocField", 
+  "in_list_view": 1, 
  "name": "__common__", 
  "parent": "Employee Education", 
  "parentfield": "fields", 
--- a/hr/doctype/employee_external_work_history/employee_external_work_history.txt
+++ b/hr/doctype/employee_external_work_history/employee_external_work_history.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-02-22 01:27:45", 
  "docstatus": 0, 
-  "modified": "2013-03-07 07:03:21", 
+  "modified": "2013-07-10 14:54:08", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -14,6 +14,7 @@
 }, 
 {
  "doctype": "DocField", 
+  "in_list_view": 1, 
  "name": "__common__", 
  "parent": "Employee External Work History", 
  "parentfield": "fields", 
--- a/hr/doctype/employee_internal_work_history/employee_internal_work_history.txt
+++ b/hr/doctype/employee_internal_work_history/employee_internal_work_history.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-02-22 01:27:45", 
  "docstatus": 0, 
-  "modified": "2013-03-07 07:03:21", 
+  "modified": "2013-07-10 14:54:08", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -14,6 +14,7 @@
 }, 
 {
  "doctype": "DocField", 
+  "in_list_view": 1, 
  "name": "__common__", 
  "parent": "Employee Internal Work History", 
  "parentfield": "fields", 
--- a/hr/doctype/employee_leave_approver/employee_leave_approver.txt
+++ b/hr/doctype/employee_leave_approver/employee_leave_approver.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-04-12 06:56:15", 
  "docstatus": 0, 
-  "modified": "2013-04-12 07:53:33", 
+  "modified": "2013-07-10 14:54:08", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -19,6 +19,7 @@
  "doctype": "DocField", 
  "fieldname": "leave_approver", 
  "fieldtype": "Select", 
+  "in_list_view": 0, 
  "label": "Leave Approver", 
  "name": "__common__", 
  "parent": "Employee Leave Approver", 
--- a/hr/doctype/expense_claim_detail/expense_claim_detail.txt
+++ b/hr/doctype/expense_claim_detail/expense_claim_detail.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-02-22 01:27:46", 
  "docstatus": 0, 
-  "modified": "2013-03-07 07:03:21", 
+  "modified": "2013-07-10 14:54:09", 
  "modified_by": "Administrator", 
  "owner": "harshada@webnotestech.com"
 }, 
@@ -14,6 +14,7 @@
 }, 
 {
  "doctype": "DocField", 
+  "in_list_view": 1, 
  "name": "__common__", 
  "parent": "Expense Claim Detail", 
  "parentfield": "fields", 
--- a/hr/doctype/holiday/holiday.txt
+++ b/hr/doctype/holiday/holiday.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-02-22 01:27:46", 
  "docstatus": 0, 
-  "modified": "2013-03-07 07:03:21", 
+  "modified": "2013-07-10 14:54:09", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -14,6 +14,7 @@
 }, 
 {
  "doctype": "DocField", 
+  "in_list_view": 1, 
  "name": "__common__", 
  "parent": "Holiday", 
  "parentfield": "fields", 
--- a/hr/doctype/leave_block_list_allow/leave_block_list_allow.txt
+++ b/hr/doctype/leave_block_list_allow/leave_block_list_allow.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-02-22 01:27:47", 
  "docstatus": 0, 
-  "modified": "2013-03-07 07:03:23", 
+  "modified": "2013-07-10 14:54:10", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -16,6 +16,7 @@
  "doctype": "DocField", 
  "fieldname": "allow_user", 
  "fieldtype": "Link", 
+  "in_list_view": 1, 
  "label": "Allow User", 
  "name": "__common__", 
  "options": "Profile", 
--- a/hr/doctype/leave_block_list_date/leave_block_list_date.txt
+++ b/hr/doctype/leave_block_list_date/leave_block_list_date.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-02-22 01:27:47", 
  "docstatus": 0, 
-  "modified": "2013-03-07 07:03:23", 
+  "modified": "2013-07-10 14:54:10", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -14,6 +14,7 @@
 }, 
 {
  "doctype": "DocField", 
+  "in_list_view": 1, 
  "name": "__common__", 
  "parent": "Leave Block List Date", 
  "parentfield": "fields", 
--- a/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
+++ b/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-02-22 01:27:48", 
  "docstatus": 0, 
-  "modified": "2013-03-07 07:03:30", 
+  "modified": "2013-07-10 14:54:18", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -14,6 +14,7 @@
 }, 
 {
  "doctype": "DocField", 
+  "in_list_view": 1, 
  "name": "__common__", 
  "parent": "Salary Slip Deduction", 
  "parentfield": "fields", 
--- a/hr/doctype/salary_slip_earning/salary_slip_earning.txt
+++ b/hr/doctype/salary_slip_earning/salary_slip_earning.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-02-22 01:27:48", 
  "docstatus": 0, 
-  "modified": "2013-03-07 07:03:30", 
+  "modified": "2013-07-10 14:54:18", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -14,6 +14,7 @@
 }, 
 {
  "doctype": "DocField", 
+  "in_list_view": 1, 
  "name": "__common__", 
  "parent": "Salary Slip Earning", 
  "parentfield": "fields", 
--- a/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
+++ b/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-02-22 01:27:48", 
  "docstatus": 0, 
-  "modified": "2013-03-07 07:03:30", 
+  "modified": "2013-07-10 14:54:19", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -14,6 +14,7 @@
 }, 
 {
  "doctype": "DocField", 
+  "in_list_view": 1, 
  "name": "__common__", 
  "parent": "Salary Structure Deduction", 
  "parentfield": "fields", 
--- a/hr/doctype/salary_structure_earning/salary_structure_earning.txt
+++ b/hr/doctype/salary_structure_earning/salary_structure_earning.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-02-22 01:27:48", 
  "docstatus": 0, 
-  "modified": "2013-03-07 07:03:30", 
+  "modified": "2013-07-10 14:54:19", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -16,6 +16,7 @@
 }, 
 {
  "doctype": "DocField", 
+  "in_list_view": 1, 
  "name": "__common__", 
  "parent": "Salary Structure Earning", 
  "parentfield": "fields",