fix: conflicts

(cherry picked from commit a4453fb77b)

# Conflicts:
#	erpnext/accounts/doctype/subscription/subscription.py
#	erpnext/accounts/doctype/subscription/test_subscription.py

erpnext/accounts/doctype/subscription/subscription.py

@@ -369,8 +369,8 @@ class Subscription(Document):
 			if frappe.db.get_value("Supplier", self.party, "tax_withholding_category"):
 				invoice.apply_tds = 1
 
-		### Add party currency to invoice
-		invoice.currency = get_party_account_currency(self.party_type, self.party, self.company)
+		# Add currency to invoice
+		invoice.currency = frappe.db.get_value("Subscription Plan", {"name": self.plans[0].plan}, "currency")
 
 		## Add dimensions in invoice for subscription:
 		accounting_dimensions = get_accounting_dimensions()

erpnext/accounts/doctype/subscription/test_subscription.py

@@ -3,7 +3,7 @@
 
 
 import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests.utils import FrappeTestCase, change_settings
 from frappe.utils.data import (
 	add_days,
 	add_months,
@@ -87,6 +87,12 @@ def create_parties():
 		customer.append("accounts", {"company": "_Test Company", "account": "_Test Receivable USD - _TC"})
 		customer.insert()
 
+	if not frappe.db.exists("Customer", "_Test Subscription Customer Multi Currency"):
+		customer = frappe.new_doc("Customer")
+		customer.customer_name = "Test Subscription Customer Multi Currency"
+		customer.default_currency = "USD"
+		customer.insert()
+
 
 class TestSubscription(FrappeTestCase):
 	def setUp(self):
@@ -705,14 +711,38 @@ class TestSubscription(FrappeTestCase):
 		subscription.append("plans", {"plan": "_Test Plan Name 4", "qty": 1})
 		subscription.save()
 
-		subscription.process()
-
 		self.assertEqual(len(subscription.invoices), 1)
 		pi = frappe.get_doc("Purchase Invoice", subscription.invoices[0].invoice)
 		self.assertEqual(pi.total, 55333.33)
 
 		subscription.delete()
 
+	@change_settings(
+		"Accounts Settings",
+		{"allow_multi_currency_invoices_against_single_party_account": 1},
+	)
+	def test_multi_currency_subscription_with_default_company_currency(self):
+		party = "Test Subscription Customer Multi Currency"
+		frappe.db.set_value("Customer", party, "default_currency", "USD")
+
+		subscription = frappe.new_doc("Subscription")
+		subscription.party_type = "Customer"
+		subscription.party = party
+		subscription.generate_invoice_at_period_start = 1
+		subscription.company = "_Test Company"
+		# select subscription start date as '2018-01-15'
+		subscription.start_date = "2018-01-01"
+		subscription.append("plans", {"plan": "_Test Plan Multicurrency", "qty": 1})
+		subscription.save()
+
+		subscription.process(posting_date="2018-01-01")
+		self.assertEqual(len(subscription.invoices), 1)
+		self.assertEqual(subscription.status, "Unpaid")
+
+		# Check the currency of the created invoice
+		currency = frappe.db.get_value("Sales Invoice", subscription.invoices[0].name, "currency")
+		self.assertEqual(currency, "USD")
+
 	def test_future_subscription(self):
 		"""Force-Fetch should not process future subscriptions"""
 		subscription = frappe.new_doc("Subscription")