From c7da21812a3de180a1a92d1fefc2c52fe9c52f17 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 10 Mar 2026 17:58:37 +0530 Subject: [PATCH] chore: resolve conflicts --- .../accounts/doctype/purchase_invoice/purchase_invoice.json | 4 ---- erpnext/buying/doctype/supplier/supplier.json | 4 ---- erpnext/stock/doctype/delivery_note/delivery_note.json | 4 ---- 3 files changed, 12 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index eca2549dc71..24c32fca451 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -1693,11 +1693,7 @@ "idx": 204, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2026-02-23 14:23:57.269770", -======= "modified": "2026-03-09 17:15:27.014131", ->>>>>>> 9cf529215f (fix: set default list view columns and filters for sales, purchase and accounts module) "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json index afda8d77ad1..9caf3d3fa7c 100644 --- a/erpnext/buying/doctype/supplier/supplier.json +++ b/erpnext/buying/doctype/supplier/supplier.json @@ -517,11 +517,7 @@ "link_fieldname": "party" } ], -<<<<<<< HEAD - "modified": "2026-02-10 21:28:01.101808", -======= "modified": "2026-03-09 17:15:25.465759", ->>>>>>> 9cf529215f (fix: set default list view columns and filters for sales, purchase and accounts module) "modified_by": "Administrator", "module": "Buying", "name": "Supplier", diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index c9684bc73a0..479786a122a 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -1452,11 +1452,7 @@ "idx": 146, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2026-02-10 14:35:08.523130", -======= "modified": "2026-03-09 17:15:27.932956", ->>>>>>> 9cf529215f (fix: set default list view columns and filters for sales, purchase and accounts module) "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note",