diff --git a/erpnext/contacts/doctype/party_type/party_type.json b/erpnext/contacts/doctype/party_type/party_type.json index b667b6e053..4ffaa6c248 100644 --- a/erpnext/contacts/doctype/party_type/party_type.json +++ b/erpnext/contacts/doctype/party_type/party_type.json @@ -1,302 +1,87 @@ { - "_last_update": null, - "_user_tags": null, - "allow_attach": null, - "allow_copy": null, - "allow_email": null, - "allow_import": null, - "allow_print": null, - "allow_rename": null, - "allow_trash": null, + "allow_rename": 1, "autoname": "field:party_type_name", - "change_log": null, - "client_script": null, - "client_script_core": null, - "client_string": null, - "colour": null, "creation": "2014-04-07 12:32:18.010384", - "custom": null, - "default_print_format": null, - "description": null, "docstatus": 0, "doctype": "DocType", "document_type": "Master", - "dt_template": null, "fields": [ { - "allow_on_submit": null, - "default": null, - "depends_on": null, - "description": null, "fieldname": "party_type_name", "fieldtype": "Data", - "hidden": null, - "ignore_restrictions": null, - "in_filter": null, "in_list_view": 1, "label": "Party Type Name", - "no_column": null, - "no_copy": null, - "oldfieldname": null, - "oldfieldtype": null, - "options": null, "permlevel": 0, - "print_hide": null, - "print_width": null, - "read_only": null, - "report_hide": null, - "reqd": 1, - "search_index": null, - "set_only_once": null, - "trigger": null, - "width": null + "reqd": 1 }, { - "allow_on_submit": null, - "default": null, - "depends_on": null, - "description": null, "fieldname": "parent_party_type", "fieldtype": "Link", - "hidden": null, - "ignore_restrictions": null, - "in_filter": null, - "in_list_view": null, "label": "Parent Party Type", - "no_column": null, - "no_copy": null, - "oldfieldname": null, - "oldfieldtype": null, "options": "Party Type", - "permlevel": 0, - "print_hide": null, - "print_width": null, - "read_only": null, - "report_hide": null, - "reqd": null, - "search_index": null, - "set_only_once": null, - "trigger": null, - "width": null + "permlevel": 0 }, { - "allow_on_submit": null, "default": "Yes", - "depends_on": null, - "description": null, "fieldname": "allow_children", "fieldtype": "Select", - "hidden": null, - "ignore_restrictions": null, - "in_filter": null, - "in_list_view": null, "label": "Allow Children", - "no_column": null, - "no_copy": null, - "oldfieldname": null, - "oldfieldtype": null, "options": "Yes\nNo", - "permlevel": 0, - "print_hide": null, - "print_width": null, - "read_only": null, - "report_hide": null, - "reqd": null, - "search_index": null, - "set_only_once": null, - "trigger": null, - "width": null + "permlevel": 0 }, { - "allow_on_submit": null, - "default": null, - "depends_on": null, - "description": null, "fieldname": "default_price_list", "fieldtype": "Link", - "hidden": null, - "ignore_restrictions": null, - "in_filter": null, - "in_list_view": null, "label": "Default Price List", - "no_column": null, - "no_copy": null, - "oldfieldname": null, - "oldfieldtype": null, "options": "Price List", - "permlevel": 0, - "print_hide": null, - "print_width": null, - "read_only": null, - "report_hide": null, - "reqd": null, - "search_index": null, - "set_only_once": null, - "trigger": null, - "width": null + "permlevel": 0 }, { - "allow_on_submit": null, - "default": null, - "depends_on": null, - "description": null, "fieldname": "lft", "fieldtype": "Int", "hidden": 1, - "ignore_restrictions": null, - "in_filter": null, - "in_list_view": null, "label": "LFT", - "no_column": null, - "no_copy": null, - "oldfieldname": null, - "oldfieldtype": null, - "options": null, "permlevel": 0, - "print_hide": null, - "print_width": null, "read_only": 1, - "report_hide": null, - "reqd": null, - "search_index": 1, - "set_only_once": null, - "trigger": null, - "width": null + "search_index": 1 }, { - "allow_on_submit": null, - "default": null, - "depends_on": null, - "description": null, "fieldname": "rgt", "fieldtype": "Int", "hidden": 1, - "ignore_restrictions": null, - "in_filter": null, - "in_list_view": null, "label": "RGT", - "no_column": null, - "no_copy": null, - "oldfieldname": null, - "oldfieldtype": null, - "options": null, "permlevel": 0, - "print_hide": null, - "print_width": null, "read_only": 1, - "report_hide": null, - "reqd": null, - "search_index": 1, - "set_only_once": null, - "trigger": null, - "width": null + "search_index": 1 }, { - "allow_on_submit": null, - "default": null, - "depends_on": null, - "description": null, "fieldname": "old_parent", "fieldtype": "Data", "hidden": 1, - "ignore_restrictions": null, - "in_filter": null, - "in_list_view": null, "label": "Old Parent", - "no_column": null, - "no_copy": null, - "oldfieldname": null, - "oldfieldtype": null, - "options": null, "permlevel": 0, - "print_hide": null, - "print_width": null, - "read_only": 1, - "report_hide": null, - "reqd": null, - "search_index": null, - "set_only_once": null, - "trigger": null, - "width": null + "read_only": 1 } ], - "hide_heading": null, - "hide_toolbar": null, - "icon": null, - "idx": null, - "in_create": null, - "in_dialog": null, - "is_submittable": null, - "is_transaction_doc": null, - "issingle": null, - "istable": null, - "max_attachments": null, - "menu_index": null, - "modified": "2014-04-07 12:54:46.254776", + "modified": "2014-05-06 12:12:27.359617", "modified_by": "Administrator", "module": "Contacts", "name": "Party Type", - "name_case": null, "owner": "Administrator", - "parent": null, - "parent_node": null, - "parentfield": null, - "parenttype": null, "permissions": [ { - "amend": null, - "cancel": null, "create": 1, - "delete": null, - "email": null, - "export": null, - "import": null, - "match": null, "permlevel": 0, - "print": null, "read": 1, - "report": null, - "restrict": null, - "restricted": null, "role": "Sales User", - "submit": null, "write": 1 }, { - "amend": null, - "cancel": null, "create": 1, - "delete": null, - "email": null, - "export": null, - "import": null, - "match": null, "permlevel": 0, - "print": null, "read": 1, - "report": null, - "restrict": null, - "restricted": null, "role": "Purchase User", - "submit": null, "write": 1 } - ], - "plugin": null, - "print_outline": null, - "read_only": null, - "read_only_onload": null, - "search_fields": null, - "section_style": null, - "server_code": null, - "server_code_compiled": null, - "server_code_core": null, - "server_code_error": null, - "show_in_menu": null, - "smallicon": null, - "subject": null, - "tag_fields": null, - "title_field": null, - "use_template": null, - "version": null + ] } \ No newline at end of file diff --git a/erpnext/hr/doctype/department/department.json b/erpnext/hr/doctype/department/department.json index cef4ffaaf0..d040dec868 100644 --- a/erpnext/hr/doctype/department/department.json +++ b/erpnext/hr/doctype/department/department.json @@ -1,49 +1,62 @@ { - "allow_import": 1, - "autoname": "field:department_name", - "creation": "2013-02-05 11:48:26.000000", - "docstatus": 0, - "doctype": "DocType", - "document_type": "Master", + "allow_import": 1, + "allow_rename": 1, + "autoname": "field:department_name", + "creation": "2013-02-05 11:48:26", + "docstatus": 0, + "doctype": "DocType", + "document_type": "Master", "fields": [ { - "fieldname": "department_name", - "fieldtype": "Data", - "label": "Department", - "oldfieldname": "department_name", - "oldfieldtype": "Data", - "permlevel": 0, - "reqd": 1 - }, + "fieldname": "trash_reason", + "fieldtype": "Small Text", + "in_list_view": 1, + "label": "Trash Reason", + "oldfieldname": "trash_reason", + "oldfieldtype": "Small Text", + "permlevel": 0, + "read_only": 1 + }, { - "description": "Days for which Holidays are blocked for this department.", - "fieldname": "leave_block_list", - "fieldtype": "Link", - "label": "Leave Block List", - "options": "Leave Block List", + "fieldname": "department_name", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Department", + "oldfieldname": "department_name", + "oldfieldtype": "Data", + "permlevel": 0, + "reqd": 1 + }, + { + "description": "Days for which Holidays are blocked for this department.", + "fieldname": "leave_block_list", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Leave Block List", + "options": "Leave Block List", "permlevel": 0 } - ], - "icon": "icon-sitemap", - "idx": 1, - "modified": "2014-01-20 17:48:38.000000", - "modified_by": "Administrator", - "module": "HR", - "name": "Department", - "owner": "Administrator", + ], + "icon": "icon-sitemap", + "idx": 1, + "modified": "2014-05-06 12:06:49.222106", + "modified_by": "Administrator", + "module": "HR", + "name": "Department", + "owner": "Administrator", "permissions": [ { - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "HR User", - "submit": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "HR User", + "submit": 0, "write": 1 } ] -} +} \ No newline at end of file diff --git a/erpnext/manufacturing/doctype/workstation/workstation.json b/erpnext/manufacturing/doctype/workstation/workstation.json index db3b440ab8..e15c241e25 100644 --- a/erpnext/manufacturing/doctype/workstation/workstation.json +++ b/erpnext/manufacturing/doctype/workstation/workstation.json @@ -1,7 +1,8 @@ { "allow_import": 1, + "allow_rename": 1, "autoname": "field:workstation_name", - "creation": "2013-01-10 16:34:17.000000", + "creation": "2013-01-10 16:34:17", "docstatus": 0, "doctype": "DocType", "document_type": "Master", @@ -9,6 +10,7 @@ { "fieldname": "workstation_name", "fieldtype": "Data", + "in_list_view": 1, "label": "Workstation Name", "oldfieldname": "workstation_name", "oldfieldtype": "Data", @@ -18,6 +20,7 @@ { "fieldname": "warehouse", "fieldtype": "Link", + "in_list_view": 1, "label": "Warehouse", "oldfieldname": "warehouse", "oldfieldtype": "Link", @@ -28,6 +31,7 @@ { "fieldname": "description", "fieldtype": "Text", + "in_list_view": 1, "label": "Description", "oldfieldname": "description", "oldfieldtype": "Text", @@ -38,6 +42,7 @@ "fieldname": "capacity", "fieldtype": "Data", "hidden": 1, + "in_list_view": 1, "label": "Capacity", "oldfieldname": "capacity", "oldfieldtype": "Data", @@ -48,6 +53,7 @@ "fieldname": "capacity_units", "fieldtype": "Select", "hidden": 1, + "in_list_view": 1, "label": "Capacity Units", "oldfieldname": "capacity_units", "oldfieldtype": "Select", @@ -126,7 +132,7 @@ ], "icon": "icon-wrench", "idx": 1, - "modified": "2014-01-20 17:49:35.000000", + "modified": "2014-05-06 12:12:33.424191", "modified_by": "Administrator", "module": "Manufacturing", "name": "Workstation", diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 54f9b6391a..e1a01ab2f7 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -36,3 +36,4 @@ execute:frappe.delete_doc("DocType", "MIS Control") execute:frappe.delete_doc("Page", "Financial Statements") execute:frappe.delete_doc("DocType", "Stock Ledger") execute:frappe.db.sql("update `tabJournal Voucher` set voucher_type='Journal Entry' where ifnull(voucher_type, '')=''") +execute:frappe.delete_doc("DocType", "Grade") diff --git a/erpnext/setup/doctype/brand/brand.json b/erpnext/setup/doctype/brand/brand.json index 493eb5b714..3e69ca5c62 100644 --- a/erpnext/setup/doctype/brand/brand.json +++ b/erpnext/setup/doctype/brand/brand.json @@ -1,7 +1,8 @@ { "allow_import": 1, + "allow_rename": 1, "autoname": "field:brand", - "creation": "2013-02-22 01:27:54.000000", + "creation": "2013-02-22 01:27:54", "docstatus": 0, "doctype": "DocType", "document_type": "Master", @@ -9,6 +10,7 @@ { "fieldname": "brand", "fieldtype": "Data", + "in_list_view": 1, "label": "Brand Name", "oldfieldname": "brand", "oldfieldtype": "Data", @@ -19,6 +21,7 @@ { "fieldname": "description", "fieldtype": "Text", + "in_list_view": 1, "label": "Description", "oldfieldname": "description", "oldfieldtype": "Text", @@ -30,14 +33,14 @@ "icon": "icon-certificate", "idx": 1, "in_dialog": 0, - "modified": "2014-01-20 17:48:27.000000", + "modified": "2014-05-06 12:13:17.646235", "modified_by": "Administrator", "module": "Setup", "name": "Brand", "owner": "Administrator", "permissions": [ { - "cancel": 1, + "cancel": 0, "create": 1, "delete": 1, "email": 1,