Merge branch 'master' into build-output-complete

InvenTree/order/admin.py

@@ -20,6 +20,10 @@ class PurchaseOrderLineItemInlineAdmin(admin.StackedInline):
 
 class PurchaseOrderAdmin(ImportExportModelAdmin):
 
+    exclude = [
+        'reference_int',
+    ]
+
     list_display = (
         'reference',
         'supplier',
@@ -41,6 +45,10 @@ class PurchaseOrderAdmin(ImportExportModelAdmin):
 
 class SalesOrderAdmin(ImportExportModelAdmin):
 
+    exclude = [
+        'reference_int',
+    ]
+
     list_display = (
         'reference',
         'customer',

InvenTree/order/api.py

@@ -151,9 +151,13 @@ class POList(generics.ListCreateAPIView):
     filter_backends = [
         rest_filters.DjangoFilterBackend,
         filters.SearchFilter,
-        filters.OrderingFilter,
+        InvenTreeOrderingFilter,
     ]
 
+    ordering_field_aliases = {
+        'reference': ['reference_int', 'reference'],
+    }
+
     filter_fields = [
         'supplier',
     ]
@@ -489,9 +493,13 @@ class SOList(generics.ListCreateAPIView):
     filter_backends = [
         rest_filters.DjangoFilterBackend,
         filters.SearchFilter,
-        filters.OrderingFilter,
+        InvenTreeOrderingFilter,
     ]
 
+    ordering_field_aliases = {
+        'reference': ['reference_int', 'reference'],
+    }
+
     filter_fields = [
         'customer',
     ]

InvenTree/order/migrations/0051_auto_20211014_0623.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.5 on 2021-10-14 06:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('order', '0050_alter_purchaseorderlineitem_destination'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='purchaseorder',
+            name='reference_int',
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='salesorder',
+            name='reference_int',
+            field=models.IntegerField(default=0),
+        ),
+    ]

InvenTree/order/migrations/0052_auto_20211014_0631.py

@@ -0,0 +1,66 @@
+# Generated by Django 3.2.5 on 2021-10-14 06:31
+
+import re
+
+from django.db import migrations
+
+def build_refs(apps, schema_editor):
+    """
+    Rebuild the integer "reference fields" for existing Build objects
+    """
+
+    PurchaseOrder = apps.get_model('order', 'purchaseorder')
+
+    for order in PurchaseOrder.objects.all():
+
+        ref = 0
+
+        result = re.match(r"^(\d+)", order.reference)
+
+        if result and len(result.groups()) == 1:
+            try:
+                ref = int(result.groups()[0])
+            except:
+                ref = 0
+
+        order.reference_int = ref
+        order.save()
+
+    SalesOrder = apps.get_model('order', 'salesorder')
+
+    for order in SalesOrder.objects.all():
+
+        ref = 0
+
+        result = re.match(r"^(\d+)", order.reference)
+
+        if result and len(result.groups()) == 1:
+            try:
+                ref = int(result.groups()[0])
+            except:
+                ref = 0
+
+        order.reference_int = ref
+        order.save()
+
+
+def unbuild_refs(apps, schema_editor):
+    """
+    Provided only for reverse migration compatibility
+    """
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('order', '0051_auto_20211014_0623'),
+    ]
+
+
+    operations = [
+        migrations.RunPython(
+            build_refs,
+            reverse_code=unbuild_refs
+        )
+    ]

InvenTree/order/models.py

@@ -28,7 +28,7 @@ from company.models import Company, SupplierPart
 from InvenTree.fields import InvenTreeModelMoneyField, RoundingDecimalField
 from InvenTree.helpers import decimal2string, increment, getSetting
 from InvenTree.status_codes import PurchaseOrderStatus, SalesOrderStatus, StockStatus, StockHistoryCode
-from InvenTree.models import InvenTreeAttachment
+from InvenTree.models import InvenTreeAttachment, ReferenceIndexingMixin
 
 
 def get_next_po_number():
@@ -89,7 +89,7 @@ def get_next_so_number():
     return reference
 
 
-class Order(models.Model):
+class Order(ReferenceIndexingMixin):
     """ Abstract model for an order.
 
     Instances of this class:
@@ -147,6 +147,9 @@ class Order(models.Model):
         return new_ref
 
     def save(self, *args, **kwargs):
+
+        self.rebuild_reference_field()
+
         if not self.creation_date:
             self.creation_date = datetime.now().date()
 
@@ -531,6 +534,12 @@ class SalesOrder(Order):
 
         return queryset
 
+    def save(self, *args, **kwargs):
+
+        self.rebuild_reference_field()
+
+        super().save(*args, **kwargs)
+
     def __str__(self):
 
         prefix = getSetting('SALESORDER_REFERENCE_PREFIX')

InvenTree/order/test_migrations.py

@@ -0,0 +1,59 @@
+"""
+Unit tests for the 'order' model data migrations
+"""
+
+from django_test_migrations.contrib.unittest_case import MigratorTestCase
+
+from InvenTree import helpers
+
+
+class TestForwardMigrations(MigratorTestCase):
+    """
+    Test entire schema migration
+    """
+
+    migrate_from = ('order', helpers.getOldestMigrationFile('order'))
+    migrate_to = ('order', helpers.getNewestMigrationFile('order'))
+
+    def prepare(self):
+        """
+        Create initial data set
+        """
+
+        # Create a purchase order from a supplier
+        Company = self.old_state.apps.get_model('company', 'company')
+
+        supplier = Company.objects.create(
+            name='Supplier A',
+            description='A great supplier!',
+            is_supplier=True
+        )
+
+        PurchaseOrder = self.old_state.apps.get_model('order', 'purchaseorder')
+
+        # Create some orders
+        for ii in range(10):
+
+            order = PurchaseOrder.objects.create(
+                supplier=supplier,
+                reference=f"{ii}-abcde",
+                description="Just a test order"
+            )
+
+            # Initially, the 'reference_int' field is unavailable
+            with self.assertRaises(AttributeError):
+                print(order.reference_int)
+
+    def test_ref_field(self):
+        """
+        Test that the 'reference_int' field has been created and is filled out correctly
+        """
+
+        PurchaseOrder = self.new_state.apps.get_model('order', 'purchaseorder')
+
+        for ii in range(10):
+
+            order = PurchaseOrder.objects.get(reference=f"{ii}-abcde")
+
+            # The integer reference field must have been correctly updated
+        self.assertEqual(order.reference_int, ii)