inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-01 11:10:54 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master'

Browse Source
This commit is contained in:
Oliver Walters
2019-09-24 08:06:11 +10:00
parent d6749dfb24 d247ea7589
commit 14217ff648
7 changed files with 124 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
InvenTree/stock/models.py
View File

@ -129,13 +129,17 @@ class StockItem(models.Model):
else:
add_note = False
user = kwargs.pop('user', None)
add_note = add_note and kwargs.pop('note', True)
super(StockItem, self).save(*args, **kwargs)
if add_note:
# This StockItem is being saved for the first time
self.addTransactionNote(
'Created stock item',
None,
user,
notes="Created new stock item for part '{p}'".format(p=str(self.part)),
system=True
)
@ -466,7 +470,8 @@ class StockItem(models.Model):
if location:
new_item.location = location
new_item.save()
# The item already has a transaction history, don't create a new note
new_item.save(user=user, note=False)
# Copy entire transaction history
new_item.copyHistoryFrom(self)

16
InvenTree/stock/views.py
View File

@ -792,6 +792,8 @@ class StockItemCreate(AjaxCreateView):
form = self.get_form()
data = {}
valid = form.is_valid()
if valid:
@ -850,7 +852,7 @@ class StockItemCreate(AjaxCreateView):
URL=data.get('URL'),
)
item.save()
item.save(user=request.user)
except ValidationError as e:
form.errors['serial_numbers'] = e.messages
@ -861,11 +863,15 @@ class StockItemCreate(AjaxCreateView):
# We need to call _post_clean() here because it is prevented in the form implementation
form.clean()
form._post_clean()
form.save()
item = form.save(commit=False)
item.save(user=request.user)
data = {
'form_valid': valid,
}
data['pk'] = item.pk
data['url'] = item.get_absolute_url()
data['success'] = _("Created new stock item")
data['form_valid'] = valid
return self.renderJsonResponse(request, form, data=data)