fix: Conflicts

erpnext/selling/doctype/sales_order/test_sales_order.py

@@ -9,12 +9,8 @@ from frappe.core.doctype.user_permission.test_user_permission import create_user
 from frappe.tests.utils import FrappeTestCase, change_settings
 from frappe.utils import add_days, flt, getdate, nowdate, today
 
-<<<<<<< HEAD
 from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
-from erpnext.controllers.accounts_controller import update_child_qty_rate
-=======
 from erpnext.controllers.accounts_controller import InvalidQtyError, update_child_qty_rate
->>>>>>> b2d8a44199 (test: Add, expand and refine test-cases for zero-quantity transactions.)
 from erpnext.maintenance.doctype.maintenance_schedule.test_maintenance_schedule import (
 	make_maintenance_schedule,
 )

erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

@@ -10,11 +10,8 @@ import erpnext
 import erpnext.controllers
 import erpnext.controllers.status_updater
 from erpnext.accounts.doctype.account.test_account import get_inventory_account
-<<<<<<< HEAD
 from erpnext.buying.doctype.supplier.test_supplier import create_supplier
-=======
 from erpnext.controllers.accounts_controller import InvalidQtyError
->>>>>>> b2d8a44199 (test: Add, expand and refine test-cases for zero-quantity transactions.)
 from erpnext.controllers.buying_controller import QtyMismatchError
 from erpnext.stock import get_warehouse_account_map
 from erpnext.stock.doctype.item.test_item import create_item, make_item
@@ -3384,7 +3381,6 @@ class TestPurchaseReceipt(FrappeTestCase):
 		self.assertEqual(pr.status, "Completed")
 
 	def test_internal_transfer_for_batch_items_with_cancel(self):
-		from erpnext.controllers.sales_and_purchase_return import make_return_doc
 		from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_purchase_receipt
 		from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
 
@@ -3500,7 +3496,6 @@ class TestPurchaseReceipt(FrappeTestCase):
 		frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 1)
 
 	def test_internal_transfer_for_batch_items_with_cancel_use_serial_batch_fields(self):
-		from erpnext.controllers.sales_and_purchase_return import make_return_doc
 		from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_purchase_receipt
 		from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
 
@@ -4082,7 +4077,6 @@ class TestPurchaseReceipt(FrappeTestCase):
 			make_purchase_receipt as _make_purchase_receipt,
 		)
 		from erpnext.buying.doctype.purchase_order.test_purchase_order import (
-			create_pr_against_po,
 			create_purchase_order,
 		)
 

erpnext/stock/doctype/stock_entry/stock_entry.py

@@ -23,14 +23,7 @@ from frappe.utils import (
 
 import erpnext
 from erpnext.accounts.general_ledger import process_gl_map
-<<<<<<< HEAD
-<<<<<<< HEAD
 from erpnext.buying.utils import check_on_hold_or_closed_status
-=======
-from erpnext.controllers.accounts_controller import InvalidQtyError
->>>>>>> b2d8a44199 (test: Add, expand and refine test-cases for zero-quantity transactions.)
-=======
->>>>>>> 4918aeb4c6 (refactor: Consolidate duplicate zero-quantity transaction Items checks.)
 from erpnext.controllers.taxes_and_totals import init_landed_taxes_and_totals
 from erpnext.manufacturing.doctype.bom.bom import (
 	add_additional_cost,

erpnext/translations/tr.csv

@@ -2271,14 +2271,8 @@ Row {0}: Party Type and Party is required for Receivable / Payable account {1},S
 Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Satır {0}: Satış / Satınalma Siparişi karşı Ödeme hep avans olarak işaretlenmiş olmalıdır,
 Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Satır {0}: Kontrol edin Hesabı karşı 'Advance mı' {1} Bu bir avans girişi ise.,
 Row {0}: Please set at Tax Exemption Reason in Sales Taxes and Charges,{0} Satırı: Lütfen Satış Vergileri ve Masraflarında Vergi Muafiyeti Nedeni ayarını yapın,
-<<<<<<< HEAD
-Row {0}: Please set the Mode of Payment in Payment Schedule,Satır {0} : Lütfen Ödeme Planında Ödeme Şeklini ayarlayın,
-Row {0}: Please set the correct code on Mode of Payment {1},Satır {0} : Lütfen {1} Ödeme Şeklinde doğru kodu ayarlayın,
-Row {0}: Qty is mandatory,Satır {0}: Miktar zorunludur,
-=======
 Row {0}: Please set the Mode of Payment in Payment Schedule,{0} Satırı: Lütfen Ödeme Planında Ödeme Modu ayarı,
 Row {0}: Please set the correct code on Mode of Payment {1},{0} Satırı: Lütfen {1} Ödeme Modunda doğru kodu ayarı,
->>>>>>> 3688d9412e (chore: Adapt translations to reworded message.)
 Row {0}: Quality Inspection rejected for item {1},{0} Satırı: {1} kalem için Kalite Denetimi reddedildi,
 Row {0}: UOM Conversion Factor is mandatory,Satır {0}: Ölçü Birimi Dönüşüm Faktörü Hizmetleri,
 Row {0}: select the workstation against the operation {1},{0} bilgisi: {1} işlemine karşı iş istasyonunu seçin,