From 759bb0eb628cb5414ed30d90d317841835fba9bf Mon Sep 17 00:00:00 2001 From: Anurag Mishra Date: Mon, 22 Apr 2019 14:40:01 +0530 Subject: [PATCH 1/3] fix: (Patch) Removed page Bom-Browser --- erpnext/patches.txt | 6 +++++- erpnext/patches/v11_1/delete_bom_browser.py | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 erpnext/patches/v11_1/delete_bom_browser.py diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 2df10899800..faff5c4ffec 100755 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -591,4 +591,8 @@ erpnext.patches.v11_0.make_italian_localization_fields # 26-03-2019 erpnext.patches.v11_1.make_job_card_time_logs erpnext.patches.v11_1.set_variant_based_on erpnext.patches.v11_1.woocommerce_set_creation_user -erpnext.patches.v11_1.set_salary_details_submitable \ No newline at end of file +<<<<<<< HEAD +erpnext.patches.v11_1.set_salary_details_submitable +======= +erpnext.patches.v11_1.delete_bom_browser +>>>>>>> fix: (Patch) Removed page Bom-Browser diff --git a/erpnext/patches/v11_1/delete_bom_browser.py b/erpnext/patches/v11_1/delete_bom_browser.py new file mode 100644 index 00000000000..5b8251ca2fc --- /dev/null +++ b/erpnext/patches/v11_1/delete_bom_browser.py @@ -0,0 +1,8 @@ +# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +# License: GNU General Public License v3. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + frappe.db.sql(""" Delete from `tabPage` where name='bom-browser' """) \ No newline at end of file From 4f16d17d2181289c64885e636653cd3bc23ad187 Mon Sep 17 00:00:00 2001 From: Anurag Mishra Date: Mon, 22 Apr 2019 14:48:15 +0530 Subject: [PATCH 2/3] fix: resolve conflicts --- erpnext/patches.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index faff5c4ffec..c6672e9af3b 100755 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -591,8 +591,5 @@ erpnext.patches.v11_0.make_italian_localization_fields # 26-03-2019 erpnext.patches.v11_1.make_job_card_time_logs erpnext.patches.v11_1.set_variant_based_on erpnext.patches.v11_1.woocommerce_set_creation_user -<<<<<<< HEAD erpnext.patches.v11_1.set_salary_details_submitable -======= erpnext.patches.v11_1.delete_bom_browser ->>>>>>> fix: (Patch) Removed page Bom-Browser From 7bdd27f7e2956335c6096da411221d0c30187d30 Mon Sep 17 00:00:00 2001 From: Anurag Mishra Date: Mon, 22 Apr 2019 14:54:31 +0530 Subject: [PATCH 3/3] chore: used frappe.delete_doc_if_exists --- erpnext/patches/v11_1/delete_bom_browser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/patches/v11_1/delete_bom_browser.py b/erpnext/patches/v11_1/delete_bom_browser.py index 5b8251ca2fc..457f5116670 100644 --- a/erpnext/patches/v11_1/delete_bom_browser.py +++ b/erpnext/patches/v11_1/delete_bom_browser.py @@ -5,4 +5,4 @@ from __future__ import unicode_literals import frappe def execute(): - frappe.db.sql(""" Delete from `tabPage` where name='bom-browser' """) \ No newline at end of file + frappe.delete_doc_if_exists('Page', 'bom-browser') \ No newline at end of file