fix: do not allow to cancel incomplete reposting (#40224)

(cherry picked from commit 72ac56b) # Conflicts: # erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
frappe · Mar 2, 2024 · 5a0b2bf · 5a0b2bf
1 parent d7abb21
commit 5a0b2bf
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
@@ -173,6 +173,7 @@ def check_pending_repost_against_cancelled_transaction(self):
 		if self.status not in ("Queued", "In Progress"):
 			return
 
+<<<<<<< HEAD
 		if not (self.voucher_no and self.voucher_no):
 			return
 
@@ -181,6 +182,11 @@ def check_pending_repost_against_cancelled_transaction(self):
 			msg = _("Cannot cancel as processing of cancelled documents is  pending.")
 			msg += "<br>" + _("Please try again in an hour.")
 			frappe.throw(msg, title=_("Pending processing"))
+=======
+		msg = _("Cannot cancel as processing of cancelled documents is pending.")
+		msg += "<br>" + _("Please try again in an hour.")
+		frappe.throw(msg, title=_("Pending processing"))
+>>>>>>> 72ac56b6c4 (fix: do not allow to cancel incomplete reposting (#40224))
 
 	@frappe.whitelist()
 	def restart_reposting(self):