diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py index 9944db98822..fc2be827b6a 100644 --- a/erpnext/config/desktop.py +++ b/erpnext/config/desktop.py @@ -157,5 +157,12 @@ def get_data(): "is_help": True, "label": _("Learn"), "hidden": 1 + }, + { + "module_name": "Maintenance", + "color": "#FF888B", + "icon": "octicon octicon-tools", + "type": "module", + "label": _("Maintenance") } ] diff --git a/erpnext/config/maintenance.py b/erpnext/config/maintenance.py new file mode 100644 index 00000000000..aa2f87ca595 --- /dev/null +++ b/erpnext/config/maintenance.py @@ -0,0 +1,32 @@ +from frappe import _ + +def get_data(): + return [ + { + "label": _("Maintenance"), + "icon": "icon-star", + "items": [ + { + "type": "doctype", + "name": "Maintenance Schedule", + "description": _("Plan for maintenance visits."), + }, + { + "type": "doctype", + "name": "Maintenance Visit", + "description": _("Visit report for maintenance call."), + }, + { + "type": "report", + "name": "Maintenance Schedules", + "is_query_report": True, + "doctype": "Maintenance Schedule" + }, + { + "type": "doctype", + "name": "Warranty Claim", + "description": _("Warranty Claim against Serial No."), + }, + ] + } + ] \ No newline at end of file diff --git a/erpnext/config/support.py b/erpnext/config/support.py index 98fa595b5b6..a4a4c229677 100644 --- a/erpnext/config/support.py +++ b/erpnext/config/support.py @@ -18,27 +18,6 @@ def get_data(): }, ] }, - { - "label": _("Maintenance"), - "items": [ - { - "type": "doctype", - "name": "Maintenance Schedule", - "description": _("Plan for maintenance visits."), - }, - { - "type": "doctype", - "name": "Maintenance Visit", - "description": _("Visit report for maintenance call."), - }, - { - "type": "report", - "name": "Maintenance Schedules", - "is_query_report": True, - "doctype": "Maintenance Schedule" - }, - ] - }, { "label": _("Warranty"), "items": [ diff --git a/erpnext/support/report/maintenance_schedules/__init__.py b/erpnext/maintenance/__init__.py similarity index 100% rename from erpnext/support/report/maintenance_schedules/__init__.py rename to erpnext/maintenance/__init__.py diff --git a/erpnext/maintenance/doctype/__init__.py b/erpnext/maintenance/doctype/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/support/doctype/maintenance_schedule/README.md b/erpnext/maintenance/doctype/maintenance_schedule/README.md similarity index 100% rename from erpnext/support/doctype/maintenance_schedule/README.md rename to erpnext/maintenance/doctype/maintenance_schedule/README.md diff --git a/erpnext/maintenance/doctype/maintenance_schedule/__init__.py b/erpnext/maintenance/doctype/maintenance_schedule/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js similarity index 91% rename from erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js rename to erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js index 7783b1b9f2f..cf0ee510b30 100644 --- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js @@ -1,7 +1,7 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -frappe.provide("erpnext.support"); +frappe.provide("erpnext.maintenance"); frappe.ui.form.on_change("Maintenance Schedule", "customer", function(frm) { erpnext.utils.get_party_details(frm) }); @@ -13,7 +13,7 @@ frappe.ui.form.on_change("Maintenance Schedule", "contact_person", function(){ }); // TODO commonify this code -erpnext.support.MaintenanceSchedule = frappe.ui.form.Controller.extend({ +erpnext.maintenance.MaintenanceSchedule = frappe.ui.form.Controller.extend({ refresh: function() { var me = this; @@ -34,7 +34,7 @@ erpnext.support.MaintenanceSchedule = frappe.ui.form.Controller.extend({ } else if (this.frm.doc.docstatus === 1) { this.frm.add_custom_button(__("Make Maintenance Visit"), function() { frappe.model.open_mapped_doc({ - method: "erpnext.support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit", + method: "erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit", source_name: me.frm.doc.name, frm: me.frm }) @@ -79,7 +79,7 @@ erpnext.support.MaintenanceSchedule = frappe.ui.form.Controller.extend({ }, }); -$.extend(cur_frm.cscript, new erpnext.support.MaintenanceSchedule({frm: cur_frm})); +$.extend(cur_frm.cscript, new erpnext.maintenance.MaintenanceSchedule({frm: cur_frm})); cur_frm.cscript.onload = function(doc, dt, dn) { if(!doc.status) set_multiple(dt,dn,{status:'Draft'}); diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json similarity index 99% rename from erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json rename to erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json index 63af61d88e8..77ded222579 100644 --- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json +++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json @@ -3,6 +3,7 @@ "allow_import": 0, "allow_rename": 0, "autoname": "MS.#####", + "beta": 0, "creation": "2013-01-10 16:34:30", "custom": 0, "docstatus": 0, @@ -608,15 +609,16 @@ "hide_toolbar": 0, "icon": "icon-calendar", "idx": 1, + "image_view": 0, "in_create": 0, "in_dialog": 0, "is_submittable": 1, "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-04-06 03:15:16.876595", + "modified": "2016-06-29 12:56:00.801674", "modified_by": "Administrator", - "module": "Support", + "module": "Maintenance", "name": "Maintenance Schedule", "owner": "Administrator", "permissions": [ @@ -641,6 +643,7 @@ "write": 1 } ], + "quick_entry": 0, "read_only": 0, "read_only_onload": 0, "search_fields": "status,customer,customer_name", diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py similarity index 100% rename from erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py rename to erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py diff --git a/erpnext/support/doctype/maintenance_schedule/test_maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.py similarity index 100% rename from erpnext/support/doctype/maintenance_schedule/test_maintenance_schedule.py rename to erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.py diff --git a/erpnext/support/doctype/maintenance_schedule_detail/README.md b/erpnext/maintenance/doctype/maintenance_schedule_detail/README.md similarity index 100% rename from erpnext/support/doctype/maintenance_schedule_detail/README.md rename to erpnext/maintenance/doctype/maintenance_schedule_detail/README.md diff --git a/erpnext/maintenance/doctype/maintenance_schedule_detail/__init__.py b/erpnext/maintenance/doctype/maintenance_schedule_detail/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json b/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json similarity index 86% rename from erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json rename to erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json index af252c1ab94..4ec39bebc78 100644 --- a/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json +++ b/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json @@ -3,10 +3,12 @@ "allow_import": 0, "allow_rename": 0, "autoname": "hash", + "beta": 0, "creation": "2013-02-22 01:28:05", "custom": 0, "docstatus": 0, "doctype": "DocType", + "document_type": "Document", "fields": [ { "allow_on_submit": 0, @@ -16,6 +18,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Item Code", @@ -26,6 +29,7 @@ "options": "Item", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -41,6 +45,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Item Name", @@ -50,6 +55,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -65,6 +71,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Scheduled Date", @@ -74,6 +81,7 @@ "oldfieldtype": "Date", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -89,6 +97,7 @@ "fieldtype": "Date", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Actual Date", @@ -98,6 +107,7 @@ "oldfieldtype": "Date", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 1, "reqd": 0, @@ -113,6 +123,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Sales Person", @@ -123,6 +134,7 @@ "options": "Sales Person", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -138,6 +150,7 @@ "fieldtype": "Small Text", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Serial No", @@ -147,6 +160,7 @@ "oldfieldtype": "Small Text", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "160px", "read_only": 1, "report_hide": 0, @@ -160,18 +174,21 @@ "hide_heading": 0, "hide_toolbar": 0, "idx": 1, + "image_view": 0, "in_create": 0, "in_dialog": 0, "is_submittable": 0, "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2015-11-16 06:29:49.853613", + "modified": "2016-06-29 12:56:24.695085", "modified_by": "Administrator", - "module": "Support", + "module": "Maintenance", "name": "Maintenance Schedule Detail", "owner": "Administrator", "permissions": [], + "quick_entry": 0, "read_only": 0, - "read_only_onload": 0 + "read_only_onload": 0, + "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py b/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py similarity index 50% rename from erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py rename to erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py index 16013b547f9..e69b4fb65e0 100644 --- a/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py +++ b/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.py @@ -1,10 +1,10 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt +# -*- coding: utf-8 -*- +# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt from __future__ import unicode_literals import frappe - from frappe.model.document import Document class MaintenanceScheduleDetail(Document): - pass \ No newline at end of file + pass diff --git a/erpnext/support/doctype/maintenance_schedule_item/README.md b/erpnext/maintenance/doctype/maintenance_schedule_item/README.md similarity index 100% rename from erpnext/support/doctype/maintenance_schedule_item/README.md rename to erpnext/maintenance/doctype/maintenance_schedule_item/README.md diff --git a/erpnext/maintenance/doctype/maintenance_schedule_item/__init__.py b/erpnext/maintenance/doctype/maintenance_schedule_item/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.json b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json similarity index 93% rename from erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.json rename to erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json index 6879f0675b6..e62e0418e2f 100644 --- a/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.json +++ b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json @@ -3,10 +3,12 @@ "allow_import": 0, "allow_rename": 0, "autoname": "hash", + "beta": 0, "creation": "2013-02-22 01:28:05", "custom": 0, "docstatus": 0, "doctype": "DocType", + "document_type": "Document", "fields": [ { "allow_on_submit": 0, @@ -16,6 +18,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Item Code", @@ -42,6 +45,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Item Name", @@ -67,6 +71,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Description", @@ -94,6 +99,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -117,6 +123,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Start Date", @@ -142,6 +149,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "End Date", @@ -167,6 +175,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Periodicity", @@ -193,6 +202,7 @@ "fieldtype": "Int", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "No of Visits", @@ -218,6 +228,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Sales Person", @@ -244,6 +255,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Reference", @@ -267,6 +279,7 @@ "fieldtype": "Small Text", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Serial No", @@ -292,6 +305,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Sales Order", @@ -316,18 +330,21 @@ "hide_heading": 0, "hide_toolbar": 0, "idx": 1, + "image_view": 0, "in_create": 0, "in_dialog": 0, "is_submittable": 0, "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2016-02-23 04:59:32.924534", + "modified": "2016-06-29 12:56:08.478478", "modified_by": "Administrator", - "module": "Support", + "module": "Maintenance", "name": "Maintenance Schedule Item", "owner": "Administrator", "permissions": [], + "quick_entry": 0, "read_only": 0, - "read_only_onload": 0 + "read_only_onload": 0, + "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.py b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.py similarity index 50% rename from erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.py rename to erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.py index 22feec386fa..1dd47fea24f 100644 --- a/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.py +++ b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.py @@ -1,10 +1,10 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt +# -*- coding: utf-8 -*- +# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt from __future__ import unicode_literals import frappe - from frappe.model.document import Document class MaintenanceScheduleItem(Document): - pass \ No newline at end of file + pass diff --git a/erpnext/support/doctype/maintenance_visit/README.md b/erpnext/maintenance/doctype/maintenance_visit/README.md similarity index 100% rename from erpnext/support/doctype/maintenance_visit/README.md rename to erpnext/maintenance/doctype/maintenance_visit/README.md diff --git a/erpnext/maintenance/doctype/maintenance_visit/__init__.py b/erpnext/maintenance/doctype/maintenance_visit/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit.js b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js similarity index 89% rename from erpnext/support/doctype/maintenance_visit/maintenance_visit.js rename to erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js index f9d5e8dae50..561588651d5 100644 --- a/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js @@ -1,7 +1,7 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -frappe.provide("erpnext.support"); +frappe.provide("erpnext.maintenance"); frappe.ui.form.on_change("Maintenance Visit", "customer", function(frm) { @@ -14,13 +14,13 @@ frappe.ui.form.on_change("Maintenance Visit", "contact_person", function(frm){ }); // TODO commonify this code -erpnext.support.MaintenanceVisit = frappe.ui.form.Controller.extend({ +erpnext.maintenance.MaintenanceVisit = frappe.ui.form.Controller.extend({ refresh: function() { if (this.frm.doc.docstatus===0) { cur_frm.add_custom_button(__('Maintenance Schedule'), function() { frappe.model.map_current_doc({ - method: "erpnext.support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit", + method: "erpnext.maintenance.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit", source_doctype: "Maintenance Schedule", get_query_filters: { docstatus: 1, @@ -58,7 +58,7 @@ erpnext.support.MaintenanceVisit = frappe.ui.form.Controller.extend({ }, }); -$.extend(cur_frm.cscript, new erpnext.support.MaintenanceVisit({frm: cur_frm})); +$.extend(cur_frm.cscript, new erpnext.maintenance.MaintenanceVisit({frm: cur_frm})); cur_frm.cscript.onload = function(doc, dt, dn) { if(!doc.status) set_multiple(dt,dn,{status:'Draft'}); diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit.json b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json similarity index 99% rename from erpnext/support/doctype/maintenance_visit/maintenance_visit.json rename to erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json index 973e057d98b..07ff4502ced 100644 --- a/erpnext/support/doctype/maintenance_visit/maintenance_visit.json +++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json @@ -3,6 +3,7 @@ "allow_import": 0, "allow_rename": 0, "autoname": "MV.#####", + "beta": 0, "creation": "2013-01-10 16:34:31", "custom": 0, "docstatus": 0, @@ -753,15 +754,16 @@ "hide_toolbar": 0, "icon": "icon-file-text", "idx": 1, + "image_view": 0, "in_create": 0, "in_dialog": 0, "is_submittable": 1, "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-04-06 03:15:20.528791", + "modified": "2016-06-29 12:55:51.677519", "modified_by": "Administrator", - "module": "Support", + "module": "Maintenance", "name": "Maintenance Visit", "owner": "ashwini@webnotestech.com", "permissions": [ @@ -786,6 +788,7 @@ "write": 1 } ], + "quick_entry": 0, "read_only": 0, "read_only_onload": 0, "search_fields": "status,maintenance_type,customer,customer_name,mntc_date,company", diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit.py b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py similarity index 100% rename from erpnext/support/doctype/maintenance_visit/maintenance_visit.py rename to erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit_list.js b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit_list.js similarity index 100% rename from erpnext/support/doctype/maintenance_visit/maintenance_visit_list.js rename to erpnext/maintenance/doctype/maintenance_visit/maintenance_visit_list.js diff --git a/erpnext/support/doctype/maintenance_visit/test_maintenance_visit.py b/erpnext/maintenance/doctype/maintenance_visit/test_maintenance_visit.py similarity index 100% rename from erpnext/support/doctype/maintenance_visit/test_maintenance_visit.py rename to erpnext/maintenance/doctype/maintenance_visit/test_maintenance_visit.py diff --git a/erpnext/support/doctype/maintenance_visit/test_records.json b/erpnext/maintenance/doctype/maintenance_visit/test_records.json similarity index 100% rename from erpnext/support/doctype/maintenance_visit/test_records.json rename to erpnext/maintenance/doctype/maintenance_visit/test_records.json diff --git a/erpnext/support/doctype/maintenance_visit_purpose/README.md b/erpnext/maintenance/doctype/maintenance_visit_purpose/README.md similarity index 100% rename from erpnext/support/doctype/maintenance_visit_purpose/README.md rename to erpnext/maintenance/doctype/maintenance_visit_purpose/README.md diff --git a/erpnext/maintenance/doctype/maintenance_visit_purpose/__init__.py b/erpnext/maintenance/doctype/maintenance_visit_purpose/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json b/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json similarity index 88% rename from erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json rename to erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json index c89453a3924..652a4b08411 100644 --- a/erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json +++ b/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json @@ -3,10 +3,12 @@ "allow_import": 0, "allow_rename": 0, "autoname": "hash", + "beta": 0, "creation": "2013-02-22 01:28:06", "custom": 0, "docstatus": 0, "doctype": "DocType", + "document_type": "Document", "fields": [ { "allow_on_submit": 0, @@ -16,6 +18,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Item Code", @@ -26,6 +29,7 @@ "options": "Item", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -41,6 +45,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Item Name", @@ -50,6 +55,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 1, "report_hide": 0, "reqd": 0, @@ -65,6 +71,7 @@ "fieldtype": "Small Text", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Serial No", @@ -74,6 +81,7 @@ "oldfieldtype": "Small Text", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -89,6 +97,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Description", @@ -98,6 +107,7 @@ "oldfieldtype": "Small Text", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "print_width": "300px", "read_only": 0, "report_hide": 0, @@ -115,6 +125,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -122,6 +133,7 @@ "no_copy": 0, "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 0, @@ -137,6 +149,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Sales Person", @@ -147,6 +160,7 @@ "options": "Sales Person", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -162,6 +176,7 @@ "fieldtype": "Small Text", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Work Done", @@ -171,6 +186,7 @@ "oldfieldtype": "Small Text", "permlevel": 0, "print_hide": 0, + "print_hide_if_no_value": 0, "read_only": 0, "report_hide": 0, "reqd": 1, @@ -186,6 +202,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Document Type", @@ -196,6 +213,7 @@ "options": "DocType", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "print_width": "150px", "read_only": 1, "report_hide": 1, @@ -213,6 +231,7 @@ "fieldtype": "Dynamic Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Against Document No", @@ -223,6 +242,7 @@ "options": "prevdoc_doctype", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "print_width": "160px", "read_only": 1, "report_hide": 1, @@ -240,6 +260,7 @@ "fieldtype": "Data", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Against Document Detail No", @@ -249,6 +270,7 @@ "oldfieldtype": "Data", "permlevel": 0, "print_hide": 1, + "print_hide_if_no_value": 0, "print_width": "160px", "read_only": 1, "report_hide": 1, @@ -262,18 +284,21 @@ "hide_heading": 0, "hide_toolbar": 0, "idx": 1, + "image_view": 0, "in_create": 0, "in_dialog": 0, "is_submittable": 0, "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2015-11-16 06:29:50.082976", + "modified": "2016-06-29 12:56:16.109366", "modified_by": "Administrator", - "module": "Support", + "module": "Maintenance", "name": "Maintenance Visit Purpose", "owner": "ashwini@webnotestech.com", "permissions": [], + "quick_entry": 0, "read_only": 0, - "read_only_onload": 0 + "read_only_onload": 0, + "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py b/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py similarity index 50% rename from erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py rename to erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py index cb0c519923c..a7f0f5b3bb9 100644 --- a/erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py +++ b/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py @@ -1,10 +1,10 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt +# -*- coding: utf-8 -*- +# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt from __future__ import unicode_literals import frappe - from frappe.model.document import Document class MaintenanceVisitPurpose(Document): - pass \ No newline at end of file + pass diff --git a/erpnext/maintenance/report/maintenance_schedules/__init__.py b/erpnext/maintenance/report/maintenance_schedules/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/support/report/maintenance_schedules/maintenance_schedules.json b/erpnext/maintenance/report/maintenance_schedules/maintenance_schedules.json similarity index 58% rename from erpnext/support/report/maintenance_schedules/maintenance_schedules.json rename to erpnext/maintenance/report/maintenance_schedules/maintenance_schedules.json index 2be74461264..6076f6e3a13 100644 --- a/erpnext/support/report/maintenance_schedules/maintenance_schedules.json +++ b/erpnext/maintenance/report/maintenance_schedules/maintenance_schedules.json @@ -5,12 +5,12 @@ "doctype": "Report", "idx": 1, "is_standard": "Yes", - "modified": "2014-06-03 07:18:17.144598", + "modified": "2014-06-29 08:18:17.144598", "modified_by": "Administrator", "module": "Support", "name": "Maintenance Schedules", "owner": "Administrator", - "query": "SELECT\n ms_sch.scheduled_date as \"Schedule Date:Date:120\",\n\tms_sch.item_code as \"Item Code:Link/Item:120\",\n\tms_sch.item_name as \"Item Name::120\",\n\tms_sch.serial_no as \"Serial No::120\",\n\tms_sch.sales_person as \"Sales Person::120\",\n\tms.customer_name as \"Customer:Link/Customer:120\",\n\tms.address_display as \"Customer Address::120\",\n\tms_item.prevdoc_docname as \"Sales Order:Link/Sales Order:120\",\n\tms.company as \"Company:Link/Company:120\"\n\t\nFROM\n\t`tabMaintenance Schedule` ms, \n `tabMaintenance Schedule Detail` ms_sch, \n `tabMaintenance Schedule Item` ms_item\nWHERE\n\tms.name = ms_sch.parent and ms.name = ms_item.parent and ms.docstatus = 1\nORDER BY\n\tms_sch.scheduled_date asc, ms_sch.item_code asc", + "query": "SELECT\n ms_sch.scheduled_date as \"Schedule Date:Date:120\",\n\tms_sch.item_code as \"Item Code:Link/Item:120\",\n\tms_sch.item_name as \"Item Name::120\",\n\tms_sch.serial_no as \"Serial No::120\",\n\tms_sch.sales_person as \"Sales Person::120\",\n\tms.customer_name as \"Customer:Link/Customer:120\",\n\tms.address_display as \"Customer Address::120\",\n\tms_item.sales_order as \"Sales Order:Link/Sales Order:120\",\n\tms.company as \"Company:Link/Company:120\"\n\t\nFROM\n\t`tabMaintenance Schedule` ms, \n `tabMaintenance Schedule Detail` ms_sch, \n `tabMaintenance Schedule Item` ms_item\nWHERE\n\tms.name = ms_sch.parent and ms.name = ms_item.parent and ms.docstatus = 1\nORDER BY\n\tms_sch.scheduled_date asc, ms_sch.item_code asc", "ref_doctype": "Maintenance Schedule", "report_name": "Maintenance Schedules", "report_type": "Query Report" diff --git a/erpnext/modules.txt b/erpnext/modules.txt index 8a495478f9c..11a1ebe5c6f 100644 --- a/erpnext/modules.txt +++ b/erpnext/modules.txt @@ -11,4 +11,5 @@ Support Utilities Shopping Cart Hub Node -Portal \ No newline at end of file +Portal +Maintenance \ No newline at end of file diff --git a/erpnext/patches.txt b/erpnext/patches.txt index bcbe2dabf96..db4076e2e26 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -282,3 +282,4 @@ erpnext.patches.v7_0.convert_timelog_to_timesheet erpnext.patches.v7_0.move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet erpnext.patches.v7_0.remove_doctypes_and_reports erpnext.patches.v7_0.set_is_group_for_warehouse +erpnext.patches.v7_0.update_maintenance_module_in_doctype diff --git a/erpnext/patches/v7_0/update_maintenance_module_in_doctype.py b/erpnext/patches/v7_0/update_maintenance_module_in_doctype.py new file mode 100644 index 00000000000..4c0c6a9313e --- /dev/null +++ b/erpnext/patches/v7_0/update_maintenance_module_in_doctype.py @@ -0,0 +1,11 @@ +# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors + +from __future__ import unicode_literals +import frappe + +def execute(): + frappe.db.set_value("DocType", "Maintenance Schedule", "module", "Maintenance") + frappe.db.set_value("DocType", "Maintenance Schedule Detail", "module", "Maintenance") + frappe.db.set_value("DocType", "Maintenance Schedule Item", "module", "Maintenance") + frappe.db.set_value("DocType", "Maintenance Visit", "module", "Maintenance") + frappe.db.set_value("DocType", "Maintenance Visit Purpose", "module", "Maintenance") \ No newline at end of file diff --git a/erpnext/support/doctype/maintenance_schedule/__init__.py b/erpnext/support/doctype/maintenance_schedule/__init__.py deleted file mode 100644 index baffc488252..00000000000 --- a/erpnext/support/doctype/maintenance_schedule/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/erpnext/support/doctype/maintenance_schedule_detail/__init__.py b/erpnext/support/doctype/maintenance_schedule_detail/__init__.py deleted file mode 100644 index baffc488252..00000000000 --- a/erpnext/support/doctype/maintenance_schedule_detail/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/erpnext/support/doctype/maintenance_schedule_item/__init__.py b/erpnext/support/doctype/maintenance_schedule_item/__init__.py deleted file mode 100644 index baffc488252..00000000000 --- a/erpnext/support/doctype/maintenance_schedule_item/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/erpnext/support/doctype/maintenance_visit/__init__.py b/erpnext/support/doctype/maintenance_visit/__init__.py deleted file mode 100644 index baffc488252..00000000000 --- a/erpnext/support/doctype/maintenance_visit/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/erpnext/support/doctype/maintenance_visit_purpose/__init__.py b/erpnext/support/doctype/maintenance_visit_purpose/__init__.py deleted file mode 100644 index baffc488252..00000000000 --- a/erpnext/support/doctype/maintenance_visit_purpose/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import unicode_literals