inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 20:16:44 +00:00
Code

Add part stocktake to Stock Location page(s)

Browse Source
This commit is contained in:
Oliver 2018-05-08 22:41:52 +10:00
parent f2982a59ad
commit bf4ffb8b0b
3 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
InvenTree/static/script/tables.js
View File

@ -7,15 +7,11 @@ function deleteButton(url, text='Delete') {
} }
function renderLink(text, url) { function renderLink(text, url) {
if (text && url) { if (text === '' || url === '') {
return '<a href="' + url + '">' + text + '</a>';
}
else if (text) {
return text; return text;
} }
else {
return ''; return '<a href="' + url + '">' + text + '</a>';
}
} }

5
InvenTree/stock/models.py
View File

@ -194,8 +194,6 @@ class StockItem(models.Model):
@property @property
def in_stock(self): def in_stock(self):
if self.quantity == 0:
return False
if self.belongs_to or self.customer: if self.belongs_to or self.customer:
return False return False
@ -284,6 +282,9 @@ class StockItem(models.Model):
""" Remove items from stock """ Remove items from stock
""" """
if self.quantity == 0:
return
quantity = int(quantity) quantity = int(quantity)
if quantity <= 0 or self.infinite: if quantity <= 0 or self.infinite:

30
InvenTree/stock/templates/stock/location.html
View File

@ -47,6 +47,8 @@
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options
<span class="caret"></span></button> <span class="caret"></span></button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="#" id='multi-item-add' title='Add to selected stock items'>Add stock</a></li>
<li><a href="#" id='multi-item-remove' title='Remove from selected stock items'>Remove stock</a></li>
<li><a href="#" id='multi-item-stocktake' title='Stocktake selected stock items'>Stocktake</a></li> <li><a href="#" id='multi-item-stocktake' title='Stocktake selected stock items'>Stocktake</a></li>
<li><a href='#' id='multi-item-move' title='Move selected stock items'>Move</a></li> <li><a href='#' id='multi-item-move' title='Move selected stock items'>Move</a></li>
</ul> </ul>
@ -130,16 +132,28 @@
return false; return false;
}); });
$("#multi-item-stocktake").click(function() { function _stock(action) {
var items = selectedStock(); adjustStock({
action: action,
items: selectedStock(),
success: function() {
$('#stock-table').bootstrapTable('refresh');
}
})
}
countStockItems(items, $('#multi-item-stocktake').click(function() {
{ _stock('stocktake');
success: function() { return false;
$("#stock-table").bootstrapTable('refresh'); });
}
});
$('#multi-item-remove').click(function() {
_stock('remove');
return false;
});
$('#multi-item-add').click(function() {
_stock('add');
return false; return false;
}); });