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

fix: Expense calim form UI

Browse Source
This commit is contained in:
Anurag Mishra 2019-12-12 11:20:18 +05:30 committed by Nabin Hait
parent ec9000b6b9
commit 39ecd6ee1e
4 changed files with 103 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
erpnext/hr/doctype/expense_claim_advance/expense_claim_advance.json
View File

@ -1,238 +1,100 @@
{ {
"allow_copy": 0, "actions": [],
"allow_guest_to_view": 0,
"allow_import": 0,
"allow_rename": 0,
"beta": 0,
"creation": "2017-10-09 16:53:26.410762", "creation": "2017-10-09 16:53:26.410762",
"custom": 0,
"docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"document_type": "Document", "document_type": "Document",
"editable_grid": 1, "editable_grid": 1,
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [
"employee_advance",
"posting_date",
"advance_paid",
"column_break_4",
"unclaimed_amount",
"allocated_amount",
"advance_account"
],
"fields": [ "fields": [
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 2, "columns": 2,
"fieldname": "employee_advance", "fieldname": "employee_advance",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 0,
"label": "Employee Advance", "label": "Employee Advance",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "journal_voucher", "oldfieldname": "journal_voucher",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Employee Advance", "options": "Employee Advance",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"print_width": "250px", "print_width": "250px",
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1, "reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0,
"width": "250px" "width": "250px"
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 2, "columns": 2,
"fieldname": "posting_date", "fieldname": "posting_date",
"fieldtype": "Date", "fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 0,
"label": "Posting Date", "label": "Posting Date",
"length": 0, "read_only": 1
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 2, "columns": 2,
"fieldname": "advance_paid", "fieldname": "advance_paid",
"fieldtype": "Currency", "fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 0,
"label": "Advance Paid", "label": "Advance Paid",
"length": 0,
"no_copy": 0,
"options": "Company:company.default_currency", "options": "Company:company.default_currency",
"permlevel": 0, "read_only": 1
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 2, "columns": 2,
"fieldname": "unclaimed_amount", "fieldname": "unclaimed_amount",
"fieldtype": "Currency", "fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 0,
"label": "Unclaimed amount", "label": "Unclaimed amount",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "advance_amount", "oldfieldname": "advance_amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
"options": "Company:company.default_currency", "options": "Company:company.default_currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"print_width": "120px", "print_width": "120px",
"read_only": 1, "read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1, "reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0,
"width": "120px" "width": "120px"
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 2, "columns": 2,
"fieldname": "allocated_amount", "fieldname": "allocated_amount",
"fieldtype": "Currency", "fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 0,
"label": "Allocated amount", "label": "Allocated amount",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "allocated_amount", "oldfieldname": "allocated_amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
"options": "Company:company.default_currency", "options": "Company:company.default_currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"print_width": "120px", "print_width": "120px",
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0,
"width": "120px" "width": "120px"
}, },
{ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "advance_account", "fieldname": "advance_account",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 1, "hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Advance Account", "label": "Advance Account",
"length": 0, "options": "Account"
"no_copy": 0, },
"options": "Account", {
"permlevel": 0, "fieldname": "column_break_4",
"precision": "", "fieldtype": "Column Break"
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
} }
], ],
"has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"image_view": 0,
"in_create": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "links": [],
"modified": "2017-10-09 19:59:48.818139", "modified": "2019-12-11 13:53:22.111766",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Expense Claim Advance", "name": "Expense Claim Advance",
"name_case": "",
"owner": "Administrator", "owner": "Administrator",
"permissions": [], "permissions": [],
"quick_entry": 1, "quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
"show_name_in_global_search": 0,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC"
"track_changes": 0,
"track_seen": 0
} }

10
erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json
View File

@ -1,4 +1,5 @@
{ {
"actions": [],
"creation": "2013-02-22 01:27:46", "creation": "2013-02-22 01:27:46",
"doctype": "DocType", "doctype": "DocType",
"editable_grid": 1, "editable_grid": 1,
@ -12,9 +13,9 @@
"description", "description",
"section_break_6", "section_break_6",
"amount", "amount",
"cost_center",
"column_break_8", "column_break_8",
"sanctioned_amount", "sanctioned_amount"
"cost_center"
], ],
"fields": [ "fields": [
{ {
@ -107,8 +108,9 @@
], ],
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"modified": "2019-11-22 11:57:25.110942", "links": [],
"modified_by": "jangeles@bai.ph", "modified": "2019-12-11 13:42:33.233432",
"modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Expense Claim Detail", "name": "Expense Claim Detail",
"owner": "harshada@webnotestech.com", "owner": "harshada@webnotestech.com",

10
erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
View File

@ -1,4 +1,5 @@
{ {
"actions": [],
"allow_import": 1, "allow_import": 1,
"allow_rename": 1, "allow_rename": 1,
"autoname": "field:expense_type", "autoname": "field:expense_type",
@ -9,8 +10,8 @@
"field_order": [ "field_order": [
"deferred_expense_account", "deferred_expense_account",
"expense_type", "expense_type",
"description", "accounts",
"accounts" "description"
], ],
"fields": [ "fields": [
{ {
@ -46,8 +47,9 @@
], ],
"icon": "fa fa-flag", "icon": "fa fa-flag",
"idx": 1, "idx": 1,
"modified": "2019-11-22 12:00:18.710408", "links": [],
"modified_by": "jangeles@bai.ph", "modified": "2019-12-11 13:38:59.534034",
"modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Expense Claim Type", "name": "Expense Claim Type",
"owner": "harshada@webnotestech.com", "owner": "harshada@webnotestech.com",

6
erpnext/hr/doctype/expense_taxes_and_charges/expense_taxes_and_charges.json
View File

@ -1,4 +1,5 @@
{ {
"actions": [],
"autoname": "hash", "autoname": "hash",
"creation": "2019-06-03 11:42:33.123976", "creation": "2019-06-03 11:42:33.123976",
"doctype": "DocType", "doctype": "DocType",
@ -8,8 +9,8 @@
"field_order": [ "field_order": [
"account_head", "account_head",
"cost_center", "cost_center",
"col_break1",
"rate", "rate",
"col_break1",
"description", "description",
"section_break_6", "section_break_6",
"tax_amount", "tax_amount",
@ -93,7 +94,8 @@
} }
], ],
"istable": 1, "istable": 1,
"modified": "2019-06-20 12:01:33.919555", "links": [],
"modified": "2019-12-11 13:50:02.883328",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Expense Taxes and Charges", "name": "Expense Taxes and Charges",