inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-20 05:46:34 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master' into settings-refactor

Browse Source
This commit is contained in:
Oliver
2021-07-27 14:28:17 +10:00
parent cfd4626c96 985870d626
commit 7fdc0546b4
27 changed files with 98667 additions and 26579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
InvenTree/templates/js/api.js
View File

@ -147,8 +147,7 @@ function inventreeDelete(url, options={}) {
options.method = 'DELETE';
inventreePut(url, {}, options);
return inventreePut(url, {}, options);
}

2
InvenTree/templates/js/company.js
View File

@ -349,7 +349,7 @@ function deleteManufacturerParts(selections, options={}) {
});
// Wait for all the requests to complete
$.when.apply($, requests).then(function() {
$.when.apply($, requests).done(function() {
if (options.onSuccess) {
options.onSuccess();

4
InvenTree/templates/js/stock.js
View File

@ -287,7 +287,7 @@ function adjustStock(action, items, options={}) {
});
// Wait for *all* the requests to complete
$.when.apply($, requests).then(function() {
$.when.apply($, requests).done(function() {
// Destroy the modal window
$(modal).modal('hide');
@ -1265,7 +1265,7 @@ function loadStockTable(table, options) {
);
});
$.when.apply($, requests).then(function() {
$.when.apply($, requests).done(function() {
$("#stock-table").bootstrapTable('refresh');
});
})