nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Translation Syntax

Browse Source
This commit is contained in:
Rohit Waghchaure
2020-10-22 13:51:09 +05:30
parent fa842e8774
commit 558879fad7
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/doctype/delivery_note/test_delivery_note.py
View File

@@ -57,7 +57,7 @@ class TestDeliveryNote(unittest.TestCase):
sle = frappe.get_doc("Stock Ledger Entry", {"voucher_type": "Delivery Note", "voucher_no": dn.name}) 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)) self.assertFalse(get_gl_entries("Delivery Note", dn.name))

6
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -1321,8 +1321,10 @@ class StockEntry(StockController):
for sr in get_serial_nos(item.serial_no): for sr in get_serial_nos(item.serial_no):
sales_order = frappe.db.get_value("Serial No", sr, "sales_order") sales_order = frappe.db.get_value("Serial No", sr, "sales_order")
if sales_order: if sales_order:
frappe.throw(_("Item {0} (Serial No: {1}) cannot be consumed as is reserverd\ msg = (_("(Serial No: {0}) cannot be consumed as it's reserverd to fullfill Sales Order {1}.")
to fullfill Sales Order {2}.").format(item.item_code, sr, sales_order)) .format(sr, sales_order))
frappe.throw(_("Item {0} {1}").format(item.item_code, msg))
def update_transferred_qty(self): def update_transferred_qty(self):
if self.purpose == 'Material Transfer' and self.outgoing_stock_entry: if self.purpose == 'Material Transfer' and self.outgoing_stock_entry: