inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-19 05:25:42 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master' into build-fixes

Browse Source 
# Conflicts:
#	InvenTree/InvenTree/views.py
#	InvenTree/build/views.py
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/order/views.py
#	InvenTree/part/api.py
#	InvenTree/part/views.py
#	InvenTree/templates/js/bom.js
This commit is contained in:
Oliver Walters
2020-10-30 22:44:25 +11:00
parent 90cfb3496a ad90adbc04
commit 3a702266e6
20 changed files with 1467 additions and 1132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
InvenTree/templates/js/bom.js
View File

@ -102,7 +102,7 @@ function loadBomTable(table, options) {
*
* BOM data are retrieved from the server via AJAX query
*/
var params = {
part: options.parent_id,
ordering: 'name',
@ -111,22 +111,22 @@ function loadBomTable(table, options) {
if (options.part_detail) {
params.part_detail = true;
}
if (options.sub_part_detail) {
params.sub_part_detail = true;
}
params.sub_part_detail = true;
var filters = {};
if (!options.disableFilters) {
filters = loadTableFilters("bom");
filters = loadTableFilters('bom');
}
for (var key in params) {
filters[key] = params[key];
}
setupFilterList("bom", $(table));
setupFilterList('bom', $(table));
// Construct the table columns
var cols = [];
@ -161,7 +161,7 @@ function loadBomTable(table, options) {
}
if (sub_part.is_template) {
html += makeIconBadge('fa-clone', '{% trans "Templat part" %}');
html += makeIconBadge('fa-clone', '{% trans "Template part" %}');
}
// Display an extra icon if this part is an assembly
@ -357,7 +357,7 @@ function loadBomTable(table, options) {
return {classes: 'rowinvalid'};
}
},
formatNoMatches: function() { return "{% trans "No BOM items found" %}"; },
formatNoMatches: function() { return '{% trans "No BOM items found" %}'; },
clickToSelect: true,
queryParams: filters,
original: params,