From 3f9b8923a918aa0959a265bc077e54a40ec7e0c6 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Fri, 30 Dec 2022 20:57:38 +0530 Subject: [PATCH] chore: resolve conflicts --- .../accounts/doctype/sales_invoice_item/sales_invoice_item.json | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json index 091c00f0f11..4fbb4ac1b50 100644 --- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json +++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json @@ -844,6 +844,7 @@ "istable": 1, "links": [], "modified": "2022-12-28 16:17:33.484531", + "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice Item", "naming_rule": "Random",