From 52ec213a28a869b86624c1913caa3fd1bbeaecdf Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 24 Sep 2019 07:43:14 +1000 Subject: [PATCH 1/3] Save user information when creating a new purchase order --- InvenTree/InvenTree/views.py | 31 +++++++++++++++++++++++-------- InvenTree/order/views.py | 6 ++++++ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/InvenTree/InvenTree/views.py b/InvenTree/InvenTree/views.py index ad0d70bfe8..8a19059aa3 100644 --- a/InvenTree/InvenTree/views.py +++ b/InvenTree/InvenTree/views.py @@ -238,6 +238,18 @@ class AjaxCreateView(AjaxMixin, CreateView): - Handles form validation via AJAX POST requests """ + def pre_save(self, **kwargs): + """ + Hook for doing something before the form is validated + """ + pass + + def post_save(self, **kwargs): + """ + Hook for doing something with the created object after it is saved + """ + pass + def get(self, request, *args, **kwargs): """ Creates form with initial data, and renders JSON response """ @@ -255,26 +267,29 @@ class AjaxCreateView(AjaxMixin, CreateView): - Return status info (success / failure) """ self.request = request - form = self.get_form() + self.form = self.get_form() # Extra JSON data sent alongside form data = { - 'form_valid': form.is_valid(), + 'form_valid': self.form.is_valid(), } - if form.is_valid(): - obj = form.save() + if self.form.is_valid(): + + self.pre_save() + self.object = self.form.save() + self.post_save() # Return the PK of the newly-created object - data['pk'] = obj.pk - data['text'] = str(obj) + data['pk'] = self.object.pk + data['text'] = str(object) try: - data['url'] = obj.get_absolute_url() + data['url'] = self.object.get_absolute_url() except AttributeError: pass - return self.renderJsonResponse(request, form, data) + return self.renderJsonResponse(request, self.form, data) class AjaxUpdateView(AjaxMixin, UpdateView): diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index 01ad682e6a..d78c9c059e 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -91,6 +91,12 @@ class PurchaseOrderCreate(AjaxCreateView): return initials + def post_save(self, **kwargs): + # Record the user who created this purchase order + + self.object.created_by = self.request.user + self.object.save() + class PurchaseOrderEdit(AjaxUpdateView): """ View for editing a PurchaseOrder using a modal form """ From 41c07fc42308f4ada24662ae6eb25b563aaffc07 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 24 Sep 2019 07:54:18 +1000 Subject: [PATCH 2/3] Save user who created a stock item - Handled differently for batch or serialized parts --- InvenTree/InvenTree/views.py | 2 +- InvenTree/stock/models.py | 4 +++- InvenTree/stock/views.py | 16 +++++++++++----- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/InvenTree/InvenTree/views.py b/InvenTree/InvenTree/views.py index 8a19059aa3..91261827e7 100644 --- a/InvenTree/InvenTree/views.py +++ b/InvenTree/InvenTree/views.py @@ -245,7 +245,7 @@ class AjaxCreateView(AjaxMixin, CreateView): pass def post_save(self, **kwargs): - """ + """ Hook for doing something with the created object after it is saved """ pass diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py index 7b5d01c58b..f2c31083c0 100644 --- a/InvenTree/stock/models.py +++ b/InvenTree/stock/models.py @@ -129,13 +129,15 @@ class StockItem(models.Model): else: add_note = False + user = kwargs.pop('user', None) + 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 ) diff --git a/InvenTree/stock/views.py b/InvenTree/stock/views.py index 1bb9a27a83..d8833d59d0 100644 --- a/InvenTree/stock/views.py +++ b/InvenTree/stock/views.py @@ -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) From 7c1615a2b69c6239c9f3e1bbfd65047ee96b0af4 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 24 Sep 2019 07:59:59 +1000 Subject: [PATCH 3/3] Fix user recording when serializing stock --- InvenTree/stock/models.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py index f2c31083c0..1cf1a870b8 100644 --- a/InvenTree/stock/models.py +++ b/InvenTree/stock/models.py @@ -130,6 +130,8 @@ class StockItem(models.Model): add_note = False user = kwargs.pop('user', None) + + add_note = add_note and kwargs.pop('note', True) super(StockItem, self).save(*args, **kwargs) @@ -468,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)