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 remote-tracking branch 'inventree/master'

Browse Source
This commit is contained in:
Oliver Walters 2019-05-09 18:44:29 +10:00
commit b42f7fce44
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/part/models.py
View File

@ -284,7 +284,7 @@ class Part(models.Model):
# If this part does NOT have a BOM, result is simply the currently available stock
if not self.has_bom:
return self.available_stock
return 0
total = None

2
InvenTree/static/script/inventree/stock.js
View File

@ -293,6 +293,8 @@ function moveStockItems(items, options) {
//modalSetContent(modal, html);
attachSelect(modal);
modalEnable(modal, true);
$(modal).find('#note-warning').hide();
modalSubmit(modal, function() {

11
InvenTree/stock/forms.py
View File

@ -32,13 +32,10 @@ class CreateStockItemForm(HelperForm):
'part',
'supplier_part',
'location',
'belongs_to',
'serial',
'batch',
'quantity',
'status',
'notes',
# 'customer',
'URL',
]
@ -67,7 +64,13 @@ class StocktakeForm(forms.ModelForm):
class EditStockItemForm(HelperForm):
""" Form for editing a StockItem object """
""" Form for editing a StockItem object.
Note that not all fields can be edited here (even if they can be specified during creation.
location - Must be updated in a 'move' transaction
quantity - Must be updated in a 'stocktake' transaction
part - Cannot be edited after creation
"""
class Meta:
model = StockItem