From 7e9f6aee58459b6894678e999ba5d373d1b2c14b Mon Sep 17 00:00:00 2001
From: "Nihantra C. Patel" <141945075+Nihantra-Patel@users.noreply.github.com>
Date: Mon, 17 Jun 2024 11:39:42 +0530
Subject: [PATCH] fix: update received qty in MR on purchase invoice submit
 with update stock

---
 .../purchase_invoice_item/purchase_invoice_item.json        | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index d783478a2cc..1d7b0c2f461 100644
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -963,11 +963,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-03-19 19:09:47.210965",
-=======
  "modified": "2024-06-14 11:57:07.171700",
->>>>>>> 13cb53fa89 (fix: update received qty in MR on purchase invoice submit with update stock)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice Item",
@@ -977,4 +973,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
-}
\ No newline at end of file
+}