From 7430abc237c63b0435666131e9a3245e284ede4a Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sun, 3 May 2020 09:50:00 +1000
Subject: [PATCH] Add ability to set stock status when receiving goods

---
 InvenTree/InvenTree/status_codes.py           | 13 ++++++
 InvenTree/order/models.py                     |  6 ++-
 .../order/templates/order/receive_parts.html  | 40 +++++++++++++------
 InvenTree/order/views.py                      | 24 ++++++++++-
 InvenTree/part/templatetags/status_codes.py   |  5 +++
 5 files changed, 71 insertions(+), 17 deletions(-)

diff --git a/InvenTree/InvenTree/status_codes.py b/InvenTree/InvenTree/status_codes.py
index 1b6d77b57d..2082eac70b 100644
--- a/InvenTree/InvenTree/status_codes.py
+++ b/InvenTree/InvenTree/status_codes.py
@@ -54,6 +54,10 @@ class StatusCode:
 
         return codes
 
+    @classmethod
+    def text(cls, key):
+        return cls.options.get(key, None)
+
     @classmethod
     def items(cls):
         return cls.options.items()
@@ -204,6 +208,15 @@ class StockStatus(StatusCode):
         ASSIGNED_TO_OTHER_ITEM,
     ]
 
+    # The following codes are available for receiving goods
+    RECEIVING_CODES = [
+        OK,
+        ATTENTION,
+        DAMAGED,
+        DESTROYED,
+        REJECTED
+    ]
+
 
 class BuildStatus(StatusCode):
 
diff --git a/InvenTree/order/models.py b/InvenTree/order/models.py
index 6198eb16bc..56da6c783d 100644
--- a/InvenTree/order/models.py
+++ b/InvenTree/order/models.py
@@ -209,7 +209,7 @@ class PurchaseOrder(Order):
         return self.pending_line_items().count() == 0
 
     @transaction.atomic
-    def receive_line_item(self, line, location, quantity, user):
+    def receive_line_item(self, line, location, quantity, user, status=StockStatus.OK):
         """ Receive a line item (or partial line item) against this PO
         """
 
@@ -230,7 +230,9 @@ class PurchaseOrder(Order):
                 supplier_part=line.part,
                 location=location,
                 quantity=quantity,
-                purchase_order=self)
+                purchase_order=self,
+                status=status
+            )
 
             stock.save()
 
diff --git a/InvenTree/order/templates/order/receive_parts.html b/InvenTree/order/templates/order/receive_parts.html
index f71959cdc0..082fe083b9 100644
--- a/InvenTree/order/templates/order/receive_parts.html
+++ b/InvenTree/order/templates/order/receive_parts.html
@@ -1,23 +1,28 @@
 {% extends "modal_form.html" %}
+{% load i18n %}
+{% load inventree_extras %}
+{% load status_codes %}
 
 {% block form %}
 
-Receive outstanding parts for <b>{{ order }}</b> - <i>{{ order.description }}</i>
+{% trans "Receive outstanding parts for" %} <b>{{ order }}</b> - <i>{{ order.description }}</i>
 
 <form method='post' action='' class='js-modal-form' enctype='multipart/form-data'>
     {% csrf_token %}
     {% load crispy_forms_tags %}
 
-    <label class='control-label'>Parts</label>
-    <p class='help-block'>Select parts to receive against this order.</p>
+    <label class='control-label'>{% trans "Parts" %}</label>
+    <p class='help-block'>{% trans "Select parts to receive against this order" %}</p>
 
     <table class='table table-striped'>
         <tr>
-            <th>Part</th>
-            <th>Order Code</th>
-            <th>On Order</th>
-            <th>Received</th>
-            <th>Receive</th>
+            <th>{% trans "Part" %}</th>
+            <th>{% trans "Order Code" %}</th>
+            <th>{% trans "On Order" %}</th>
+            <th>{% trans "Received" %}</th>
+            <th>{% trans "Receive" %}</th>
+            <th>{% trans "Status" %}</th>
+            <th></th>
         </tr>
         {% for line in lines %}
         <tr id='line_row_{{ line.id }}'>
@@ -28,20 +33,29 @@ Receive outstanding parts for <b>{{ order }}</b> - <i>{{ order.description }}</i
             </td>
             <td>{{ line.part.SKU }}</td>
             {% else %}
-            <td colspan='2'>Referenced part has been removed</td>
+            <td colspan='2'>{% trans "Error: Referenced part has been removed" %}</td>
             {% endif %}
-            <td>{{ line.quantity }}</td>
-            <td>{{ line.received }}</td>
+            <td>{% decimal line.quantity %}</td>
+            <td>{% decimal line.received %}</td>
             <td>
                 <div class='control-group'>
                     <div class='controls'>
-                        <input class='numberinput' type='number' min='0' value='{{ line.receive_quantity }}' name='line-{{ line.id }}'/>
+                        <input class='numberinput' type='number' min='0' value='{% decimal line.receive_quantity %}' name='line-{{ line.id }}'/>
                     </div>
                 </div>
             </td>
+            <td>
+                <div class='control-group'>
+                    <select class='select' name='status-{{ line.id }}'>
+                        {% for code in StockStatus.RECEIVING_CODES %}
+                        <option value="{{ code }}" {% if code|add:"0" == line.status_code|add:"0" %}selected="selected"{% endif %}>{% stock_status_text code %}</option>
+                        {% endfor %}
+                    </select>
+                </div>
+            </td>
             <td>
                 <button class='btn btn-default btn-remove' onClick="removeOrderRowFromOrderWizard()" id='del_item_{{ line.id }}' title='Remove line' type='button'>
-                    <span row='line_row_{{ line.id }}' class='fas fa-trash-alt icon-red'></span>
+                    <span row='line_row_{{ line.id }}' class='fas fa-times-circle icon-red'></span>
                 </button>
             </td>
         </tr>
diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py
index 2459f83abf..02132d34cc 100644
--- a/InvenTree/order/views.py
+++ b/InvenTree/order/views.py
@@ -29,7 +29,7 @@ from . import forms as order_forms
 from InvenTree.views import AjaxView, AjaxCreateView, AjaxUpdateView, AjaxDeleteView
 from InvenTree.helpers import DownloadFile, str2bool
 
-from InvenTree.status_codes import PurchaseOrderStatus
+from InvenTree.status_codes import PurchaseOrderStatus, StockStatus
 
 logger = logging.getLogger(__name__)
 
@@ -669,6 +669,20 @@ class PurchaseOrderReceive(AjaxUpdateView):
                 except (PurchaseOrderLineItem.DoesNotExist, ValueError):
                     continue
 
+                # Check that the StockStatus was set
+                status_key = 'status-{pk}'.format(pk=pk)
+                status = request.POST.get(status_key, StockStatus.OK)
+
+                try:
+                    status = int(status)
+                except ValueError:
+                    status = StockStatus.OK
+
+                if status in StockStatus.RECEIVING_CODES:
+                    line.status_code = status
+                else:
+                    line.status_code = StockStatus.OK
+
                 # Check that line matches the order
                 if not line.order == self.order:
                     # TODO - Display a non-field error?
@@ -725,7 +739,13 @@ class PurchaseOrderReceive(AjaxUpdateView):
             if not line.part:
                 continue
 
-            self.order.receive_line_item(line, self.destination, line.receive_quantity, self.request.user)
+            self.order.receive_line_item(
+                line,
+                self.destination,
+                line.receive_quantity,
+                self.request.user,
+                status=line.status_code,
+            )
 
 
 class OrderParts(AjaxView):
diff --git a/InvenTree/part/templatetags/status_codes.py b/InvenTree/part/templatetags/status_codes.py
index 2d4dc77113..ea334970c2 100644
--- a/InvenTree/part/templatetags/status_codes.py
+++ b/InvenTree/part/templatetags/status_codes.py
@@ -28,6 +28,11 @@ def stock_status_label(key, *args, **kwargs):
     return mark_safe(StockStatus.render(key, large=kwargs.get('large', False)))
 
 
+@register.simple_tag
+def stock_status_text(key, *args, **kwargs):
+    return mark_safe(StockStatus.text(key))
+
+
 @register.simple_tag
 def build_status_label(key, *args, **kwargs):
     """ Render a Build status label """