From 4587bb376713405cac2a310339b3480eba45cf71 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Tue, 20 Dec 2022 11:52:33 +0530
Subject: [PATCH] fix: conflict in stock_entry

---
 .../stock/doctype/stock_entry/stock_entry.py  | 101 +-----------------
 1 file changed, 1 insertion(+), 100 deletions(-)

diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 707ad8af794..d53f4cdbac9 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -10,10 +10,7 @@ import frappe
 from frappe import _
 from frappe.model.mapper import get_mapped_doc
 from frappe.query_builder.functions import Sum
-<<<<<<< HEAD
-from frappe.utils import cint, comma_or, cstr, flt, format_time, formatdate, getdate, nowdate
 from six import iteritems, itervalues, string_types
-=======
 from frappe.utils import (
 	add_days,
 	cint,
@@ -26,7 +23,6 @@ from frappe.utils import (
 	nowdate,
 	today,
 )
->>>>>>> b1721b79ce (fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation)
 
 import erpnext
 from erpnext.accounts.general_ledger import process_gl_map
@@ -2570,101 +2566,6 @@ def get_supplied_items(purchase_order):
 		)
 
 	return supplied_item_details
-<<<<<<< HEAD
-=======
-
-
-@frappe.whitelist()
-def get_items_from_subcontract_order(source_name, target_doc=None):
-	from erpnext.controllers.subcontracting_controller import make_rm_stock_entry
-
-	if isinstance(target_doc, str):
-		target_doc = frappe.get_doc(json.loads(target_doc))
-
-	order_doctype = "Purchase Order" if target_doc.purchase_order else "Subcontracting Order"
-	target_doc = make_rm_stock_entry(
-		subcontract_order=source_name, order_doctype=order_doctype, target_doc=target_doc
-	)
-
-	return target_doc
-
-
-def get_available_materials(work_order) -> dict:
-	data = get_stock_entry_data(work_order)
-
-	available_materials = {}
-	for row in data:
-		key = (row.item_code, row.warehouse)
-		if row.purpose != "Material Transfer for Manufacture":
-			key = (row.item_code, row.s_warehouse)
-
-		if key not in available_materials:
-			available_materials.setdefault(
-				key,
-				frappe._dict(
-					{"item_details": row, "batch_details": defaultdict(float), "qty": 0, "serial_nos": []}
-				),
-			)
-
-		item_data = available_materials[key]
-
-		if row.purpose == "Material Transfer for Manufacture":
-			item_data.qty += row.qty
-			if row.batch_no:
-				item_data.batch_details[row.batch_no] += row.qty
-
-			if row.serial_no:
-				item_data.serial_nos.extend(get_serial_nos(row.serial_no))
-				item_data.serial_nos.sort()
-		else:
-			# Consume raw material qty in case of 'Manufacture' or 'Material Consumption for Manufacture'
-
-			item_data.qty -= row.qty
-			if row.batch_no:
-				item_data.batch_details[row.batch_no] -= row.qty
-
-			if row.serial_no:
-				for serial_no in get_serial_nos(row.serial_no):
-					item_data.serial_nos.remove(serial_no)
-
-	return available_materials
-
-
-def get_stock_entry_data(work_order):
-	stock_entry = frappe.qb.DocType("Stock Entry")
-	stock_entry_detail = frappe.qb.DocType("Stock Entry Detail")
-
-	return (
-		frappe.qb.from_(stock_entry)
-		.from_(stock_entry_detail)
-		.select(
-			stock_entry_detail.item_name,
-			stock_entry_detail.original_item,
-			stock_entry_detail.item_code,
-			stock_entry_detail.qty,
-			(stock_entry_detail.t_warehouse).as_("warehouse"),
-			(stock_entry_detail.s_warehouse).as_("s_warehouse"),
-			stock_entry_detail.description,
-			stock_entry_detail.stock_uom,
-			stock_entry_detail.expense_account,
-			stock_entry_detail.cost_center,
-			stock_entry_detail.batch_no,
-			stock_entry_detail.serial_no,
-			stock_entry.purpose,
-		)
-		.where(
-			(stock_entry.name == stock_entry_detail.parent)
-			& (stock_entry.work_order == work_order)
-			& (stock_entry.docstatus == 1)
-			& (stock_entry_detail.s_warehouse.isnotnull())
-			& (
-				stock_entry.purpose.isin(
-					["Manufacture", "Material Consumption for Manufacture", "Material Transfer for Manufacture"]
-				)
-			)
-		)
-		.orderby(stock_entry.creation, stock_entry_detail.item_code, stock_entry_detail.idx)
-	).run(as_dict=1)
 
 
 def audit_incorrect_valuation_entries():
@@ -2724,4 +2625,4 @@ def get_incorrect_stock_entries() -> Dict:
 			stock_entries.setdefault(row.name, row)
 
 	return stock_entries
->>>>>>> b1721b79ce (fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation)
+