fix(item): avoid inheriting item defaults from identically named items (#49571)

(cherry picked from commit 9e58a56b5c)

# Conflicts:
#	erpnext/stock/doctype/item/item.py

erpnext/accounts/doctype/bank_clearance/bank_clearance.py

@@ -155,10 +155,8 @@ def get_payment_entries_for_bank_clearance(
 	entries = []
 
 	condition = ""
-	pe_condition = ""
 	if not include_reconciled_entries:
 		condition = "and (clearance_date IS NULL or clearance_date='0000-00-00')"
-		pe_condition = "and (pe.clearance_date IS NULL or pe.clearance_date='0000-00-00')"
 
 	journal_entries = frappe.db.sql(
 		f"""
@@ -183,20 +181,19 @@ def get_payment_entries_for_bank_clearance(
 	payment_entries = frappe.db.sql(
 		f"""
 			select
-				"Payment Entry" as payment_document, pe.name as payment_entry,
-				pe.reference_no as cheque_number, pe.reference_date as cheque_date,
-				if(pe.paid_from=%(account)s, pe.paid_amount + if(pe.payment_type = 'Pay' and c.default_currency = pe.paid_from_account_currency, pe.base_total_taxes_and_charges, pe.total_taxes_and_charges) , 0) as credit,
-				if(pe.paid_from=%(account)s, 0, pe.received_amount + pe.total_taxes_and_charges) as debit,
-				pe.posting_date, ifnull(pe.party,if(pe.paid_from=%(account)s,pe.paid_to,pe.paid_from)) as against_account, pe.clearance_date,
-				if(pe.paid_to=%(account)s, pe.paid_to_account_currency, pe.paid_from_account_currency) as account_currency
-			from `tabPayment Entry` as pe
-			join `tabCompany` c on c.name = pe.company
+				"Payment Entry" as payment_document, name as payment_entry,
+				reference_no as cheque_number, reference_date as cheque_date,
+				if(paid_from=%(account)s, paid_amount + total_taxes_and_charges, 0) as credit,
+				if(paid_from=%(account)s, 0, received_amount + total_taxes_and_charges) as debit,
+				posting_date, ifnull(party,if(paid_from=%(account)s,paid_to,paid_from)) as against_account, clearance_date,
+				if(paid_to=%(account)s, paid_to_account_currency, paid_from_account_currency) as account_currency
+			from `tabPayment Entry`
 			where
-				(pe.paid_from=%(account)s or pe.paid_to=%(account)s) and pe.docstatus=1
-				and pe.posting_date >= %(from)s and pe.posting_date <= %(to)s
-				{pe_condition}
+				(paid_from=%(account)s or paid_to=%(account)s) and docstatus=1
+				and posting_date >= %(from)s and posting_date <= %(to)s
+				{condition}
 			order by
-				pe.posting_date ASC, pe.name DESC
+				posting_date ASC, name DESC
 		""",
 		{
 			"account": account,

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py

@@ -76,18 +76,6 @@ class BankStatementImport(DataImport):
 			self.validate_google_sheets_url()
 
 	def start_import(self):
-		"""
-		Start a background import job for this Bank Statement Import.
-		
-		Validates that the preview contains a "Bank Account" column and that the scheduler is active (unless running in test or developer mode). If validation passes and there is not already an enqueued job for this document, enqueue a background worker to perform the import.
-		
-		Returns:
-		    str | None: The enqueued job_id when a new job was queued, otherwise None.
-		
-		Raises:
-		    frappe.ValidationError: If the preview is missing a "Bank Account" column.
-		    frappe.ValidationError: If the scheduler is inactive and import is not allowed to run immediately.
-		"""
 		preview = frappe.get_doc("Bank Statement Import", self.name).get_preview_from_template(
 			self.import_file, self.google_sheets_url
 		)
@@ -123,94 +111,20 @@ class BankStatementImport(DataImport):
 		return None
 
 
-def preprocess_mt940_content(content: str) -> str:
-	"""
-	Truncate overly long MT940 statement numbers found in `:28C:` tags to the last 5 digits.
-	
-	This function fixes MT940 files where banks supply statement numbers longer than the MT940-expected maximum (5 digits),
-	which can break parsers. It only processes lines that start with the `:28C:` tag and:
-	- leaves content unchanged if no `:28C:` tag is present,
-	- truncates numeric statement numbers longer than 5 digits to their last 5 digits,
-	- preserves any `/sequence` suffix and trailing whitespace on the same line.
-	
-	Parameters:
-		content (str): Raw MT940 file content.
-	
-	Returns:
-		str: The processed content with corrected `:28C:` statement numbers.
-	"""
-	# Fast-path: bail if no :28C: tag exists
-	if ":28C:" not in content:
-		return content
-
-	# Match :28C: at start of line, capture digits and optional /seq, preserve whitespace
-	pattern = re.compile(r'(?m)^(:28C:)(\d{6,})(/\d+)?(\s*)$')
-
-	def replace_statement_number(match):
-		"""
-		Replace a matched MT940 :28C: statement number by truncating it to the last five digits if it is longer.
-		
-		Parameters:
-			match (re.Match): A regex match with groups:
-				1: prefix (e.g., ':28C:')
-				2: numeric statement number
-				3: optional sequence part (e.g., '/1')
-				4: optional trailing whitespace
-		
-		Returns:
-			str: Reconstructed replacement string preserving prefix, (possibly truncated) statement number, sequence part, and trailing whitespace.
-		"""
-		prefix = match.group(1)  # ':28C:'
-		statement_num = match.group(2)  # The statement number
-		sequence_part = match.group(3) or ''  # The sequence part like '/1'
-		trailing_space = match.group(4) or ''  # Preserve trailing whitespace
-
-		# If statement number is longer than 5 digits, truncate to last 5 digits
-		if len(statement_num) > 5:
-			statement_num = statement_num[-5:]
-
-		return prefix + statement_num + sequence_part + trailing_space
-
-	# Apply the replacement
-	processed_content = pattern.sub(replace_statement_number, content)
-	return processed_content
-
-
 @frappe.whitelist()
 def convert_mt940_to_csv(data_import, mt940_file_path):
-	"""
-	Convert an MT940 file to a CSV and save it to the Frappe File Manager, returning the saved file URL.
-	
-	This function:
-	- Loads the specified MT940 file, verifies it is MT940 format, preprocesses content to fix statement number formatting, and parses transactions.
-	- Writes parsed transactions to an in-memory CSV with headers: Date, Deposit, Withdrawal, Description, Reference Number, Bank Account, Currency.
-	- Saves the CSV as a private attachment on the Bank Statement Import document and returns the file URL.
-	
-	Parameters:
-		data_import (str): Name (docname) of the Bank Statement Import document to attach the converted CSV to.
-		mt940_file_path (str): File path or file identifier pointing to the uploaded MT940 file to convert.
-	
-	Returns:
-		str: URL of the saved CSV file in the File Manager.
-	
-	Raises:
-		frappe.ValidationError: If the file is not MT940, MT940 import is not enabled on the document, parsing fails, or no transactions are found.
-	"""
 	doc = frappe.get_doc("Bank Statement Import", data_import)
 
 	file_doc, content = get_file(mt940_file_path)
 
-	is_mt940 = is_mt940_format(content)
-	if not is_mt940:
+	if not is_mt940_format(content):
 		frappe.throw(_("The uploaded file does not appear to be in valid MT940 format."))
 
-	if is_mt940 and not doc.import_mt940_fromat:
+	if is_mt940_format(content) and not doc.import_mt940_fromat:
 		frappe.throw(_("MT940 file detected. Please enable 'Import MT940 Format' to proceed."))
 
 	try:
-		# Preprocess MT940 content to fix statement number format issues
-		processed_content = preprocess_mt940_content(content)
-		transactions = mt940.parse(processed_content)
+		transactions = mt940.parse(content)
 	except Exception as e:
 		frappe.throw(_("Failed to parse MT940 format. Error: {0}").format(str(e)))
 
@@ -335,20 +249,6 @@ def start_import(data_import, bank_account, import_file_path, google_sheets_url,
 
 
 def update_mapping_db(bank, template_options):
-	"""
-	Update a Bank document's transaction field mappings to match the provided template options.
-	
-	This replaces all existing entries in the Bank.bank_transaction_mapping child table with mappings from
-	the JSON-encoded template_options. The expected template_options JSON contains a "column_to_field_map"
-	object mapping file column names (keys) to bank transaction field names (values).
-	
-	Parameters:
-		bank (str | frappe.model.document.Document): Bank name/docname or a Bank document.
-		template_options (str): JSON string containing a "column_to_field_map" mapping of file column -> bank field.
-	
-	Side effects:
-		Overwrites the Bank.bank_transaction_mapping entries and saves the Bank document.
-	"""
 	bank = frappe.get_doc("Bank", bank)
 	for d in bank.bank_transaction_mapping:
 		d.delete()
@@ -360,17 +260,6 @@ def update_mapping_db(bank, template_options):
 
 
 def add_bank_account(data, bank_account):
-	"""
-	Ensure every data row contains the given bank account value.
-	
-	Assumes `data` is a list of rows where data[0] is the header row. If the header row does not contain "Bank Account",
-	this function appends that header and appends the `bank_account` value to each subsequent row. If the header exists,
-	it sets the `bank_account` value into the existing "Bank Account" column for every data row. Mutates `data` in place.
-	
-	Parameters:
-	    data (list[list]): Table-like data with the first row as headers.
-	    bank_account (str): Bank account value to set for each data row.
-	"""
 	bank_account_loc = None
 	if "Bank Account" not in data[0]:
 		data[0].append("Bank Account")
@@ -387,21 +276,6 @@ def add_bank_account(data, bank_account):
 
 
 def write_files(import_file, data):
-	"""
-	Write processed tabular data back to the original import file path (CSV or Excel).
-	
-	This function overwrites the file referenced by import_file.file_doc.get_full_path().
-	- If the file extension is "csv", writes rows using the csv writer (expects `data` as an iterable of row iterables).
-	- If the extension is "xlsx" or "xls", writes to an Excel workbook using write_xlsx with sheet name "trans".
-	
-	Parameters:
-	    import_file: object
-	        File wrapper whose `.file_doc.get_full_path()` and `.file_doc.get_extension()` are used to determine the target path and extension.
-	    data: Iterable[Iterable]
-	        Sequence of rows (each row is an iterable of cell values) to be written.
-	
-	No return value.
-	"""
 	full_file_path = import_file.file_doc.get_full_path()
 	parts = import_file.file_doc.get_extension()
 	extension = parts[1]
@@ -411,26 +285,11 @@ def write_files(import_file, data):
 		with open(full_file_path, "w", newline="") as file:
 			writer = csv.writer(file)
 			writer.writerows(data)
-	elif extension in ("xlsx", "xls"):
+	elif extension == "xlsx" or "xls":
 		write_xlsx(data, "trans", file_path=full_file_path)
 
 
 def write_xlsx(data, sheet_name, wb=None, column_widths=None, file_path=None):
-	"""
-	Write rows of data to an Excel worksheet and save the workbook.
-	
-	Creates a sheet named `sheet_name` in the provided openpyxl workbook (or a new write-only workbook if `wb` is None), applies optional column widths, converts HTML in string cells (except for sheets named "Data Import Template" or "Data Export"), strips characters illegal in Excel, and saves the workbook to `file_path`.
-	
-	Parameters:
-	    data (Iterable[Sequence]): Iterable of rows, where each row is a sequence of cell values.
-	    sheet_name (str): Name of the worksheet to create.
-	    wb (openpyxl.Workbook, optional): Workbook to append the sheet to. If not provided, a new write-only Workbook is created.
-	    column_widths (Sequence[Number], optional): Sequence of column widths; indexes correspond to columns starting at 1.
-	    file_path (str): File path where the workbook will be saved.
-	
-	Returns:
-	    bool: True on successful save.
-	"""
 	# from xlsx utils with changes
 	column_widths = column_widths or []
 	if wb is None:

erpnext/accounts/doctype/bank_statement_import/test_bank_statement_import.py

@@ -1,220 +1,10 @@
 # Copyright (c) 2020, Frappe Technologies and Contributors
 # See license.txt
-
+# import frappe
 import unittest
 
-from erpnext.accounts.doctype.bank_statement_import.bank_statement_import import (
-	preprocess_mt940_content,
-	is_mt940_format,
-)
+from frappe.tests import IntegrationTestCase
 
 
-class TestBankStatementImport(unittest.TestCase):
-	"""Unit tests for Bank Statement Import functions"""
-
-	def test_preprocess_mt940_content_with_long_statement_number(self):
-		"""Test that statement numbers longer than 5 digits are truncated to last 5 digits"""
-		# Test case with 6-digit statement number (167619 -> 67619)
-		mt940_content = ":28C:167619/1"
-		expected_content = ":28C:67619/1"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-	def test_preprocess_mt940_content_with_normal_statement_number(self):
-		"""Test that statement numbers with 5 or fewer digits are unchanged"""
-		# Test case with 5-digit statement number (should remain unchanged)
-		mt940_content = ":28C:12345/1"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, mt940_content)  # Should be unchanged
-
-		# Test case with 4-digit statement number (should remain unchanged)
-		mt940_content = ":28C:1234/1"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, mt940_content)  # Should be unchanged
-
-	def test_preprocess_mt940_content_without_sequence_number(self):
-		"""Test statement number truncation without sequence number"""
-		# Test case with long statement number but no sequence (no /1)
-		mt940_content = ":28C:987654321"
-		expected_content = ":28C:54321"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-	def test_preprocess_mt940_content_multiple_occurrences(self):
-		"""Test multiple statement numbers in the same content"""
-		mt940_content = """:28C:167619/1
-:28C:987654/2"""
-		expected_content = """:28C:67619/1
-:28C:87654/2"""
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-	def test_preprocess_mt940_content_edge_cases(self):
-		"""Test edge cases like empty content and content without :28C: tags"""
-		# Test empty content
-		self.assertEqual(preprocess_mt940_content(""), "")
-
-		# Test content without :28C: tags
-		content_without_28c = """:20:STARTUMSE
-:25:12345678901234567890
-:60F:C031002EUR0,00"""
-		result = preprocess_mt940_content(content_without_28c)
-		self.assertEqual(result, content_without_28c)  # Should be unchanged
-
-	def test_preprocess_mt940_content_with_full_mt940_document(self):
-		"""Test preprocessing with complete MT940 document"""
-		mt940_content = """:20:STARTUMSE
-:25:12345678901234567890
-:28C:167619/1
-:60F:C031002EUR0,00
-:61:0310021002DR123,45NMSCNONREF//8327000090031789
-:86:806?20EREF+NONREF?21MREF+M180031?22CRED+DE98ZZZ09999999999
-:62F:C031002EUR-123,45
--"""
-		expected_content = """:20:STARTUMSE
-:25:12345678901234567890
-:28C:67619/1
-:60F:C031002EUR0,00
-:61:0310021002DR123,45NMSCNONREF//8327000090031789
-:86:806?20EREF+NONREF?21MREF+M180031?22CRED+DE98ZZZ09999999999
-:62F:C031002EUR-123,45
--"""
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-	def test_is_mt940_format_detection(self):
-		"""Test MT940 format detection function"""
-		# Valid MT940 content with all required tags
-		valid_mt940 = """:20:STARTUMSE
-:25:12345678901234567890
-:28C:167619/1
-:60F:C031002EUR0,00
-:61:0310021002DR123,45NMSCNONREF//8327000090031789"""
-		self.assertTrue(is_mt940_format(valid_mt940))
-
-		# Invalid MT940 content (CSV format)
-		invalid_mt940 = """Date,Description,Amount
-2023-01-01,Test Transaction,100.00
-2023-01-02,Another Transaction,-50.00"""
-		self.assertFalse(is_mt940_format(invalid_mt940))
-
-		# Partially valid MT940 (missing some required tags)
-		partial_mt940 = """:20:STARTUMSE
-:25:12345678901234567890
-:60F:C031002EUR0,00"""
-		self.assertFalse(is_mt940_format(partial_mt940))
-
-		# Empty content
-		self.assertFalse(is_mt940_format(""))
-
-	def test_preprocess_mt940_content_boundary_conditions(self):
-		"""
-		Verify preprocessing handles statement-number length boundaries in `:28C:` tags.
-		
-		Checks that:
-		- A 6-digit statement number is truncated to its last 5 digits.
-		- A 5-digit statement number remains unchanged.
-		- A very long statement number is reduced to its last 5 digits.
-		"""
-		# Test exactly 6 digits (should be truncated)
-		mt940_content = ":28C:123456/1"
-		expected_content = ":28C:23456/1"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-		# Test exactly 5 digits (should remain unchanged)
-		mt940_content = ":28C:12345/1"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, mt940_content)
-
-		# Test very long statement number
-		mt940_content = ":28C:123456789012345/1"
-		expected_content = ":28C:12345/1"  # Last 5 digits
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-	def test_preprocess_mt940_content_real_world_case(self):
-		"""
-		Verify preprocessing of a real-world MT940 document: truncate 6-digit `:28C:` statement numbers to their last 5 digits and preserve all other content.
-		
-		Uses a sanitized, production-failing MT940 sample where `:28C:167619/1` must become `:28C:67619/1`. Asserts the entire document matches the expected transformed output, that the truncated tag is present and the original is absent, and that unrelated fields (e.g., `:20:` reference and UPI details) remain unchanged.
-		"""
-		# This is based on actual MT940 content that was causing parsing errors (sanitized)
-		mt940_content = """{1:F0112345678901X0000000000}{2:I94012345678901XN}{4:
-:20:STMTREF167619
-:25:1234567890
-:28C:167619/1
-:60F:C250622USD0,00
-:61:2507170717C100000,00NMSCNOREF
-:86:BY EXAMPLE INST 123456/03-07-25/TESTBANK/CITY
-:61:2507240724C1,00NMSCNEFTINW-1234567890
-:86:NEFT TEST123456789 EXAMPLE MERCHANT SERVICES
-:61:2507310731D305,62NMSCTBMS-1234567890
-:86:Chrg: Debit Card Annual Fee 1234 for 2025
-:61:2508030803D1066,00NMSC123456789
-:86:PCD/1234/EXAMPLE DOMAIN/01234567890123/23:27
-:61:2508060806D2000,00NMSCUPI-123456789
-:86:UPI/TEST USER/123456789/PaidViaTestApp
-:61:2508140814D5000,00NMSCUPI-123456789
-:86:UPI/TEST USER/123456789/PaidViaTestApp
-:61:2509190919D900,00NMSCUPI-123456789
-:86:UPI/EXAMPLE MERCHANT/123456789/Pay
-:61:2509190919D2606,00NMSCUPI-123456789
-:86:UPI/JOHN DOE/123456789/PaidViaTestApp
-:62F:C250922USD88123,38
--}"""
-
-		# Expected result with statement number 167619 truncated to 67619
-		expected_content = """{1:F0112345678901X0000000000}{2:I94012345678901XN}{4:
-:20:STMTREF167619
-:25:1234567890
-:28C:67619/1
-:60F:C250622USD0,00
-:61:2507170717C100000,00NMSCNOREF
-:86:BY EXAMPLE INST 123456/03-07-25/TESTBANK/CITY
-:61:2507240724C1,00NMSCNEFTINW-1234567890
-:86:NEFT TEST123456789 EXAMPLE MERCHANT SERVICES
-:61:2507310731D305,62NMSCTBMS-1234567890
-:86:Chrg: Debit Card Annual Fee 1234 for 2025
-:61:2508030803D1066,00NMSC123456789
-:86:PCD/1234/EXAMPLE DOMAIN/01234567890123/23:27
-:61:2508060806D2000,00NMSCUPI-123456789
-:86:UPI/TEST USER/123456789/PaidViaTestApp
-:61:2508140814D5000,00NMSCUPI-123456789
-:86:UPI/TEST USER/123456789/PaidViaTestApp
-:61:2509190919D900,00NMSCUPI-123456789
-:86:UPI/EXAMPLE MERCHANT/123456789/Pay
-:61:2509190919D2606,00NMSCUPI-123456789
-:86:UPI/JOHN DOE/123456789/PaidViaTestApp
-:62F:C250922USD88123,38
--}"""
-
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-		# Verify that the problematic statement number was actually changed
-		self.assertIn(":28C:67619/1", result)
-		self.assertNotIn(":28C:167619/1", result)
-
-		# Verify that other content remains unchanged
-		self.assertIn(":20:STMTREF167619", result)  # Reference should remain unchanged
-		self.assertIn("UPI/TEST USER/123456789/PaidViaTestApp", result)
-
-	def test_preprocess_mt940_content_whitespace_variants(self):
-		"""Test handling of whitespace and different line endings"""
-		# Test with trailing spaces
-		mt940_content = ":28C:167619/1   \n"
-		expected_content = ":28C:67619/1   \n"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-		# Test with Windows line endings (CRLF)
-		mt940_content = ":28C:167619/1\r\n"
-		expected_content = ":28C:67619/1\r\n"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, expected_content)
-
-		# Test with leading spaces (should not match as it's not line start)
-		mt940_content = "   :28C:167619/1\n"
-		result = preprocess_mt940_content(mt940_content)
-		self.assertEqual(result, mt940_content)  # Should remain unchanged
+class TestBankStatementImport(IntegrationTestCase):
+	pass

erpnext/accounts/doctype/gl_entry/gl_entry.py

@@ -137,20 +137,18 @@ class GLEntry(Document):
 
 		if not self.is_cancelled and not (self.party_type and self.party):
 			account_type = frappe.get_cached_value("Account", self.account, "account_type")
-			# skipping validation for payroll entry creation in case party is not required
-			if not frappe.flags.party_not_required_for_receivable_payable:
-				if account_type == "Receivable":
-					frappe.throw(
-						_("{0} {1}: Customer is required against Receivable account {2}").format(
-							self.voucher_type, self.voucher_no, self.account
-						)
+			if account_type == "Receivable":
+				frappe.throw(
+					_("{0} {1}: Customer is required against Receivable account {2}").format(
+						self.voucher_type, self.voucher_no, self.account
 					)
-				elif account_type == "Payable":
-					frappe.throw(
-						_("{0} {1}: Supplier is required against Payable account {2}").format(
-							self.voucher_type, self.voucher_no, self.account
-						)
+				)
+			elif account_type == "Payable":
+				frappe.throw(
+					_("{0} {1}: Supplier is required against Payable account {2}").format(
+						self.voucher_type, self.voucher_no, self.account
 					)
+				)
 
 		# Zero value transaction is not allowed
 		if not (

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -644,11 +644,8 @@ class JournalEntry(AccountsController):
 	def validate_party(self):
 		for d in self.get("accounts"):
 			account_type = frappe.get_cached_value("Account", d.account, "account_type")
-
-			# skipping validation for payroll entry creation
-			skip_validation = frappe.flags.party_not_required_for_receivable_payable
 			if account_type in ["Receivable", "Payable"]:
-				if not (d.party_type and d.party) and not skip_validation:
+				if not (d.party_type and d.party):
 					frappe.throw(
 						_(
 							"Row {0}: Party Type and Party is required for Receivable / Payable account {1}"

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html

@@ -328,20 +328,11 @@
 		<td></td>
 		<td></td>
 		<td></td>
-		{% if not(filters.show_future_payments) %}
-			<td></td>
-			<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="invoiced"), currency=data[0]["currency"]) }}</b></td>
-			<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="paid"), currency=data[0]["currency"]) }}</b></td>
-			<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="credit_note"), currency=data[0]["currency"]) }}</b></td>
-			<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="outstanding"), currency=data[0]["currency"]) }}</b></td>
-		{% else %}
-			<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="invoiced"), currency=data[0]["currency"]) }}</b></td>
-			<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="outstanding"), currency=data[0]["currency"]) }}</b></td>
-			<td></td>
-			<td></td>
-			<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="future_amount"), currency=data[0]["currency"]) }}</b></td>
-			<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="remaining_balance"), currency=data[0]["currency"]) }}</b></td>
-		{% endif %}
+		<td></td>
+		<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="invoiced"), currency=data[0]["currency"]) }}</b></td>
+		<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="paid"), currency=data[0]["currency"]) }}</b></td>
+		<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="credit_note"), currency=data[0]["currency"]) }}</b></td>
+		<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="outstanding"), currency=data[0]["currency"]) }}</b></td>
 	</tbody>
 </table>
 <br>

erpnext/accounts/report/accounts_receivable/accounts_receivable.py

@@ -976,7 +976,6 @@ class ReceivablePayableReport:
 
 			if self.account_type == "Receivable":
 				self.add_customer_filters()
-				self.exclude_employee_transaction()
 
 			elif self.account_type == "Payable":
 				self.add_supplier_filters()
@@ -1056,9 +1055,6 @@ class ReceivablePayableReport:
 				)
 			)
 
-	def exclude_employee_transaction(self):
-		self.qb_selection_filter.append(self.ple.party_type != "Employee")
-
 	def add_supplier_filters(self):
 		supplier = qb.DocType("Supplier")
 		if self.filters.get("supplier_group"):

erpnext/accounts/utils.py

@@ -2506,10 +2506,6 @@ def build_qb_match_conditions(doctype, user=None) -> list:
 		for filter in match_filters:
 			for link_option, allowed_values in filter.items():
 				fieldnames = link_fields_map.get(link_option, [])
-				cond = None
-
-				if link_option == doctype:
-					cond = _dt["name"].isin(allowed_values)
 
 				for fieldname in fieldnames:
 					field = _dt[fieldname]
@@ -2518,7 +2514,6 @@ def build_qb_match_conditions(doctype, user=None) -> list:
 					if not apply_strict_user_permissions:
 						cond = (Coalesce(field, "") == "") | cond
 
-				if cond:
 					criterion.append(cond)
 
 	return criterion

erpnext/buying/doctype/purchase_order/purchase_order.js

@@ -503,7 +503,6 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends (
 	}
 
 	onload() {
-		super.onload();
 		this.frm.set_query("supplier", function () {
 			return {
 				filters: {

erpnext/manufacturing/doctype/bom/bom.py

@@ -1414,7 +1414,7 @@ def get_children(parent=None, is_root=False, **filters):
 		return bom_items
 
 
-def add_additional_cost(stock_entry, work_order, job_card=None):
+def add_additional_cost(stock_entry, work_order):
 	# Add non stock items cost in the additional cost
 	stock_entry.additional_costs = []
 	company_account = frappe.db.get_value(
@@ -1427,16 +1427,13 @@ def add_additional_cost(stock_entry, work_order, job_card=None):
 	expense_account = (
 		company_account.default_operating_cost_account or company_account.default_expense_account
 	)
-	add_non_stock_items_cost(stock_entry, work_order, expense_account, job_card=job_card)
-	add_operations_cost(stock_entry, work_order, expense_account, job_card=job_card)
+	add_non_stock_items_cost(stock_entry, work_order, expense_account)
+	add_operations_cost(stock_entry, work_order, expense_account)
 
 
-def add_non_stock_items_cost(stock_entry, work_order, expense_account, job_card=None):
+def add_non_stock_items_cost(stock_entry, work_order, expense_account):
 	bom = frappe.get_doc("BOM", work_order.bom_no)
-
-	table = "items"
-	if work_order and not job_card:
-		table = "exploded_items" if work_order.get("use_multi_level_bom") else "items"
+	table = "exploded_items" if work_order.get("use_multi_level_bom") else "items"
 
 	items = {}
 	for d in bom.get(table):
@@ -1467,16 +1464,13 @@ def add_non_stock_items_cost(stock_entry, work_order, expense_account, job_card=
 
 
 def add_operating_cost_component_wise(
-	stock_entry, work_order=None, operating_cost_per_unit=None, op_expense_account=None, job_card=None
+	stock_entry, work_order=None, operating_cost_per_unit=None, op_expense_account=None
 ):
 	if not work_order:
 		return False
 
 	cost_added = False
 	for row in work_order.operations:
-		if job_card and job_card.operation_id != row.name:
-			continue
-
 		workstation_cost = frappe.get_all(
 			"Workstation Cost",
 			fields=["operating_component", "operating_cost"],
@@ -1517,14 +1511,14 @@ def get_component_account(parent):
 	return frappe.db.get_value("Workstation Operating Component Account", parent, "expense_account")
 
 
-def add_operations_cost(stock_entry, work_order=None, expense_account=None, job_card=None):
+def add_operations_cost(stock_entry, work_order=None, expense_account=None):
 	from erpnext.stock.doctype.stock_entry.stock_entry import get_operating_cost_per_unit
 
 	operating_cost_per_unit = get_operating_cost_per_unit(work_order, stock_entry.bom_no)
 
 	if operating_cost_per_unit:
 		cost_added = add_operating_cost_component_wise(
-			stock_entry, work_order, operating_cost_per_unit, expense_account, job_card=job_card
+			stock_entry, work_order, operating_cost_per_unit, expense_account
 		)
 
 		if not cost_added:

erpnext/manufacturing/doctype/job_card/job_card.py

@@ -23,7 +23,6 @@ from frappe.utils import (
 	time_diff_in_hours,
 )
 
-from erpnext.manufacturing.doctype.bom.bom import add_additional_cost
 from erpnext.manufacturing.doctype.manufacturing_settings.manufacturing_settings import (
 	get_mins_between_operations,
 )
@@ -818,6 +817,9 @@ class JobCard(Document):
 			)
 
 	def update_work_order(self):
+		if self.track_semi_finished_goods:
+			return
+
 		if not self.work_order:
 			return
 
@@ -847,9 +849,9 @@ class JobCard(Document):
 
 	def update_semi_finished_good_details(self):
 		if self.operation_id:
-			qty = max(flt(self.manufactured_qty), flt(self.total_completed_qty))
-
-			frappe.db.set_value("Work Order Operation", self.operation_id, "completed_qty", qty)
+			frappe.db.set_value(
+				"Work Order Operation", self.operation_id, "completed_qty", self.manufactured_qty
+			)
 			if (
 				self.finished_good
 				and frappe.get_cached_value("Work Order", self.work_order, "production_item")
@@ -1320,9 +1322,6 @@ class JobCard(Document):
 
 		ste.make_stock_entry()
 		ste.stock_entry.flags.ignore_mandatory = True
-		wo_doc = frappe.get_doc("Work Order", self.work_order)
-		add_additional_cost(ste.stock_entry, wo_doc, self)
-
 		ste.stock_entry.save()
 
 		if auto_submit:

erpnext/manufacturing/doctype/work_order/work_order.py

@@ -355,10 +355,6 @@ class WorkOrder(Document):
 	def calculate_operating_cost(self):
 		self.planned_operating_cost, self.actual_operating_cost = 0.0, 0.0
 		for d in self.get("operations"):
-			if not d.hour_rate:
-				if d.workstation:
-					d.hour_rate = get_hour_rate(d.workstation)
-
 			d.planned_operating_cost = flt(
 				flt(d.hour_rate) * (flt(d.time_in_mins) / 60.0), d.precision("planned_operating_cost")
 			)
@@ -2436,8 +2432,3 @@ def get_row_wise_serial_batch(work_order, purpose=None):
 			details.batch_nos[entry.batch_no] += abs(entry.qty)
 
 	return row_wise_serial_batch
-
-
-@frappe.request_cache
-def get_hour_rate(workstation):
-	return frappe.get_cached_value("Workstation", workstation, "hour_rate") or 0.0

erpnext/patches.txt

@@ -418,7 +418,7 @@ erpnext.patches.v15_0.set_cancelled_status_to_cancelled_pos_invoice
 erpnext.patches.v15_0.rename_group_by_to_categorize_by_in_custom_reports
 erpnext.patches.v15_0.remove_agriculture_roles
 erpnext.patches.v14_0.update_full_name_in_contract
-erpnext.patches.v15_0.drop_sle_indexes #2025-09-18
+erpnext.patches.v15_0.drop_sle_indexes
 erpnext.patches.v15_0.update_pick_list_fields
 execute:frappe.db.set_single_value("Accounts Settings", "confirm_before_resetting_posting_date", 1)
 erpnext.patches.v15_0.rename_pos_closing_entry_fields #2025-06-13

erpnext/patches/v15_0/drop_sle_indexes.py

@@ -4,7 +4,7 @@ import frappe
 
 def execute():
 	table = "tabStock Ledger Entry"
-	index_list = ["posting_datetime_creation_index", "item_warehouse", "batch_no_item_code_warehouse_index"]
+	index_list = ["posting_datetime_creation_index", "item_warehouse"]
 
 	for index in index_list:
 		if not frappe.db.has_index(table, index):

erpnext/public/js/controllers/transaction.js

@@ -1069,7 +1069,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 			if (me.frm.doc.doctype == "Quotation" && me.frm.doc.quotation_to == "Customer") {
 				(party_type = "Customer"), (party_name = me.frm.doc.party_name);
 			} else {
-				party_type = frappe.meta.has_field(me.frm.doc.doctype, "supplier") ? "Supplier" : "Customer";
+				party_type = frappe.meta.has_field(me.frm.doc.doctype, "customer") ? "Customer" : "Supplier";
 				party_name = me.frm.doc[party_type.toLowerCase()];
 			}
 			if (party_name) {

erpnext/setup/doctype/employee/test_employee.py

@@ -4,11 +4,9 @@ import unittest
 
 import frappe
 import frappe.utils
-from frappe.query_builder import Criterion
 from frappe.tests import IntegrationTestCase
 
 import erpnext
-from erpnext.accounts.utils import build_qb_match_conditions
 from erpnext.setup.doctype.employee.employee import InactiveEmployeeStatusError
 
 
@@ -34,32 +32,6 @@ class TestEmployee(IntegrationTestCase):
 		employee_doc.save()
 		self.assertTrue("Employee" not in frappe.get_roles(user))
 
-	def test_employee_user_permission(self):
-		employee1 = make_employee("employee_1_test@company.com", create_user_permission=1)
-		employee2 = make_employee("employee_2_test@company.com", create_user_permission=1)
-		make_employee("employee_3_test@company.com", create_user_permission=1)
-
-		employee1_doc = frappe.get_doc("Employee", employee1)
-		employee2_doc = frappe.get_doc("Employee", employee2)
-
-		employee2_doc.reload()
-		employee2_doc.reports_to = employee1_doc.name
-		employee2_doc.save()
-
-		frappe.set_user(employee1_doc.user_id)
-
-		Employee = frappe.qb.DocType("Employee")
-		qb_employee_list = (
-			frappe.qb.from_(Employee)
-			.select(Employee.name)
-			.where(Criterion.all(build_qb_match_conditions("Employee")))
-			.orderby(Employee.Name)
-		).run(pluck=Employee.name)
-		employee_list = frappe.db.get_list("Employee", pluck="name", order_by="name")
-
-		self.assertEqual(qb_employee_list, employee_list)
-		frappe.set_user("Administrator")
-
 	def tearDown(self):
 		frappe.db.rollback()
 

erpnext/stock/doctype/item/item.py

@@ -726,9 +726,32 @@ class Item(Document):
 		if self.item_defaults or not self.item_group:
 			return
 
+<<<<<<< HEAD
 		item_group = frappe.get_cached_doc("Item Group", self.item_group)
 		if item_group.item_group_defaults:
 			for item in item_group.item_group_defaults:
+=======
+		item_defaults = frappe.db.get_values(
+			"Item Default",
+			{
+				"parent": self.item_group,
+				"parenttype": "Item Group",
+			},
+			[
+				"company",
+				"default_warehouse",
+				"default_price_list",
+				"buying_cost_center",
+				"default_supplier",
+				"expense_account",
+				"selling_cost_center",
+				"income_account",
+			],
+			as_dict=1,
+		)
+		if item_defaults:
+			for item in item_defaults:
+>>>>>>> 9e58a56b5c (fix(item): avoid inheriting item defaults from identically named items (#49571))
 				self.append(
 					"item_defaults",
 					{

erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js

@@ -5,6 +5,31 @@ frappe.provide("erpnext.stock");
 
 erpnext.landed_cost_taxes_and_charges.setup_triggers("Landed Cost Voucher");
 erpnext.stock.LandedCostVoucher = class LandedCostVoucher extends erpnext.stock.StockController {
+	setup() {
+		var me = this;
+		this.frm.fields_dict.purchase_receipts.grid.get_field("receipt_document").get_query = function (
+			doc,
+			cdt,
+			cdn
+		) {
+			var d = locals[cdt][cdn];
+
+			var filters = [
+				[d.receipt_document_type, "docstatus", "=", "1"],
+				[d.receipt_document_type, "company", "=", me.frm.doc.company],
+			];
+
+			if (d.receipt_document_type == "Purchase Invoice") {
+				filters.push(["Purchase Invoice", "update_stock", "=", "1"]);
+			}
+
+			if (!me.frm.doc.company) frappe.msgprint(__("Please enter company first"));
+			return {
+				filters: filters,
+			};
+		};
+	}
+
 	refresh() {
 		var help_content = `<br><br>
 			<table class="table table-bordered" style="background-color: var(--scrollbar-track-color);">
@@ -133,19 +158,15 @@ frappe.ui.form.on("Landed Cost Voucher", {
 	setup_queries(frm) {
 		frm.set_query("receipt_document", "purchase_receipts", (doc, cdt, cdn) => {
 			var d = locals[cdt][cdn];
-			var filters = [
-				[d.receipt_document_type, "docstatus", "=", 1],
-				[d.receipt_document_type, "company", "=", frm.doc.company],
-			];
-
-			if (d.receipt_document_type === "Purchase Invoice") {
-				filters.push(["Purchase Invoice", "update_stock", "=", 1]);
-			} else if (d.receipt_document_type === "Stock Entry") {
-				filters.push(["Stock Entry", "purpose", "in", ["Manufacture", "Repack"]]);
+			if (d.receipt_document_type === "Stock Entry") {
+				return {
+					filters: {
+						docstatus: 1,
+						company: frm.doc.company,
+						purpose: ["in", ["Manufacture", "Repack"]],
+					},
+				};
 			}
-			return {
-				filters: filters,
-			};
 		});
 
 		frm.set_query("vendor_invoice", "vendor_invoices", (doc, cdt, cdn) => {

erpnext/stock/doctype/stock_entry/stock_entry.py

@@ -2340,12 +2340,9 @@ class StockEntry(StockController):
 					"Work Order", self.work_order, "allow_alternative_item"
 				)
 
-			skip_transfer, from_wip_warehouse = (
-				frappe.get_value("Work Order", self.work_order, ["skip_transfer", "from_wip_warehouse"])
-				if self.work_order
-				else [None, None]
+			skip_transfer, from_wip_warehouse = frappe.get_value(
+				"Work Order", self.work_order, ["skip_transfer", "from_wip_warehouse"]
 			)
-
 			item.from_warehouse = (
 				frappe.get_value(
 					"Work Order Item",

erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py

@@ -347,4 +347,5 @@ class StockLedgerEntry(Document):
 
 def on_doctype_update():
 	frappe.db.add_index("Stock Ledger Entry", ["voucher_no", "voucher_type"])
+	frappe.db.add_index("Stock Ledger Entry", ["batch_no", "item_code", "warehouse"])
 	frappe.db.add_index("Stock Ledger Entry", ["item_code", "warehouse", "posting_datetime", "creation"])

erpnext/stock/get_item_details.py

@@ -202,7 +202,7 @@ def update_stock(ctx, out, doc=None):
 				"item_code": ctx.item_code,
 				"warehouse": ctx.warehouse,
 				"based_on": frappe.get_single_value("Stock Settings", "pick_serial_and_batch_based_on"),
-				"sabb_voucher_no": doc.get("name") if doc else None,
+				"sabb_voucher_no": doc.get("name"),
 				"sabb_voucher_detail_no": ctx.child_docname,
 				"sabb_voucher_type": ctx.doctype,
 			}

erpnext/support/doctype/issue/issue.py

@@ -310,7 +310,7 @@ def is_first_response(issue):
 
 
 def calculate_first_response_time(issue, first_responded_on):
-	issue_creation_date = get_datetime(issue.service_level_agreement_creation or issue.creation)
+	issue_creation_date = issue.service_level_agreement_creation or issue.creation
 	issue_creation_time = get_time_in_seconds(issue_creation_date)
 	first_responded_on_in_seconds = get_time_in_seconds(first_responded_on)
 	support_hours = frappe.get_cached_doc(

erpnext/support/doctype/service_level_agreement/service_level_agreement.py

@@ -25,7 +25,7 @@ from frappe.utils.caching import redis_cache
 from frappe.utils.nestedset import get_ancestors_of
 from frappe.utils.safe_exec import get_safe_globals
 
-from erpnext.support.doctype.issue.issue import calculate_first_response_time, get_holidays
+from erpnext.support.doctype.issue.issue import get_holidays
 
 
 class ServiceLevelAgreement(Document):
@@ -552,8 +552,6 @@ def handle_status_change(doc, apply_sla_for_resolution):
 	def set_first_response():
 		if doc.meta.has_field("first_responded_on") and not doc.get("first_responded_on"):
 			doc.first_responded_on = now_time
-			if doc.meta.has_field("first_response_time"):
-				doc.first_response_time = calculate_first_response_time(doc, doc.first_responded_on)
 			if get_datetime(doc.get("first_responded_on")) > get_datetime(doc.get("response_by")):
 				record_assigned_users_on_failure(doc)