From 29d33b31394d4633205d80db4e1c4728cec64de1 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Thu, 8 Jan 2026 15:23:40 +0530
Subject: [PATCH] fix: Workspace sidebar links for Debit/Credit Notes

(cherry picked from commit 8acf373e68780476c172cf4943f329def36f4ef4)

# Conflicts:
#	erpnext/workspace_sidebar/invoicing.json
---
 erpnext/workspace_sidebar/invoicing.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/erpnext/workspace_sidebar/invoicing.json b/erpnext/workspace_sidebar/invoicing.json
index 99a6b367953..0dd072deee4 100644
--- a/erpnext/workspace_sidebar/invoicing.json
+++ b/erpnext/workspace_sidebar/invoicing.json
@@ -314,7 +314,11 @@
    "type": "Link"
   }
  ],
+<<<<<<< HEAD:erpnext/workspace_sidebar/invoicing.json
  "modified": "2026-01-26 21:23:15.665712",
+=======
+ "modified": "2026-01-08 15:04:31.767795",
+>>>>>>> 8acf373e68 (fix: Workspace sidebar links for Debit/Credit Notes):erpnext/workspace_sidebar/accounting.json
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Invoicing",