From 54f90c31b4abfcb3f7b21fe7bc508e5e2f47ce1a Mon Sep 17 00:00:00 2001
From: Alan <2.alan.tom@gmail.com>
Date: Thu, 19 Aug 2021 15:51:36 +0530
Subject: [PATCH] fix: set production plan to completed even on over production
 (#27027)

(cherry picked from commit 09f34e558eb695d451c393a6b76c7517b5f283c6)

# Conflicts:
#	erpnext/manufacturing/doctype/production_plan/production_plan.py
---
 .../manufacturing/doctype/production_plan/production_plan.py  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index 173c730bb31..54df4ce42fa 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -415,7 +415,11 @@ class ProductionPlan(Document):
 
 		if self.total_produced_qty > 0:
 			self.status = "In Process"
+<<<<<<< HEAD
 			if self.all_items_completed():
+=======
+			if self.total_produced_qty >= self.total_planned_qty:
+>>>>>>> 09f34e558e (fix: set production plan to completed even on over production (#27027))
 				self.status = "Completed"
 
 		if self.status != "Completed":