Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1133 from SchrodingersGat/stock-table-fix

Browse Source 
Smallt tweaks for the Stock table
This commit is contained in:
Oliver 2020-11-18 15:24:06 +11:00 committed by GitHub
commit 0594ebaef7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
InvenTree/InvenTree/status_codes.py
View File

@ -182,6 +182,7 @@ class StockStatus(StatusCode):
ATTENTION: 'yellow', ATTENTION: 'yellow',
DAMAGED: 'red', DAMAGED: 'red',
DESTROYED: 'red', DESTROYED: 'red',
LOST: 'grey',
REJECTED: 'red', REJECTED: 'red',
} }

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

@ -536,13 +536,17 @@ function loadStockTable(table, options) {
// Special stock status codes // Special stock status codes
// 65 = "REJECTED" // REJECTED
if (row.status == 65) { if (row.status == {{ StockStatus.REJECTED }}) {
html += makeIconButton('fa-times-circle icon-red', '{% trans "Stock item has been rejected" %}'); console.log("REJECTED - {{ StockStatus.REJECTED }}");
html += makeIconBadge('fa-times-circle icon-red', '{% trans "Stock item has been rejected" %}');
} }
// 70 = "LOST" // LOST
else if (row.status == 70) { else if (row.status == {{ StockStatus.LOST }}) {
html += makeIconButton('fa-question-circle','{% trans "Stock item is lost" %}'); html += makeIconBadge('fa-question-circle','{% trans "Stock item is lost" %}');
}
else if (row.status == {{ StockStatus.DESTROYED }}) {
html += makeIconBadge('fa-skull-crossbones', '{% trans "Stock item is destroyed" %}');
} }
if (row.quantity <= 0) { if (row.quantity <= 0) {