From 558879fad78619916aa57cbecc49f483b488df20 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 22 Oct 2020 13:51:09 +0530 Subject: [PATCH] fix: Translation Syntax --- erpnext/stock/doctype/delivery_note/test_delivery_note.py | 2 +- erpnext/stock/doctype/stock_entry/stock_entry.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py index 43aed5d3f2d..01686134158 100644 --- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py @@ -57,7 +57,7 @@ class TestDeliveryNote(unittest.TestCase): sle = frappe.get_doc("Stock Ledger Entry", {"voucher_type": "Delivery Note", "voucher_no": dn.name}) - self.assertEqual(sle.stock_value_difference, flt(-1*stock_queue[0][1])) + self.assertEqual(sle.stock_value_difference, flt(-1*stock_queue[0][1], 2)) self.assertFalse(get_gl_entries("Delivery Note", dn.name)) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 141e6021c0b..f9057572ef7 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -1321,8 +1321,10 @@ class StockEntry(StockController): for sr in get_serial_nos(item.serial_no): sales_order = frappe.db.get_value("Serial No", sr, "sales_order") if sales_order: - frappe.throw(_("Item {0} (Serial No: {1}) cannot be consumed as is reserverd\ - to fullfill Sales Order {2}.").format(item.item_code, sr, sales_order)) + msg = (_("(Serial No: {0}) cannot be consumed as it's reserverd to fullfill Sales Order {1}.") + .format(sr, sales_order)) + + frappe.throw(_("Item {0} {1}").format(item.item_code, msg)) def update_transferred_qty(self): if self.purpose == 'Material Transfer' and self.outgoing_stock_entry: