Merge remote-tracking branch 'inventree/master'

InvenTree/stock/api.py

@@ -236,6 +236,11 @@ class StockLocationList(generics.ListCreateAPIView):
         'parent',
     ]
 
+    search_fields = [
+        'name',
+        'description',
+    ]
+
 
 class StockList(generics.ListCreateAPIView):
     """ API endpoint for list view of Stock objects
@@ -306,6 +311,8 @@ class StockList(generics.ListCreateAPIView):
             else:
                 item['location__path'] = None
 
+            item['status_text'] = StockItem.ITEM_STATUS_CODES[item['status']]
+
         return Response(data)
 
     def get_queryset(self):

InvenTree/stock/migrations/0005_auto_20190602_1944.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2 on 2019-06-02 09:44
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('stock', '0004_auto_20190525_2356'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='stockitem',
+            name='status',
+            field=models.PositiveIntegerField(choices=[(10, 'OK'), (50, 'Attention needed'), (55, 'Damaged'), (60, 'Destroyed'), (70, 'Lost')], default=10, validators=[django.core.validators.MinValueValidator(0)]),
+        ),
+    ]

InvenTree/stock/models.py

@@ -260,12 +260,14 @@ class StockItem(models.Model):
     ITEM_ATTENTION = 50
     ITEM_DAMAGED = 55
     ITEM_DESTROYED = 60
+    ITEM_LOST = 70
 
     ITEM_STATUS_CODES = {
         ITEM_OK: _("OK"),
         ITEM_ATTENTION: _("Attention needed"),
         ITEM_DAMAGED: _("Damaged"),
-        ITEM_DESTROYED: _("Destroyed")
+        ITEM_DESTROYED: _("Destroyed"),
+        ITEM_LOST: _("Lost")
     }
 
     status = models.PositiveIntegerField(