fix: Missing import in Leaderboard and remove translation related methods (not needed anymore) [backport/v4]

Backport of !1188 (merged)

Conflicts detected for source commit: 66a1aff1d62e37f042e68d0602f49a3c26a85f48
diff --cc erpnext/accounts/report/general_ledger/general_ledger.py
index 139d381172,6a3545dff1..0000000000
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@@ -276,6 -276,9 +276,12 @@@ def get_conditions(filters)
  	if filters.get("voucher_no"):
  		conditions.append("voucher_no=%(voucher_no)s")
  
++<<<<<<< HEAD
++=======
+ 	if filters.get("against_voucher_no"):
+ 		conditions.append("against_voucher=%(against_voucher_no)s")
+ 
++>>>>>>> 66a1aff1d62e37f042e68d0602f49a3c26a85f48
  	if filters.get("voucher_no_not_in"):
  		conditions.append("voucher_no not in %(voucher_no_not_in)s")
  
diff --cc erpnext/controllers/selling_controller.py
index f5a41afb95,5ea40f88ed..0000000000
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@@ -433,9 -433,6 +433,12 @@@ class SellingController(StockController
  
  		items = self.get("items") + (self.get("packed_items") or [])
  		for d in items:
++<<<<<<< HEAD
 +			if not frappe.get_cached_value("Item", d.item_code, "is_stock_item"):
 +				continue
 +
++=======
++>>>>>>> 66a1aff1d62e37f042e68d0602f49a3c26a85f48
  			if not self.get("return_against") or (
  				get_valuation_method(d.item_code) == "Moving Average" and self.get("is_return")
  			):
diff --cc erpnext/stock/doctype/delivery_note/test_delivery_note.py
index dae42895ed,3abd1d9e5e..0000000000
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@@ -1518,25 -1518,6 +1518,28 @@@ class TestDeliveryNote(FrappeTestCase)
  			"Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 0
  		)
  
++<<<<<<< HEAD
 +	def test_internal_transfer_for_non_stock_item(self):
 +		from erpnext.selling.doctype.customer.test_customer import create_internal_customer
 +		from erpnext.selling.doctype.sales_order.sales_order import make_delivery_note
 +
 +		item = make_item(properties={"is_stock_item": 0}).name
 +		warehouse = "_Test Warehouse - _TC"
 +		target = "Stores - _TC"
 +		company = "_Test Company"
 +		customer = create_internal_customer(represents_company=company)
 +		rate = 100
 +
 +		so = make_sales_order(item_code=item, qty=1, rate=rate, customer=customer, warehouse=warehouse)
 +		dn = make_delivery_note(so.name)
 +		dn.items[0].target_warehouse = target
 +		dn.save().submit()
 +
 +		self.assertEqual(so.items[0].rate, rate)
 +		self.assertEqual(dn.items[0].rate, so.items[0].rate)
 +
++=======
++>>>>>>> 66a1aff1d62e37f042e68d0602f49a3c26a85f48
  
  def create_delivery_note(**args):
  	dn = frappe.new_doc("Delivery Note")

---