fix: conflicts

erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py

@@ -178,9 +178,6 @@ def test_period_closing_with_finance_book_entries(self):
 
 		self.assertEqual(pcv_gle, expected_gle)
 
-<<<<<<< HEAD
-	def make_period_closing_voucher(self, submit=True):
-=======
 	def test_gl_entries_restrictions(self):
 		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
 		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")
@@ -202,101 +199,6 @@ def test_gl_entries_restrictions(self):
 		jv1.save()
 
 		self.assertRaises(frappe.ValidationError, jv1.submit)
-
-	def test_closing_balance_with_dimensions_and_test_reposting_entry(self):
-		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabPeriod Closing Voucher` where company='Test PCV Company'")
-		frappe.db.sql("delete from `tabAccount Closing Balance` where company='Test PCV Company'")
-
-		company = create_company()
-		cost_center1 = create_cost_center("Test Cost Center 1")
-		cost_center2 = create_cost_center("Test Cost Center 2")
-
-		jv1 = make_journal_entry(
-			posting_date="2021-03-15",
-			amount=400,
-			account1="Cash - TPC",
-			account2="Sales - TPC",
-			cost_center=cost_center1,
-			save=False,
-		)
-		jv1.company = company
-		jv1.save()
-		jv1.submit()
-
-		jv2 = make_journal_entry(
-			posting_date="2021-03-15",
-			amount=200,
-			account1="Cash - TPC",
-			account2="Sales - TPC",
-			cost_center=cost_center2,
-			save=False,
-		)
-		jv2.company = company
-		jv2.save()
-		jv2.submit()
-
-		pcv1 = self.make_period_closing_voucher(posting_date="2021-03-31")
-
-		closing_balance = frappe.db.get_value(
-			"Account Closing Balance",
-			{
-				"account": "Sales - TPC",
-				"cost_center": cost_center1,
-				"period_closing_voucher": pcv1.name,
-				"is_period_closing_voucher_entry": 0,
-			},
-			["credit", "credit_in_account_currency"],
-			as_dict=1,
-		)
-
-		self.assertEqual(closing_balance.credit, 400)
-		self.assertEqual(closing_balance.credit_in_account_currency, 400)
-
-		jv3 = make_journal_entry(
-			posting_date="2022-03-15",
-			amount=300,
-			account1="Cash - TPC",
-			account2="Sales - TPC",
-			cost_center=cost_center2,
-			save=False,
-		)
-
-		jv3.company = company
-		jv3.save()
-		jv3.submit()
-
-		pcv2 = self.make_period_closing_voucher(posting_date="2022-03-31")
-
-		cc1_closing_balance = frappe.db.get_value(
-			"Account Closing Balance",
-			{
-				"account": "Sales - TPC",
-				"cost_center": cost_center1,
-				"period_closing_voucher": pcv2.name,
-				"is_period_closing_voucher_entry": 0,
-			},
-			["credit", "credit_in_account_currency"],
-			as_dict=1,
-		)
-
-		cc2_closing_balance = frappe.db.get_value(
-			"Account Closing Balance",
-			{
-				"account": "Sales - TPC",
-				"cost_center": cost_center2,
-				"period_closing_voucher": pcv2.name,
-				"is_period_closing_voucher_entry": 0,
-			},
-			["credit", "credit_in_account_currency"],
-			as_dict=1,
-		)
-
-		self.assertEqual(cc1_closing_balance.credit, 400)
-		self.assertEqual(cc1_closing_balance.credit_in_account_currency, 400)
-		self.assertEqual(cc2_closing_balance.credit, 500)
-		self.assertEqual(cc2_closing_balance.credit_in_account_currency, 500)
-
 		warehouse = frappe.db.get_value("Warehouse", {"company": company}, "name")
 
 		repost_doc = frappe.get_doc(
@@ -315,8 +217,7 @@ def test_closing_balance_with_dimensions_and_test_reposting_entry(self):
 		repost_doc.posting_date = today()
 		repost_doc.save()
 
-	def make_period_closing_voucher(self, posting_date=None, submit=True):
->>>>>>> f751727149 (fix: don't allow to make reposting for the closed period)
+	def make_period_closing_voucher(self, submit=True):
 		surplus_account = create_account()
 		cost_center = create_cost_center("Test Cost Center 1")
 		pcv = frappe.get_doc(