nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 15:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: conflicts

Browse Source
This commit is contained in:
s-aga-r
2023-04-12 18:58:04 +05:30
parent 866f98ac15
commit 73f16752a6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/stock_ledger.py
View File

@@ -1010,7 +1010,7 @@ class update_entries_after(object):
msg_list = [] msg_list = []
for warehouse, exceptions in self.exceptions.items(): for warehouse, exceptions in self.exceptions.items():
deficiency = min(e["diff"] for e in exceptions) deficiency = min(e["diff"] for e in exceptions)
msg_prefix = _("As {} units are reserved, ").format(frappe.bold(self.reserved_stock)) msg_prefix = _("As {} units are reserved").format(frappe.bold(self.reserved_stock))
if ( if (
exceptions[0]["voucher_type"], exceptions[0]["voucher_type"],
@@ -1036,7 +1036,7 @@ class update_entries_after(object):
if msg: if msg:
if self.reserved_stock: if self.reserved_stock:
msg = msg_prefix + msg msg = "{0}, {1}".format(msg_prefix, msg)
msg_list.append(msg) msg_list.append(msg)