2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-26 10:57:40 +00:00

Merge branch 'master' into matmair/issue2694

This commit is contained in:
Matthias Mair
2022-03-20 02:29:20 +01:00
committed by GitHub
38 changed files with 9082 additions and 8844 deletions

View File

@@ -2298,15 +2298,7 @@ function loadSalesOrderAllocationTable(table, options={}) {
field: 'location',
title: '{% trans "Location" %}',
formatter: function(value, row) {
if (!value) {
return '{% trans "Location not specified" %}';
}
var link = `/stock/location/${value}`;
var text = row.location_detail.description;
return renderLink(text, link);
return locationDetail(row.item_detail, true);
}
},
{