schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: broken patches (backport #29067) (#29406)

Browse Source 
* chore: patch fixes

(cherry picked from commit 8b5b146f6d)

# Conflicts:
#	erpnext/patches/v13_0/make_homepage_products_website_items.py

* fix: remove desktop icons while deleting sales reports

(cherry picked from commit 5f72026cb9)

* refactor: dont ignore dangerous exceptions in patches

(cherry picked from commit 0aa1ea8aeb)

* fix: make patch kinda idempotent

with previous query rerunning would've caused all values to become 0.

* chore: conflicts

* fix: check type before patching

Co-authored-by: Saurabh <saurabh6790@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
This commit is contained in:
mergify[bot]
2022-01-25 11:14:08 +05:30
committed by GitHub
parent b8fbfed096
commit f469ec87d9
4 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/patches/v13_0/delete_old_sales_reports.py
View File

@@ -12,6 +12,7 @@ def execute():
for report in reports_to_delete:
if frappe.db.exists("Report", report):
delete_links_from_desktop_icons(report)
delete_auto_email_reports(report)
check_and_delete_linked_reports(report)
@@ -22,3 +23,9 @@ def delete_auto_email_reports(report):
auto_email_reports = frappe.db.get_values("Auto Email Report", {"report": report}, ["name"])
for auto_email_report in auto_email_reports:
frappe.delete_doc("Auto Email Report", auto_email_report[0])
def delete_links_from_desktop_icons(report):
""" Check for one or multiple Desktop Icons and delete """
desktop_icons = frappe.db.get_values("Desktop Icon", {"_report": report}, ["name"])
for desktop_icon in desktop_icons:
frappe.delete_doc("Desktop Icon", desktop_icon[0])