From ce27cffaad85bfb792187f4f4ce2e9a1c73b0b89 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Wed, 30 Jan 2019 11:00:36 +0530 Subject: [PATCH] refactor(desk_icon): Remove reference and patches to Desktop Icon --- .../doctype/pos_settings/pos_settings.py | 7 +- erpnext/patches.txt | 8 -- .../v11_0/change_healthcare_desktop_icons.py | 94 ------------------- .../v11_0/merge_land_unit_with_location.py | 5 +- .../patches/v11_0/refactor_erpnext_shopify.py | 1 - .../patches/v11_0/remove_land_unit_icon.py | 19 ---- .../rename_production_order_to_work_order.py | 7 -- erpnext/patches/v12_0/change_qms_icon.py | 10 -- ...ame_accounts_desktop_icon_to_accounting.py | 10 -- erpnext/patches/v12_0/rename_learn_to_help.py | 12 --- .../rename_quality_management_to_quality.py | 10 -- ..._icon_with_projects_module_desktop_icon.py | 23 ----- .../v7_0/migrate_schools_to_erpnext.py | 10 +- .../patches/v8_1/delete_deprecated_reports.py | 21 ----- 14 files changed, 6 insertions(+), 231 deletions(-) delete mode 100644 erpnext/patches/v11_0/change_healthcare_desktop_icons.py delete mode 100644 erpnext/patches/v11_0/remove_land_unit_icon.py delete mode 100644 erpnext/patches/v12_0/change_qms_icon.py delete mode 100644 erpnext/patches/v12_0/rename_accounts_desktop_icon_to_accounting.py delete mode 100644 erpnext/patches/v12_0/rename_learn_to_help.py delete mode 100644 erpnext/patches/v12_0/rename_quality_management_to_quality.py delete mode 100644 erpnext/patches/v12_0/replace_project_list_desktop_icon_with_projects_module_desktop_icon.py diff --git a/erpnext/accounts/doctype/pos_settings/pos_settings.py b/erpnext/accounts/doctype/pos_settings/pos_settings.py index bdfd969df7..913f49829c 100644 --- a/erpnext/accounts/doctype/pos_settings/pos_settings.py +++ b/erpnext/accounts/doctype/pos_settings/pos_settings.py @@ -8,9 +8,4 @@ from frappe.model.document import Document class POSSettings(Document): def validate(self): - self.set_link_for_pos() - - def set_link_for_pos(self): - link = 'pos' if self.use_pos_in_offline_mode else 'point-of-sale' - frappe.db.sql(""" update `tabDesktop Icon` set link = '{0}' - where module_name like '%pos%'""".format(link)) \ No newline at end of file + pass \ No newline at end of file diff --git a/erpnext/patches.txt b/erpnext/patches.txt index c04049e252..8ab6153cd9 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -362,7 +362,6 @@ erpnext.patches.v7_1.set_budget_against_as_cost_center erpnext.patches.v7_1.set_currency_exchange_date erpnext.patches.v7_1.set_sales_person_status erpnext.patches.v7_1.repost_stock_for_deleted_bins_for_merging_items -execute:frappe.delete_doc('Desktop Icon', {'module_name': 'Profit and Loss Statment'}) erpnext.patches.v7_2.update_website_for_variant erpnext.patches.v7_2.update_assessment_modules erpnext.patches.v7_2.update_doctype_status @@ -545,7 +544,6 @@ erpnext.patches.v11_0.set_update_field_and_value_in_workflow_state erpnext.patches.v11_0.update_total_qty_field erpnext.patches.v11_0.update_sales_partner_type erpnext.patches.v11_0.rename_asset_adjustment_doctype -execute:frappe.db.sql("update `tabDesktop Icon` set type = 'module' where module_name = 'Restaurant'") erpnext.patches.v11_0.set_salary_component_properties erpnext.patches.v11_0.set_user_permissions_for_department erpnext.patches.v11_0.hr_ux_cleanups @@ -564,7 +562,6 @@ erpnext.patches.v11_0.make_job_card erpnext.patches.v11_0.redesign_healthcare_billing_work_flow erpnext.patches.v10_0.delete_hub_documents # 12-08-2018 erpnext.patches.v11_0.rename_healthcare_fields -erpnext.patches.v11_0.remove_land_unit_icon erpnext.patches.v11_0.add_default_dispatch_notification_template erpnext.patches.v11_0.add_market_segments erpnext.patches.v11_0.add_sales_stages @@ -574,7 +571,6 @@ execute:frappe.delete_doc_if_exists("Page", "stock-analytics") execute:frappe.delete_doc_if_exists("Page", "production-analytics") erpnext.patches.v11_0.ewaybill_fields_gst_india #2018-11-13 #2019-01-09 erpnext.patches.v11_0.drop_column_max_days_allowed -erpnext.patches.v11_0.change_healthcare_desktop_icons erpnext.patches.v10_0.update_user_image_in_employee erpnext.patches.v10_0.repost_gle_for_purchase_receipts_with_rejected_items erpnext.patches.v10_0.allow_operators_in_supplier_scorecard @@ -585,8 +581,4 @@ erpnext.patches.v11_0.rename_additional_salary_component_additional_salary erpnext.patches.v11_0.renamed_from_to_fields_in_project erpnext.patches.v11_0.add_permissions_in_gst_settings erpnext.patches.v11_1.setup_guardian_role -erpnext.patches.v12_0.change_qms_icon -erpnext.patches.v12_0.rename_learn_to_help -erpnext.patches.v12_0.rename_accounts_desktop_icon_to_accounting -erpnext.patches.v12_0.replace_project_list_desktop_icon_with_projects_module_desktop_icon # 09-01-2019 erpnext.patches.v12_0.move_item_tax_to_item_tax_template diff --git a/erpnext/patches/v11_0/change_healthcare_desktop_icons.py b/erpnext/patches/v11_0/change_healthcare_desktop_icons.py deleted file mode 100644 index 0b77395865..0000000000 --- a/erpnext/patches/v11_0/change_healthcare_desktop_icons.py +++ /dev/null @@ -1,94 +0,0 @@ -from __future__ import unicode_literals -import frappe -from frappe import _ - -change_icons_map = [ - { - "module_name": "Patient", - "color": "#6BE273", - "icon": "fa fa-user", - "doctype": "Patient", - "type": "link", - "link": "List/Patient", - "label": _("Patient") - }, - { - "module_name": "Patient Encounter", - "color": "#2ecc71", - "icon": "fa fa-stethoscope", - "doctype": "Patient Encounter", - "type": "link", - "link": "List/Patient Encounter", - "label": _("Patient Encounter"), - }, - { - "module_name": "Healthcare Practitioner", - "color": "#2ecc71", - "icon": "fa fa-user-md", - "doctype": "Healthcare Practitioner", - "type": "link", - "link": "List/Healthcare Practitioner", - "label": _("Healthcare Practitioner") - }, - { - "module_name": "Patient Appointment", - "color": "#934F92", - "icon": "fa fa-calendar-plus-o", - "doctype": "Patient Appointment", - "type": "link", - "link": "List/Patient Appointment", - "label": _("Patient Appointment") - }, - { - "module_name": "Lab Test", - "color": "#7578f6", - "icon": "octicon octicon-beaker", - "doctype": "Lab Test", - "type": "link", - "link": "List/Lab Test", - "label": _("Lab Test") - } -] - -def execute(): - change_healthcare_desktop_icons() - -def change_healthcare_desktop_icons(): - doctypes = ["patient", "patient_encounter", "healthcare_practitioner", - "patient_appointment", "lab_test"] - for doctype in doctypes: - frappe.reload_doc("healthcare", "doctype", doctype) - for spec in change_icons_map: - frappe.db.sql(""" - delete from `tabDesktop Icon` - where _doctype = '{0}' - """.format(spec['doctype'])) - - desktop_icon = frappe.new_doc("Desktop Icon") - desktop_icon.hidden = 1 - desktop_icon.standard = 1 - desktop_icon.icon = spec['icon'] - desktop_icon.color = spec['color'] - desktop_icon.module_name = spec['module_name'] - desktop_icon.label = spec['label'] - desktop_icon.app = "erpnext" - desktop_icon.type = spec['type'] - desktop_icon._doctype = spec['doctype'] - desktop_icon.link = spec['link'] - desktop_icon.save(ignore_permissions=True) - - frappe.db.sql(""" - delete from `tabDesktop Icon` - where module_name = 'Healthcare' and type = 'module' - """) - - desktop_icon = frappe.new_doc("Desktop Icon") - desktop_icon.hidden = 1 - desktop_icon.standard = 1 - desktop_icon.icon = "fa fa-heartbeat" - desktop_icon.color = "#FF888B" - desktop_icon.module_name = "Healthcare" - desktop_icon.label = _("Healthcare") - desktop_icon.app = "erpnext" - desktop_icon.type = 'module' - desktop_icon.save(ignore_permissions=True) diff --git a/erpnext/patches/v11_0/merge_land_unit_with_location.py b/erpnext/patches/v11_0/merge_land_unit_with_location.py index 4ded98b5ca..1ea486dfd5 100644 --- a/erpnext/patches/v11_0/merge_land_unit_with_location.py +++ b/erpnext/patches/v11_0/merge_land_unit_with_location.py @@ -29,7 +29,7 @@ def execute(): if 'land_unit' in frappe.db.get_table_columns('Linked Location'): rename_field('Linked Location', 'land_unit', 'location') - + if not frappe.db.exists("Location", "All Land Units"): frappe.get_doc({"doctype": "Location", "is_group": True, "location_name": "All Land Units"}).insert(ignore_permissions=True) @@ -52,9 +52,6 @@ def execute(): 'rgt': land_unit.get('rgt') }).insert(ignore_permissions=True) - # frappe.db.sql("""update `tabDesktop Icon` set label='Location', module_name='Location' where label='Land Unit'""") - frappe.db.sql("""update `tabDesktop Icon` set link='List/Location' where link='List/Land Unit'""") - # Delete the Land Unit and Linked Land Unit doctypes if frappe.db.table_exists('Land Unit'): frappe.delete_doc('DocType', 'Land Unit', force=1) diff --git a/erpnext/patches/v11_0/refactor_erpnext_shopify.py b/erpnext/patches/v11_0/refactor_erpnext_shopify.py index a91fda72fb..340e9fc8bf 100644 --- a/erpnext/patches/v11_0/refactor_erpnext_shopify.py +++ b/erpnext/patches/v11_0/refactor_erpnext_shopify.py @@ -11,7 +11,6 @@ def execute(): if 'erpnext_shopify' in frappe.get_installed_apps(): remove_from_installed_apps('erpnext_shopify') - frappe.db.sql('delete from `tabDesktop Icon` where app="erpnext_shopify" ') frappe.delete_doc("Module Def", 'erpnext_shopify') frappe.db.commit() diff --git a/erpnext/patches/v11_0/remove_land_unit_icon.py b/erpnext/patches/v11_0/remove_land_unit_icon.py deleted file mode 100644 index f28c16f0c7..0000000000 --- a/erpnext/patches/v11_0/remove_land_unit_icon.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2018, Frappe and Contributors -# License: GNU General Public License v3. See license.txt - -from __future__ import unicode_literals - -# imports - module imports -import frappe - - -def execute(): - """ - Delete the "Land Unit" doc if exists from "Desktop Icon" doctype - """ - try: - doc = frappe.get_doc('Desktop Icon', {'standard': 1, 'module_name': 'Land Unit'}) - frappe.delete_doc('Desktop Icon', doc.name) - except frappe.ValidationError: - # The 'Land Unit' doc doesn't exist, nothing to do - pass diff --git a/erpnext/patches/v11_0/rename_production_order_to_work_order.py b/erpnext/patches/v11_0/rename_production_order_to_work_order.py index 72bdb68daf..2c27fbbc9d 100644 --- a/erpnext/patches/v11_0/rename_production_order_to_work_order.py +++ b/erpnext/patches/v11_0/rename_production_order_to_work_order.py @@ -26,10 +26,3 @@ def execute(): frappe.rename_doc("Report", "Open Production Orders", "Open Work Orders", force=True) frappe.rename_doc("Report", "Issued Items Against Production Order", "Issued Items Against Work Order", force=True) frappe.rename_doc("Report", "Production Order Stock Report", "Work Order Stock Report", force=True) - - frappe.db.sql("""update `tabDesktop Icon` \ - set label='Work Order', module_name='Work Order' \ - where label='Production Order'""") - frappe.db.sql("""update `tabDesktop Icon` \ - set link='List/Work Order' \ - where link='List/Production Order'""") diff --git a/erpnext/patches/v12_0/change_qms_icon.py b/erpnext/patches/v12_0/change_qms_icon.py deleted file mode 100644 index 2b6c09a0d0..0000000000 --- a/erpnext/patches/v12_0/change_qms_icon.py +++ /dev/null @@ -1,10 +0,0 @@ -import frappe - -def execute(): - qms_icons = frappe.get_all("Desktop Icon", filters={ - "module_name": "Quality Management" - }) - - for icon in qms_icons: - frappe.db.set_value('Desktop Icon', icon.name, 'color', '#1abc9c') - frappe.db.set_value('Desktop Icon', icon.name, 'icon', 'fa fa-check-square-o') diff --git a/erpnext/patches/v12_0/rename_accounts_desktop_icon_to_accounting.py b/erpnext/patches/v12_0/rename_accounts_desktop_icon_to_accounting.py deleted file mode 100644 index e24ed1ce83..0000000000 --- a/erpnext/patches/v12_0/rename_accounts_desktop_icon_to_accounting.py +++ /dev/null @@ -1,10 +0,0 @@ -import frappe -from frappe import _ - -def execute(): - accounts_module_icons = frappe.get_all('Desktop Icon', filters={ - 'module_name': 'Accounts' - }, fields=['name']) - - for icon in accounts_module_icons: - frappe.db.set_value('Desktop Icon', icon.name, 'label', _('Accounting')) \ No newline at end of file diff --git a/erpnext/patches/v12_0/rename_learn_to_help.py b/erpnext/patches/v12_0/rename_learn_to_help.py deleted file mode 100644 index 72f75f8b25..0000000000 --- a/erpnext/patches/v12_0/rename_learn_to_help.py +++ /dev/null @@ -1,12 +0,0 @@ -import frappe -from frappe import _ - -def execute(): - frappe.db.sql(""" - UPDATE `tabDesktop Icon` - SET - `module_name`='Help', `label`=%s - WHERE - `module_name`='Learn' AND - `standard`=1 - """, _('Help')) \ No newline at end of file diff --git a/erpnext/patches/v12_0/rename_quality_management_to_quality.py b/erpnext/patches/v12_0/rename_quality_management_to_quality.py deleted file mode 100644 index cdcf191b96..0000000000 --- a/erpnext/patches/v12_0/rename_quality_management_to_quality.py +++ /dev/null @@ -1,10 +0,0 @@ -import frappe -from frappe import _ - -def execute(): - quality_management_module_icons = frappe.get_all('Desktop Icon', filters={ - 'module_name': 'Quality Management' - }, fields=['name']) - - for icon in quality_management_module_icons: - frappe.db.set_value('Desktop Icon', icon.name, 'label', _('Quality')) \ No newline at end of file diff --git a/erpnext/patches/v12_0/replace_project_list_desktop_icon_with_projects_module_desktop_icon.py b/erpnext/patches/v12_0/replace_project_list_desktop_icon_with_projects_module_desktop_icon.py deleted file mode 100644 index dc848f4788..0000000000 --- a/erpnext/patches/v12_0/replace_project_list_desktop_icon_with_projects_module_desktop_icon.py +++ /dev/null @@ -1,23 +0,0 @@ -import frappe - -def execute(): - projects_icons = frappe.get_all('Desktop Icon', filters={ - 'module_name': ['in', ('Project', 'Projects')], - }) - - fields_to_update = { - 'module_name': 'Projects', - 'color': '#8e44ad', - 'icon': 'octicon octicon-rocket', - 'type': 'module', - 'link': '' - } - - for icon in projects_icons: - icon_doc = frappe.get_doc('Desktop Icon', icon.name) - icon_doc.update(fields_to_update) - try: - icon_doc.save() - except frappe.exceptions.UniqueValidationError: - # delete duplicate icon - icon_doc.delete() diff --git a/erpnext/patches/v7_0/migrate_schools_to_erpnext.py b/erpnext/patches/v7_0/migrate_schools_to_erpnext.py index 9137b5aa92..b72bc137b6 100644 --- a/erpnext/patches/v7_0/migrate_schools_to_erpnext.py +++ b/erpnext/patches/v7_0/migrate_schools_to_erpnext.py @@ -10,21 +10,19 @@ def execute(): frappe.reload_doc('buying', 'doctype', 'request_for_quotation') if 'schools' in frappe.get_installed_apps(): - frappe.db.sql("""delete from `tabDesktop Icon`""") - if not frappe.db.exists('Module Def', 'Schools') and frappe.db.exists('Module Def', 'Academics'): - + # 'Schools' module changed to the 'Education' # frappe.rename_doc("Module Def", "Academics", "Schools") - + frappe.rename_doc("Module Def", "Academics", "Education") - + remove_from_installed_apps("schools") def reload_doctypes_for_schools_icons(): # 'Schools' module changed to the 'Education' # base_path = frappe.get_app_path('erpnext', 'schools', 'doctype') - + base_path = frappe.get_app_path('erpnext', 'education', 'doctype') for doctype in os.listdir(base_path): if os.path.exists(os.path.join(base_path, doctype, doctype + '.json')) \ diff --git a/erpnext/patches/v8_1/delete_deprecated_reports.py b/erpnext/patches/v8_1/delete_deprecated_reports.py index 99d77c103c..3e0fdee719 100644 --- a/erpnext/patches/v8_1/delete_deprecated_reports.py +++ b/erpnext/patches/v8_1/delete_deprecated_reports.py @@ -14,32 +14,11 @@ def execute(): for report in reports: if frappe.db.exists("Report", report): - check_and_update_desktop_icon_for_report(report) check_and_update_auto_email_report(report) frappe.db.commit() frappe.delete_doc("Report", report, ignore_permissions=True) -def check_and_update_desktop_icon_for_report(report): - """ delete or update desktop icon""" - desktop_icons = frappe.db.sql_list("""select name from `tabDesktop Icon` - where _report='{0}'""".format(report)) - - if not desktop_icons: - return - - if report == "Monthly Salary Register": - for icon in desktop_icons: - frappe.delete_doc("Desktop Icon", icon) - - elif report in ["Customer Addresses And Contacts", "Supplier Addresses And Contacts"]: - frappe.db.sql("""update `tabDesktop Icon` set _report='{value}' - where name in ({docnames})""".format( - value="Addresses And Contacts", - docnames=",".join(["'%s'"%icon for icon in desktop_icons]) - ) - ) - def check_and_update_auto_email_report(report): """ delete or update auto email report for deprecated report """