inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-18 21:15:41 +00:00
Code Activity

Merge branch 'master' of github.com:inventree/InvenTree into ipn_edit_setting

Browse Source
This commit is contained in:
eeintech
2021-03-15 08:50:31 -04:00
parent b152f7041b 247cbe0154
commit 7b81a470b9
10 changed files with 783 additions and 1383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
InvenTree/templates/js/modals.js
View File

@ -739,9 +739,10 @@ function handleModalForm(url, options) {
// Form was returned, invalid!
else {
var warningDiv = $(modal).find('#form-validation-warning');
warningDiv.css('display', 'block');
if (!options.hideErrorMessage) {
var warningDiv = $(modal).find('#form-validation-warning');
warningDiv.css('display', 'block');
}
if (response.html_form) {
injectModalForm(modal, response.html_form);

7
InvenTree/templates/js/table_filters.js
View File

@ -96,10 +96,15 @@ function getAvailableTableFilters(tableKey) {
title: '{% trans "Active parts" %}',
description: '{% trans "Show stock for active parts" %}',
},
assembly: {
type: 'bool',
title: '{% trans "Assembly" %}',
description: '{% trans "Part is an assembly" %}',
},
allocated: {
type: 'bool',
title: '{% trans "Is allocated" %}',
description: '{% trans "Item has been alloacted" %}',
description: '{% trans "Item has been allocated" %}',
},
cascade: {
type: 'bool',