From 9cf4b391cc1a35fae85367aa23cfce146f093a62 Mon Sep 17 00:00:00 2001 From: Saqib Date: Tue, 28 Sep 2021 18:13:01 +0530 Subject: [PATCH] fix: cannot delete a project if linked with sales order (#27536) (cherry picked from commit 0b040c7437ceafa5412681373fd1870e8fdc26d4) # Conflicts: # erpnext/projects/doctype/project/test_project.py --- erpnext/projects/doctype/project/test_project.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/erpnext/projects/doctype/project/test_project.py b/erpnext/projects/doctype/project/test_project.py index 8a599cef753..e95d0fff2d1 100644 --- a/erpnext/projects/doctype/project/test_project.py +++ b/erpnext/projects/doctype/project/test_project.py @@ -155,7 +155,10 @@ class TestProject(unittest.TestCase): so.reload() self.assertFalse(so.project) +<<<<<<< HEAD +======= +>>>>>>> 0b040c7437 (fix: cannot delete a project if linked with sales order (#27536)) def get_project(name, template): project = frappe.get_doc(