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 fr-1421-sso

Browse Source
This commit is contained in:
Matthias Mair
2021-09-29 00:41:25 +02:00
committed by GitHub
parent 44c5003839 344383d3d4
commit acbea53a3d
8 changed files with 86 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/templates/js/translated/bom.js
View File

@ -271,7 +271,7 @@ function loadBomTable(table, options) {
sortable: true,
formatter: function(value, row) {
var url = `/part/${row.sub_part_detail.pk}/?display=stock`;
var url = `/part/${row.sub_part_detail.pk}/?display=part-stock`;
var text = value;
if (value == null || value <= 0) {

23
InvenTree/templates/js/translated/part.js
View File

@ -94,7 +94,12 @@ function partFields(options={}) {
},
default_location: {
},
default_supplier: {},
default_supplier: {
filters: {
part_detail: true,
supplier_detail: true,
}
},
default_expiry: {
icon: 'fa-calendar-alt',
},
@ -315,6 +320,9 @@ function editPart(pk) {
edit: true
});
// Filter supplied parts by the Part ID
fields.default_supplier.filters.part = pk;
var groups = partGroups({});
constructForm(url, {
@ -338,6 +346,9 @@ function duplicatePart(pk, options={}) {
duplicate: pk,
});
// Remove "default_supplier" field
delete fields['default_supplier'];
// If we are making a "variant" part
if (options.variant) {
@ -528,7 +539,7 @@ function loadPartVariantTable(table, partId, options={}) {
field: 'in_stock',
title: '{% trans "Stock" %}',
formatter: function(value, row) {
return renderLink(value, `/part/${row.pk}/?display=stock`);
return renderLink(value, `/part/${row.pk}/?display=part-stock`);
}
}
];
@ -934,7 +945,7 @@ function loadPartTable(table, url, options={}) {
title: '{% trans "Stock" %}',
searchable: false,
formatter: function(value, row) {
var link = 'stock';
var link = '?display=part-stock';
if (value) {
// There IS stock available for this part
@ -947,17 +958,17 @@ function loadPartTable(table, url, options={}) {
} else if (row.on_order) {
// There is no stock available, but stock is on order
value = `0<span class='label label-right label-primary'>{% trans "On Order" %}: ${row.on_order}</span>`;
link = 'orders';
link = '?display=purchase-orders';
} else if (row.building) {
// There is no stock available, but stock is being built
value = `0<span class='label label-right label-info'>{% trans "Building" %}: ${row.building}</span>`;
link = 'builds';
link = '?display=build-orders';
} else {
// There is no stock available
value = `0<span class='label label-right label-danger'>{% trans "No Stock" %}</span>`;
}
return renderLink(value, `/part/${row.pk}/${link}/`);
return renderLink(value, `/part/${row.pk}/${link}`);
}
};

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

@ -1019,7 +1019,7 @@ function loadStockTable(table, options) {
return '-';
}
var link = `/supplier-part/${row.supplier_part}/?display=stock`;
var link = `/supplier-part/${row.supplier_part}/?display=part-stock`;
var text = '';