schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Raffael Meyer
2024-03-12 12:35:17 +01:00
committed by GitHub
parent 74023035af
commit 05e4517094
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/subscription/subscription.py
View File

@@ -349,13 +349,9 @@ class Subscription(Document):
company = self.get("company") or get_default_company() company = self.get("company") or get_default_company()
if not company: if not company:
frappe.throw( 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." "Company is mandatory for generating an invoice. Please set a default company in Global Defaults."
) )
>>>>>>> 79a0473705 (fix: error message wording (#40403))
) )
invoice.company = company invoice.company = company