diff --git a/erpnext/accounts/doctype/pos_setting/pos_setting.json b/erpnext/accounts/doctype/pos_setting/pos_setting.json index 420263b3d2..6b420980b6 100755 --- a/erpnext/accounts/doctype/pos_setting/pos_setting.json +++ b/erpnext/accounts/doctype/pos_setting/pos_setting.json @@ -1,5 +1,6 @@ { - "autoname": "POS/.####", + "allow_rename": 0, + "autoname": "hash", "creation": "2013-05-24 12:15:51", "docstatus": 0, "doctype": "DocType", @@ -225,7 +226,7 @@ ], "icon": "icon-cog", "idx": 1, - "modified": "2015-01-06 02:20:25.431768", + "modified": "2015-01-15 15:27:41.530538", "modified_by": "Administrator", "module": "Accounts", "name": "POS Setting", @@ -256,5 +257,6 @@ } ], "sort_field": "modified", - "sort_order": "DESC" + "sort_order": "DESC", + "title_field": "user" } \ No newline at end of file diff --git a/erpnext/hr/doctype/appraisal_template/appraisal_template.json b/erpnext/hr/doctype/appraisal_template/appraisal_template.json index c814579dba..6971db150a 100644 --- a/erpnext/hr/doctype/appraisal_template/appraisal_template.json +++ b/erpnext/hr/doctype/appraisal_template/appraisal_template.json @@ -1,5 +1,6 @@ { "allow_import": 1, + "allow_rename": 1, "autoname": "field:kra_title", "creation": "2012-07-03 13:30:39", "docstatus": 0, @@ -46,7 +47,7 @@ ], "icon": "icon-file-text", "idx": 1, - "modified": "2014-12-24 15:01:34.621450", + "modified": "2015-01-15 15:26:55.553233", "modified_by": "Administrator", "module": "HR", "name": "Appraisal Template", diff --git a/erpnext/hr/doctype/employment_type/employment_type.json b/erpnext/hr/doctype/employment_type/employment_type.json index bc337f1890..8562662c2c 100644 --- a/erpnext/hr/doctype/employment_type/employment_type.json +++ b/erpnext/hr/doctype/employment_type/employment_type.json @@ -1,5 +1,6 @@ { "allow_import": 1, + "allow_rename": 1, "autoname": "field:employee_type_name", "creation": "2013-01-10 16:34:14", "docstatus": 0, @@ -19,7 +20,7 @@ ], "icon": "icon-flag", "idx": 1, - "modified": "2014-05-27 03:49:10.551828", + "modified": "2015-01-15 15:24:46.680451", "modified_by": "Administrator", "module": "HR", "name": "Employment Type", diff --git a/erpnext/hr/doctype/holiday_list/holiday_list.json b/erpnext/hr/doctype/holiday_list/holiday_list.json index a94f8ca7de..6862c97041 100644 --- a/erpnext/hr/doctype/holiday_list/holiday_list.json +++ b/erpnext/hr/doctype/holiday_list/holiday_list.json @@ -1,99 +1,99 @@ { - "allow_import": 1, - "autoname": "field:holiday_list_name", - "creation": "2013-01-10 16:34:14", - "docstatus": 0, - "doctype": "DocType", - "document_type": "Master", + "allow_import": 1, + "allow_rename": 1, + "autoname": "field:holiday_list_name", + "creation": "2013-01-10 16:34:14", + "docstatus": 0, + "doctype": "DocType", + "document_type": "Master", "fields": [ { - "fieldname": "holiday_list_name", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Holiday List Name", - "oldfieldname": "holiday_list_name", - "oldfieldtype": "Data", - "permlevel": 0, - "reqd": 1, - "unique": 0 - }, - { - "fieldname": "is_default", - "fieldtype": "Check", - "in_list_view": 1, - "label": "Default", - "permlevel": 0 - }, - { - "fieldname": "fiscal_year", - "fieldtype": "Link", - "in_filter": 1, - "in_list_view": 1, - "label": "Fiscal Year", - "oldfieldname": "fiscal_year", - "oldfieldtype": "Link", - "options": "Fiscal Year", - "permlevel": 0, + "fieldname": "holiday_list_name", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Holiday List Name", + "oldfieldname": "holiday_list_name", + "oldfieldtype": "Data", + "permlevel": 0, "reqd": 1 - }, + }, { - "fieldname": "weekly_off", - "fieldtype": "Select", - "in_list_view": 1, - "label": "Weekly Off", - "no_copy": 1, - "options": "\nSunday\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday", - "permlevel": 0, - "print_hide": 1, - "report_hide": 1 - }, - { - "fieldname": "get_weekly_off_dates", - "fieldtype": "Button", - "label": "Get Weekly Off Dates", - "options": "get_weekly_off_dates", + "fieldname": "is_default", + "fieldtype": "Check", + "in_list_view": 1, + "label": "Default", "permlevel": 0 - }, + }, { - "fieldname": "holidays", - "fieldtype": "Table", - "label": "Holidays", - "oldfieldname": "holiday_list_details", - "oldfieldtype": "Table", - "options": "Holiday", - "permlevel": 0, + "fieldname": "fiscal_year", + "fieldtype": "Link", + "in_filter": 1, + "in_list_view": 1, + "label": "Fiscal Year", + "oldfieldname": "fiscal_year", + "oldfieldtype": "Link", + "options": "Fiscal Year", + "permlevel": 0, + "reqd": 1 + }, + { + "fieldname": "weekly_off", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Weekly Off", + "no_copy": 1, + "options": "\nSunday\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday", + "permlevel": 0, + "print_hide": 1, + "report_hide": 1 + }, + { + "fieldname": "get_weekly_off_dates", + "fieldtype": "Button", + "label": "Get Weekly Off Dates", + "options": "get_weekly_off_dates", + "permlevel": 0 + }, + { + "fieldname": "holidays", + "fieldtype": "Table", + "label": "Holidays", + "oldfieldname": "holiday_list_details", + "oldfieldtype": "Table", + "options": "Holiday", + "permlevel": 0, "reqd": 0 - }, + }, { - "fieldname": "clear_table", - "fieldtype": "Button", - "label": "Clear Table", - "options": "clear_table", + "fieldname": "clear_table", + "fieldtype": "Button", + "label": "Clear Table", + "options": "clear_table", "permlevel": 0 } - ], - "icon": "icon-calendar", - "idx": 1, - "modified": "2014-12-24 15:32:58.469070", - "modified_by": "Administrator", - "module": "HR", - "name": "Holiday List", - "owner": "Administrator", + ], + "icon": "icon-calendar", + "idx": 1, + "modified": "2015-01-15 15:26:20.031592", + "modified_by": "Administrator", + "module": "HR", + "name": "Holiday List", + "owner": "Administrator", "permissions": [ { - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "HR Manager", - "submit": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "HR Manager", + "submit": 0, "write": 1 } - ], - "sort_field": "modified", + ], + "sort_field": "modified", "sort_order": "DESC" -} +} \ No newline at end of file diff --git a/erpnext/hr/doctype/leave_type/leave_type.json b/erpnext/hr/doctype/leave_type/leave_type.json index 9ce967fe11..ff19dd237e 100644 --- a/erpnext/hr/doctype/leave_type/leave_type.json +++ b/erpnext/hr/doctype/leave_type/leave_type.json @@ -1,5 +1,6 @@ { "allow_import": 1, + "allow_rename": 1, "autoname": "field:leave_type_name", "creation": "2013-02-21 09:55:58", "docstatus": 0, @@ -62,7 +63,7 @@ ], "icon": "icon-flag", "idx": 1, - "modified": "2014-05-27 03:49:13.297832", + "modified": "2015-01-15 12:37:30.557739", "modified_by": "Administrator", "module": "HR", "name": "Leave Type", diff --git a/erpnext/projects/doctype/activity_type/activity_type.json b/erpnext/projects/doctype/activity_type/activity_type.json index e4a6bc19db..73b22e1e07 100644 --- a/erpnext/projects/doctype/activity_type/activity_type.json +++ b/erpnext/projects/doctype/activity_type/activity_type.json @@ -1,5 +1,6 @@ { "allow_import": 1, + "allow_rename": 1, "autoname": "field:activity_type", "creation": "2013-03-05 10:14:59", "docstatus": 0, @@ -18,7 +19,7 @@ "icon": "icon-flag", "idx": 1, "in_dialog": 0, - "modified": "2015-01-07 15:12:20.500625", + "modified": "2015-01-15 15:22:10.640553", "modified_by": "Administrator", "module": "Projects", "name": "Activity Type", diff --git a/erpnext/setup/doctype/print_heading/print_heading.json b/erpnext/setup/doctype/print_heading/print_heading.json index c788d9ece2..4d16a247e6 100644 --- a/erpnext/setup/doctype/print_heading/print_heading.json +++ b/erpnext/setup/doctype/print_heading/print_heading.json @@ -1,5 +1,6 @@ { "allow_import": 1, + "allow_rename": 1, "autoname": "field:print_heading", "creation": "2013-01-10 16:34:24", "docstatus": 0, @@ -31,7 +32,7 @@ ], "icon": "icon-font", "idx": 1, - "modified": "2014-09-09 05:35:39.239327", + "modified": "2015-01-15 15:25:32.907590", "modified_by": "Administrator", "module": "Setup", "name": "Print Heading", diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.json b/erpnext/stock/doctype/item_attribute/item_attribute.json index d41646c564..ce0190d85c 100644 --- a/erpnext/stock/doctype/item_attribute/item_attribute.json +++ b/erpnext/stock/doctype/item_attribute/item_attribute.json @@ -1,7 +1,7 @@ { "allow_copy": 0, "allow_import": 1, - "allow_rename": 0, + "allow_rename": 1, "autoname": "field:attribute_name", "creation": "2014-09-26 03:49:54.899170", "custom": 0, @@ -54,7 +54,7 @@ "is_submittable": 0, "issingle": 0, "istable": 0, - "modified": "2014-09-26 06:08:28.729519", + "modified": "2015-01-15 15:25:52.728797", "modified_by": "Administrator", "module": "Stock", "name": "Item Attribute", diff --git a/erpnext/utilities/doctype/address_template/address_template.json b/erpnext/utilities/doctype/address_template/address_template.json index 78af51ddc7..db815111a7 100644 --- a/erpnext/utilities/doctype/address_template/address_template.json +++ b/erpnext/utilities/doctype/address_template/address_template.json @@ -1,57 +1,58 @@ { - "autoname": "field:country", - "creation": "2014-06-05 02:22:36.029850", - "docstatus": 0, - "doctype": "DocType", - "document_type": "Master", + "allow_rename": 1, + "autoname": "field:country", + "creation": "2014-06-05 02:22:36.029850", + "docstatus": 0, + "doctype": "DocType", + "document_type": "Master", "fields": [ { - "fieldname": "country", - "fieldtype": "Link", - "in_list_view": 1, - "label": "Country", - "options": "Country", - "permlevel": 0, - "reqd": 1, + "fieldname": "country", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Country", + "options": "Country", + "permlevel": 0, + "reqd": 1, "search_index": 1 - }, + }, { - "description": "This format is used if country specific format is not found", - "fieldname": "is_default", - "fieldtype": "Check", - "in_list_view": 1, - "label": "Is Default", + "description": "This format is used if country specific format is not found", + "fieldname": "is_default", + "fieldtype": "Check", + "in_list_view": 1, + "label": "Is Default", "permlevel": 0 - }, + }, { - "default": "{{ address_line1 }}
{% if address_line2 %}{{ address_line2 }}
{% endif -%}\n{{ city }}
\n{% if state %}{{ state }}
{% endif -%}\n{% if pincode %}{{ pincode }}
{% endif -%}\n{{ country }}
\n{% if phone %}Phone: {{ phone }}
{% endif -%}\n{% if fax %}Fax: {{ fax }}
{% endif -%}\n{% if email_id %}Email: {{ email_id }}
{% endif -%}\n", - "description": "

Default Template

\n

Uses Jinja Templating and all the fields of Address (including Custom Fields if any) will be available

\n
{{ address_line1 }}<br>\n{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}\n{{ city }}<br>\n{% if state %}{{ state }}<br>{% endif -%}\n{% if pincode %} PIN:  {{ pincode }}<br>{% endif -%}\n{{ country }}<br>\n{% if phone %}Phone: {{ phone }}<br>{% endif -%}\n{% if fax %}Fax: {{ fax }}<br>{% endif -%}\n{% if email_id %}Email: {{ email_id }}<br>{% endif -%}\n
", - "fieldname": "template", - "fieldtype": "Code", - "label": "Template", + "default": "{{ address_line1 }}
{% if address_line2 %}{{ address_line2 }}
{% endif -%}\n{{ city }}
\n{% if state %}{{ state }}
{% endif -%}\n{% if pincode %}{{ pincode }}
{% endif -%}\n{{ country }}
\n{% if phone %}Phone: {{ phone }}
{% endif -%}\n{% if fax %}Fax: {{ fax }}
{% endif -%}\n{% if email_id %}Email: {{ email_id }}
{% endif -%}\n", + "description": "

Default Template

\n

Uses Jinja Templating and all the fields of Address (including Custom Fields if any) will be available

\n
{{ address_line1 }}<br>\n{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}\n{{ city }}<br>\n{% if state %}{{ state }}<br>{% endif -%}\n{% if pincode %} PIN:  {{ pincode }}<br>{% endif -%}\n{{ country }}<br>\n{% if phone %}Phone: {{ phone }}<br>{% endif -%}\n{% if fax %}Fax: {{ fax }}<br>{% endif -%}\n{% if email_id %}Email: {{ email_id }}<br>{% endif -%}\n
", + "fieldname": "template", + "fieldtype": "Code", + "label": "Template", "permlevel": 0 } - ], - "icon": "icon-map-marker", - "modified": "2014-08-18 06:14:15.200689", - "modified_by": "Administrator", - "module": "Utilities", - "name": "Address Template", - "name_case": "", - "owner": "Administrator", + ], + "icon": "icon-map-marker", + "modified": "2015-01-15 15:25:18.709952", + "modified_by": "Administrator", + "module": "Utilities", + "name": "Address Template", + "name_case": "", + "owner": "Administrator", "permissions": [ { - "create": 1, - "delete": 1, - "export": 1, - "permlevel": 0, - "read": 1, - "report": 1, - "role": "System Manager", - "set_user_permissions": 1, + "create": 1, + "delete": 1, + "export": 1, + "permlevel": 0, + "read": 1, + "report": 1, + "role": "System Manager", + "set_user_permissions": 1, "write": 1 } - ], - "sort_field": "modified", + ], + "sort_field": "modified", "sort_order": "DESC" -} +} \ No newline at end of file