From 74023035af87384026c278db03a0bf2b4cf8e69c Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Tue, 12 Mar 2024 12:24:49 +0100
Subject: [PATCH] fix: error message wording (#40403)

(cherry picked from commit 79a047370569d9094b69e74fc1253a82b322224f)

# Conflicts:
#	erpnext/accounts/doctype/subscription/subscription.py
---
 erpnext/accounts/doctype/subscription/subscription.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/erpnext/accounts/doctype/subscription/subscription.py b/erpnext/accounts/doctype/subscription/subscription.py
index 836043d1cd4..213a2816708 100644
--- a/erpnext/accounts/doctype/subscription/subscription.py
+++ b/erpnext/accounts/doctype/subscription/subscription.py
@@ -349,7 +349,13 @@ class Subscription(Document):
 		company = self.get("company") or get_default_company()
 		if not company:
 			frappe.throw(
+<<<<<<< HEAD
 				_("Company is mandatory was generating invoice. Please set default company in Global Defaults")
+=======
+				_(
+					"Company is mandatory for generating an invoice. Please set a default company in Global Defaults."
+				)
+>>>>>>> 79a0473705 (fix: error message wording (#40403))
 			)
 
 		invoice.company = company