From 5669a89afe4810b8ee7ab9eb0d5426e65098c958 Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Wed, 25 Oct 2023 05:43:06 +0200 Subject: [PATCH 1/2] fix: wrong german translation (#37658) (cherry picked from commit fa5780ca81ad59fd2769b5ca23935ca193d6c05d) --- erpnext/translations/de.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv index dfeb77dee5c..edd5d798049 100644 --- a/erpnext/translations/de.csv +++ b/erpnext/translations/de.csv @@ -369,7 +369,7 @@ Base,Basis, Base URL,Basis-URL, Based On,Basiert auf, Based On Payment Terms,Basierend auf Zahlungsbedingungen, -Basic,Grundeinkommen, +Basic,Basic, Batch,Charge, Batch Entries,Batch-Einträge, Batch ID is mandatory,Batch-ID ist obligatorisch, From b55b42811417831b8680f3f927e4c9e020ddb784 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 13:55:17 +0530 Subject: [PATCH 2/2] chore: fixed test case non_internal_transfer_delivery_note (backport #37671) (#37677) chore: fixed test case non_internal_transfer_delivery_note (#37671) (cherry picked from commit 2bcff4c7f2264d2408a1f98bddc78041b167a632) Co-authored-by: rohitwaghchaure --- erpnext/stock/doctype/delivery_note/test_delivery_note.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py index f4800b47bf8..bd33a7546d8 100644 --- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py @@ -1184,16 +1184,16 @@ class TestDeliveryNote(FrappeTestCase): frappe.db.rollback() frappe.db.set_single_value("Selling Settings", "dont_reserve_sales_order_qty_on_sales_return", 0) - def non_internal_transfer_delivery_note(self): + def test_non_internal_transfer_delivery_note(self): from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse dn = create_delivery_note(do_not_submit=True) - warehouse = create_warehouse("Internal Transfer Warehouse", dn.company) - dn.items[0].db_set("target_warehouse", "warehouse") + warehouse = create_warehouse("Internal Transfer Warehouse", company=dn.company) + dn.items[0].db_set("target_warehouse", warehouse) dn.reload() - self.assertEqual(dn.items[0].target_warehouse, warehouse.name) + self.assertEqual(dn.items[0].target_warehouse, warehouse) dn.save() dn.reload()