inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-16 20:15:44 +00:00
Code Activity

Merge branch 'master' of https://github.com/inventree/InvenTree into issue1425

Browse Source
This commit is contained in:
Matthias
2021-05-06 14:54:26 +02:00
parent 66f198baa9 39d4129157
commit b09f49aaa5
8 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/order/models.py
View File

@ -367,7 +367,7 @@ class PurchaseOrder(Order):
stock.save()
text = _("Received items")
note = f"{_('Received')} {quantity} {_('items against order')} {str(self)}"
note = _('Received {n} items against order {name}').format(n=quantity, name=str(self))
# Add a new transaction note to the newly created stock item
stock.addTransactionNote(text, user, note)

6
InvenTree/order/views.py
View File

@ -1408,7 +1408,7 @@ class SalesOrderAssignSerials(AjaxView, FormMixin):
except StockItem.DoesNotExist:
self.form.add_error(
'serials',
_('No matching item for serial') + f" '{serial}'"
_('No matching item for serial {serial}').format(serial=serial)
)
continue
@ -1418,7 +1418,7 @@ class SalesOrderAssignSerials(AjaxView, FormMixin):
if not stock_item.in_stock:
self.form.add_error(
'serials',
f"'{serial}' " + _("is not in stock")
_('{serial} is not in stock').format(serial=serial)
)
continue
@ -1426,7 +1426,7 @@ class SalesOrderAssignSerials(AjaxView, FormMixin):
if stock_item.is_allocated():
self.form.add_error(
'serials',
f"'{serial}' " + _("already allocated to an order")
_('{serial} already allocated to an order').format(serial=serial)
)
continue