Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-38505

erpnext/accounts/utils.py

@@ -626,8 +626,10 @@ def update_reference_in_payment_entry(
 		"total_amount": d.grand_total,
 		"outstanding_amount": d.outstanding_amount,
 		"allocated_amount": d.allocated_amount,
-		"exchange_rate": d.exchange_rate if d.exchange_gain_loss else payment_entry.get_exchange_rate(),
+		"exchange_rate": d.exchange_rate
-		"exchange_gain_loss": d.exchange_gain_loss,
+		if d.difference_amount is not None
+		else payment_entry.get_exchange_rate(),
+		"exchange_gain_loss": d.difference_amount,
 	}
 
 	if d.voucher_detail_no:

erpnext/controllers/accounts_controller.py

@@ -165,6 +165,7 @@ class AccountsController(TransactionBase):
 		self.disable_pricing_rule_on_internal_transfer()
 		self.disable_tax_included_prices_for_internal_transfer()
 		self.set_incoming_rate()
+		self.init_internal_values()
 
 		if self.meta.get_field("currency"):
 			self.calculate_taxes_and_totals()
@@ -224,6 +225,16 @@ class AccountsController(TransactionBase):
 
 		self.set_total_in_words()
 
+	def init_internal_values(self):
+		# init all the internal values as 0 on sa
+		if self.docstatus.is_draft():
+			# TODO: Add all such pending values here
+			fields = ["billed_amt", "delivered_qty"]
+			for item in self.get("items"):
+				for field in fields:
+					if hasattr(item, field):
+						item.set(field, 0)
+
 	def before_cancel(self):
 		validate_einvoice_fields(self)
 

erpnext/selling/doctype/customer/customer.py

@@ -307,18 +307,19 @@ class Customer(TransactionBase):
 
 def create_contact(contact, party_type, party, email):
 	"""Create contact based on given contact name"""
-	contact = contact.split(" ")
+	first, middle, last = parse_full_name(contact)
-
+	doc = frappe.get_doc(
-	contact = frappe.get_doc(
 		{
 			"doctype": "Contact",
-			"first_name": contact[0],
+			"first_name": first,
-			"last_name": len(contact) > 1 and contact[1] or "",
+			"middle_name": middle,
+			"last_name": last,
+			"is_primary_contact": 1,
 		}
 	)
-	contact.append("email_ids", dict(email_id=email, is_primary=1))
+	doc.append("email_ids", dict(email_id=email, is_primary=1))
-	contact.append("links", dict(link_doctype=party_type, link_name=party))
+	doc.append("links", dict(link_doctype=party_type, link_name=party))
-	contact.insert()
+	return doc.insert()
 
 
 @frappe.whitelist()
@@ -684,24 +685,42 @@ def get_credit_limit(customer, company):
 
 
 def make_contact(args, is_primary_contact=1):
-	contact = frappe.get_doc(
+	values = {
-		{
 		"doctype": "Contact",
-			"first_name": args.get("name"),
 		"is_primary_contact": is_primary_contact,
 		"links": [{"link_doctype": args.get("doctype"), "link_name": args.get("name")}],
 	}
+	if args.customer_type == "Individual":
+		first, middle, last = parse_full_name(args.get("customer_name"))
+		values.update(
+			{
+				"first_name": first,
+				"middle_name": middle,
+				"last_name": last,
+			}
 		)
+	else:
+		values.update(
+			{
+				"company_name": args.get("customer_name"),
+			}
+		)
+	contact = frappe.get_doc(values)
+
 	if args.get("email_id"):
 		contact.add_email(args.get("email_id"), is_primary=True)
 	if args.get("mobile_no"):
 		contact.add_phone(args.get("mobile_no"), is_primary_mobile_no=True)
+
+	if flags := args.get("flags"):
+		contact.insert(ignore_permissions=flags.get("ignore_permissions"))
+	else:
 		contact.insert()
 
 	return contact
 
 
-def make_address(args, is_primary_address=1):
+def make_address(args, is_primary_address=1, is_shipping_address=1):
 	reqd_fields = []
 	for field in ["city", "country"]:
 		if not args.get(field):
@@ -717,16 +736,23 @@ def make_address(args, is_primary_address=1):
 	address = frappe.get_doc(
 		{
 			"doctype": "Address",
-			"address_title": args.get("name"),
+			"address_title": args.get("customer_name"),
 			"address_line1": args.get("address_line1"),
 			"address_line2": args.get("address_line2"),
 			"city": args.get("city"),
 			"state": args.get("state"),
 			"pincode": args.get("pincode"),
 			"country": args.get("country"),
+			"is_primary_address": is_primary_address,
+			"is_shipping_address": is_shipping_address,
 			"links": [{"link_doctype": args.get("doctype"), "link_name": args.get("name")}],
 		}
-	).insert()
+	)
+
+	if flags := args.get("flags"):
+		address.insert(ignore_permissions=flags.get("ignore_permissions"))
+	else:
+		address.insert()
 
 	return address
 
@@ -747,3 +773,13 @@ def get_customer_primary_contact(doctype, txt, searchfield, start, page_len, fil
 		.where((dlink.link_name == customer) & (con.name.like(f"%{txt}%")))
 		.run()
 	)
+
+
+def parse_full_name(full_name: str) -> tuple[str, str | None, str | None]:
+	"""Parse full name into first name, middle name and last name"""
+	names = full_name.split()
+	first_name = names[0]
+	middle_name = " ".join(names[1:-1]) if len(names) > 2 else None
+	last_name = names[-1] if len(names) > 1 else None
+
+	return first_name, middle_name, last_name

erpnext/selling/doctype/customer/test_customer.py

@@ -10,7 +10,11 @@ from frappe.utils import flt
 
 from erpnext.accounts.party import get_due_date
 from erpnext.exceptions import PartyDisabled, PartyFrozen
-from erpnext.selling.doctype.customer.customer import get_credit_limit, get_customer_outstanding
+from erpnext.selling.doctype.customer.customer import (
+	get_credit_limit,
+	get_customer_outstanding,
+	parse_full_name,
+)
 from erpnext.tests.utils import create_test_contact_and_address
 
 test_ignore = ["Price List"]
@@ -373,6 +377,22 @@ class TestCustomer(FrappeTestCase):
 
 		frappe.db.set_value("Selling Settings", None, "cust_master_name", "Customer Name")
 
+	def test_parse_full_name(self):
+		first, middle, last = parse_full_name("John")
+		self.assertEqual(first, "John")
+		self.assertEqual(middle, None)
+		self.assertEqual(last, None)
+
+		first, middle, last = parse_full_name("John Doe")
+		self.assertEqual(first, "John")
+		self.assertEqual(middle, None)
+		self.assertEqual(last, "Doe")
+
+		first, middle, last = parse_full_name("John Michael Doe")
+		self.assertEqual(first, "John")
+		self.assertEqual(middle, "Michael")
+		self.assertEqual(last, "Doe")
+
 
 def get_customer_dict(customer_name):
 	return {

erpnext/startup/leaderboard.py

@@ -1,5 +1,5 @@
 import frappe
-from frappe.utils import cint
+from frappe.utils.deprecations import deprecated
 
 
 def get_leaderboards():
@@ -54,12 +54,13 @@ def get_leaderboards():
 
 @frappe.whitelist()
 def get_all_customers(date_range, company, field, limit=None):
-	if field == "outstanding_amount":
 	filters = [["docstatus", "=", "1"], ["company", "=", company]]
-		if date_range:
+	from_date, to_date = parse_date_range(date_range)
-			date_range = frappe.parse_json(date_range)
+	if field == "outstanding_amount":
-			filters.append(["posting_date", ">=", "between", [date_range[0], date_range[1]]])
+		if from_date and to_date:
-		return frappe.db.get_all(
+			filters.append(["posting_date", "between", [from_date, to_date]])
+
+		return frappe.get_list(
 			"Sales Invoice",
 			fields=["customer as name", "sum(outstanding_amount) as value"],
 			filters=filters,
@@ -69,26 +70,20 @@ def get_all_customers(date_range, company, field, limit=None):
 		)
 	else:
 		if field == "total_sales_amount":
-			select_field = "sum(so_item.base_net_amount)"
+			select_field = "base_net_total"
 		elif field == "total_qty_sold":
-			select_field = "sum(so_item.stock_qty)"
+			select_field = "total_qty"
 
-		date_condition = get_date_condition(date_range, "so.transaction_date")
+		if from_date and to_date:
+			filters.append(["transaction_date", "between", [from_date, to_date]])
 
-		return frappe.db.sql(
+		return frappe.get_list(
-			"""
+			"Sales Order",
-			select so.customer as name, {0} as value
+			fields=["customer as name", f"sum({select_field}) as value"],
-			FROM `tabSales Order` as so JOIN `tabSales Order Item` as so_item
+			filters=filters,
-				ON so.name = so_item.parent
+			group_by="customer",
-			where so.docstatus = 1 {1} and so.company = %s
+			order_by="value desc",
-			group by so.customer
+			limit=limit,
-			order by value DESC
-			limit %s
-		""".format(
-				select_field, date_condition
-			),
-			(company, cint(limit)),
-			as_dict=1,
 		)
 
 
@@ -96,55 +91,58 @@ def get_all_customers(date_range, company, field, limit=None):
 def get_all_items(date_range, company, field, limit=None):
 	if field in ("available_stock_qty", "available_stock_value"):
 		select_field = "sum(actual_qty)" if field == "available_stock_qty" else "sum(stock_value)"
-		return frappe.db.get_all(
+		results = frappe.db.get_all(
 			"Bin",
 			fields=["item_code as name", "{0} as value".format(select_field)],
 			group_by="item_code",
 			order_by="value desc",
 			limit=limit,
 		)
+		readable_active_items = set(frappe.get_list("Item", filters={"disabled": 0}, pluck="name"))
+		return [item for item in results if item["name"] in readable_active_items]
 	else:
 		if field == "total_sales_amount":
-			select_field = "sum(order_item.base_net_amount)"
+			select_field = "base_net_amount"
 			select_doctype = "Sales Order"
 		elif field == "total_purchase_amount":
-			select_field = "sum(order_item.base_net_amount)"
+			select_field = "base_net_amount"
 			select_doctype = "Purchase Order"
 		elif field == "total_qty_sold":
-			select_field = "sum(order_item.stock_qty)"
+			select_field = "stock_qty"
 			select_doctype = "Sales Order"
 		elif field == "total_qty_purchased":
-			select_field = "sum(order_item.stock_qty)"
+			select_field = "stock_qty"
 			select_doctype = "Purchase Order"
 
-		date_condition = get_date_condition(date_range, "sales_order.transaction_date")
+		filters = [["docstatus", "=", "1"], ["company", "=", company]]
+		from_date, to_date = parse_date_range(date_range)
+		if from_date and to_date:
+			filters.append(["transaction_date", "between", [from_date, to_date]])
 
-		return frappe.db.sql(
+		child_doctype = f"{select_doctype} Item"
-			"""
+		return frappe.get_list(
-			select order_item.item_code as name, {0} as value
+			select_doctype,
-			from `tab{1}` sales_order join `tab{1} Item` as order_item
+			fields=[
-				on sales_order.name = order_item.parent
+				f"`tab{child_doctype}`.item_code as name",
-			where sales_order.docstatus = 1
+				f"sum(`tab{child_doctype}`.{select_field}) as value",
-				and sales_order.company = %s {2}
+			],
-			group by order_item.item_code
+			filters=filters,
-			order by value desc
+			order_by="value desc",
-			limit %s
+			group_by=f"`tab{child_doctype}`.item_code",
-		""".format(
+			limit=limit,
-				select_field, select_doctype, date_condition
+		)
-			),
-			(company, cint(limit)),
-			as_dict=1,
-		)  # nosec
 
 
 @frappe.whitelist()
 def get_all_suppliers(date_range, company, field, limit=None):
-	if field == "outstanding_amount":
 	filters = [["docstatus", "=", "1"], ["company", "=", company]]
-		if date_range:
+	from_date, to_date = parse_date_range(date_range)
-			date_range = frappe.parse_json(date_range)
+
-			filters.append(["posting_date", "between", [date_range[0], date_range[1]]])
+	if field == "outstanding_amount":
-		return frappe.db.get_all(
+		if from_date and to_date:
+			filters.append(["posting_date", "between", [from_date, to_date]])
+
+		return frappe.get_list(
 			"Purchase Invoice",
 			fields=["supplier as name", "sum(outstanding_amount) as value"],
 			filters=filters,
@@ -154,48 +152,40 @@ def get_all_suppliers(date_range, company, field, limit=None):
 		)
 	else:
 		if field == "total_purchase_amount":
-			select_field = "sum(purchase_order_item.base_net_amount)"
+			select_field = "base_net_total"
 		elif field == "total_qty_purchased":
-			select_field = "sum(purchase_order_item.stock_qty)"
+			select_field = "total_qty"
 
-		date_condition = get_date_condition(date_range, "purchase_order.modified")
+		if from_date and to_date:
+			filters.append(["transaction_date", "between", [from_date, to_date]])
 
-		return frappe.db.sql(
+		return frappe.get_list(
-			"""
+			"Purchase Order",
-			select purchase_order.supplier as name, {0} as value
+			fields=["supplier as name", f"sum({select_field}) as value"],
-			FROM `tabPurchase Order` as purchase_order LEFT JOIN `tabPurchase Order Item`
+			filters=filters,
-				as purchase_order_item ON purchase_order.name = purchase_order_item.parent
+			group_by="supplier",
-			where
+			order_by="value desc",
-				purchase_order.docstatus = 1
+			limit=limit,
-				{1}
+		)
-				and  purchase_order.company = %s
-			group by purchase_order.supplier
-			order by value DESC
-			limit %s""".format(
-				select_field, date_condition
-			),
-			(company, cint(limit)),
-			as_dict=1,
-		)  # nosec
 
 
 @frappe.whitelist()
 def get_all_sales_partner(date_range, company, field, limit=None):
 	if field == "total_sales_amount":
-		select_field = "sum(`base_net_total`)"
+		select_field = "base_net_total"
 	elif field == "total_commission":
-		select_field = "sum(`total_commission`)"
+		select_field = "total_commission"
 
-	filters = {"sales_partner": ["!=", ""], "docstatus": 1, "company": company}
+	filters = [["docstatus", "=", "1"], ["company", "=", company], ["sales_partner", "is", "set"]]
-	if date_range:
+	from_date, to_date = parse_date_range(date_range)
-		date_range = frappe.parse_json(date_range)
+	if from_date and to_date:
-		filters["transaction_date"] = ["between", [date_range[0], date_range[1]]]
+		filters.append(["transaction_date", "between", [from_date, to_date]])
 
 	return frappe.get_list(
 		"Sales Order",
 		fields=[
-			"`sales_partner` as name",
+			"sales_partner as name",
-			"{} as value".format(select_field),
+			f"sum({select_field}) as value",
 		],
 		filters=filters,
 		group_by="sales_partner",
@@ -206,27 +196,29 @@ def get_all_sales_partner(date_range, company, field, limit=None):
 
 @frappe.whitelist()
 def get_all_sales_person(date_range, company, field=None, limit=0):
-	date_condition = get_date_condition(date_range, "sales_order.transaction_date")
+	filters = [
+		["docstatus", "=", "1"],
+		["company", "=", company],
+		["Sales Team", "sales_person", "is", "set"],
+	]
+	from_date, to_date = parse_date_range(date_range)
+	if from_date and to_date:
+		filters.append(["transaction_date", "between", [from_date, to_date]])
 
-	return frappe.db.sql(
+	return frappe.get_list(
-		"""
+		"Sales Order",
-		select sales_team.sales_person as name, sum(sales_order.base_net_total) as value
+		fields=[
-		from `tabSales Order` as sales_order join `tabSales Team` as sales_team
+			"`tabSales Team`.sales_person as name",
-			on sales_order.name = sales_team.parent and sales_team.parenttype = 'Sales Order'
+			"sum(`tabSales Team`.allocated_amount) as value",
-		where sales_order.docstatus = 1
+		],
-			and sales_order.company = %s
+		filters=filters,
-			{date_condition}
+		group_by="`tabSales Team`.sales_person",
-		group by sales_team.sales_person
+		order_by="value desc",
-		order by value DESC
+		limit=limit,
-		limit %s
-	""".format(
-			date_condition=date_condition
-		),
-		(company, cint(limit)),
-		as_dict=1,
 	)
 
 
+@deprecated
 def get_date_condition(date_range, field):
 	date_condition = ""
 	if date_range:
@@ -236,3 +228,11 @@ def get_date_condition(date_range, field):
 			field, frappe.db.escape(from_date), frappe.db.escape(to_date)
 		)
 	return date_condition
+
+
+def parse_date_range(date_range):
+	if date_range:
+		date_range = frappe.parse_json(date_range)
+		return date_range[0], date_range[1]
+
+	return None, None

erpnext/stock/report/stock_balance/stock_balance.py

@@ -397,7 +397,7 @@ class StockBalanceReport(object):
 					"fieldname": "bal_val",
 					"fieldtype": "Currency",
 					"width": 100,
-					"options": "currency",
+					"options": "Company:company:default_currency",
 				},
 				{
 					"label": _("Opening Qty"),
@@ -411,7 +411,7 @@ class StockBalanceReport(object):
 					"fieldname": "opening_val",
 					"fieldtype": "Currency",
 					"width": 110,
-					"options": "currency",
+					"options": "Company:company:default_currency",
 				},
 				{
 					"label": _("In Qty"),