inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-16 12:05:53 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master'

Browse Source
This commit is contained in:
Oliver
2021-07-27 13:11:26 +10:00
parent 0561219af6 fff4f27816
commit 19c2d03717
7 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
InvenTree/InvenTree/settings.py
View File

@ -502,11 +502,24 @@ LANGUAGE_CODE = CONFIG.get('language', 'en-us')
# If a new language translation is supported, it must be added here # If a new language translation is supported, it must be added here
LANGUAGES = [ LANGUAGES = [
('en', _('English')),
('fr', _('French')),
('de', _('German')), ('de', _('German')),
('el', _('Greek')),
('en', _('English')),
('es', _('Spanish')),
('fr', _('French')),
('he', _('Hebrew')),
('it', _('Italian')),
('ja', _('Japanese')),
('ko', _('Korean')),
('nl', _('Dutch')),
('no', _('Norwegian')),
('pl', _('Polish')), ('pl', _('Polish')),
('ru', _('Russian')),
('sv', _('Swedish')),
('th', _('Thai')),
('tr', _('Turkish')), ('tr', _('Turkish')),
('vi', _('Vietnamese')),
('zh-cn', _('Chinese')),
] ]
# Currencies available for use # Currencies available for use

2
InvenTree/company/templates/company/detail.html
View File

@ -371,7 +371,7 @@
requests.push(inventreeDelete(url)); requests.push(inventreeDelete(url));
}); });
$.when.apply($, requests).then(function() { $.when.apply($, requests).done(function() {
$('#supplier-part-table').bootstrapTable('refresh'); $('#supplier-part-table').bootstrapTable('refresh');
}); });
} }

4
InvenTree/company/templates/company/manufacturer_part.html
View File

@ -207,7 +207,7 @@ $("#supplier-part-delete").click(function() {
requests.push(inventreeDelete(url)); requests.push(inventreeDelete(url));
}); });
$.when.apply($, requests).then(function() { $.when.apply($, requests).done(function() {
reloadSupplierPartTable(); reloadSupplierPartTable();
}); });
} }
@ -247,7 +247,7 @@ $("#multi-parameter-delete").click(function() {
requests.push(inventreeDelete(url)); requests.push(inventreeDelete(url));
}); });
$.when.apply($, requests).then(function() { $.when.apply($, requests).done(function() {
$('#parameter-table').bootstrapTable('refresh'); $('#parameter-table').bootstrapTable('refresh');
}); });
} }

4
InvenTree/part/templates/part/detail.html
View File

@ -416,7 +416,7 @@
}); });
// Wait for *all* the requests to complete // Wait for *all* the requests to complete
$.when.apply($, requests).then(function() { $.when.apply($, requests).done(function() {
location.reload(); location.reload();
}); });
} }
@ -832,7 +832,7 @@
requests.push(inventreeDelete(url)); requests.push(inventreeDelete(url));
}); });
$.when.apply($, requests).then(function() { $.when.apply($, requests).done(function() {
reloadSupplierPartTable(); reloadSupplierPartTable();
}); });
} }

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

@ -147,8 +147,7 @@ function inventreeDelete(url, options={}) {
options.method = 'DELETE'; 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 // Wait for all the requests to complete
$.when.apply($, requests).then(function() { $.when.apply($, requests).done(function() {
if (options.onSuccess) { if (options.onSuccess) {
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 // Wait for *all* the requests to complete
$.when.apply($, requests).then(function() { $.when.apply($, requests).done(function() {
// Destroy the modal window // Destroy the modal window
$(modal).modal('hide'); $(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'); $("#stock-table").bootstrapTable('refresh');
}); });
}) })