inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-19 21:45:39 +00:00
Code Activity

Merge branch 'inventree:master' into matmair/issue2279

Browse Source
This commit is contained in:
Matthias Mair
2022-02-28 00:45:58 +01:00
committed by GitHub
parent 0e40a78705 94fce5ce59
commit 86ba69eeaf
35 changed files with 3473 additions and 3366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/templates/js/translated/stock.js
View File

@ -1554,11 +1554,11 @@ function locationDetail(row, showLink=true) {
} else if (row.belongs_to) {
// StockItem is installed inside a different StockItem
text = `{% trans "Installed in Stock Item" %} ${row.belongs_to}`;
url = `/stock/item/${row.belongs_to}/installed/`;
url = `/stock/item/${row.belongs_to}/?display=installed-items`;
} else if (row.customer) {
// StockItem has been assigned to a customer
text = '{% trans "Shipped to customer" %}';
url = `/company/${row.customer}/assigned-stock/`;
url = `/company/${row.customer}/?display=assigned-stock`;
} else if (row.sales_order) {
// StockItem has been assigned to a sales order
text = '{% trans "Assigned to Sales Order" %}';