Merge remote-tracking branch 'inventree/master'

This commit is contained in:
Oliver Walters 2019-09-07 15:03:54 +10:00
commit d6ca21273d
2 changed files with 33 additions and 0 deletions

View File

@ -82,6 +82,32 @@ function loadStockTable(table, options) {
});
return stock;
} else if (field == 'batch') {
var batches = [];
data.forEach(function(item) {
var batch = item.batch;
if (!batch || batch == '') {
batch = '-';
}
if (!batches.includes(batch)) {
batches.push(batch);
}
});
if (batches.length > 1) {
return "" + batches.length + " batches";
} else if (batches.length == 1) {
if (batches[0]) {
return batches[0];
} else {
return '-';
}
} else {
return '-';
}
} else if (field == 'location__path') {
/* Determine how many locations */
var locations = [];
@ -165,6 +191,11 @@ function loadStockTable(table, options) {
return text;
}
},
{
field: 'batch',
title: 'Batch',
sortable: true,
},
{
field: 'location__path',
title: 'Location',

View File

@ -130,6 +130,7 @@
<td><i>Part can be purchased from external suppliers</i></td>
{% endif %}
</tr>
{% if 0 %}
<tr>
<td><b>Sellable</b></td>
<td>{% include "slide.html" with state=part.salable field='salable' %}</td>
@ -139,6 +140,7 @@
<td><i>Part cannot be sold to customers</i></td>
{% endif %}
</tr>
{% endif %}
</table>
</div>
</div>