From 2de3b892a5f9c85be40cf5f9c1ff74f58c5338ac Mon Sep 17 00:00:00 2001
From: Matthias <matmair@live.de>
Date: Mon, 26 Apr 2021 21:33:39 +0200
Subject: [PATCH] More syntax for adding serial numbers #1519

---
 InvenTree/InvenTree/helpers.py | 39 ++++++++++++++++++++++++++++++----
 InvenTree/InvenTree/tests.py   |  8 +++++++
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/InvenTree/InvenTree/helpers.py b/InvenTree/InvenTree/helpers.py
index 6f6953ccb5..d5508b7db2 100644
--- a/InvenTree/InvenTree/helpers.py
+++ b/InvenTree/InvenTree/helpers.py
@@ -357,6 +357,8 @@ def extract_serial_numbers(serials, expected_quantity):
     - Serial numbers must be positive
     - Serial numbers can be split by whitespace / newline / commma chars
     - Serial numbers can be supplied as an inclusive range using hyphen char e.g. 10-20
+    - Serial numbers can be supplied as <start>+ for getting all expecteded numbers starting from <start>
+    - Serial numbers can be supplied as <start>+<length> for getting <length> numbers starting from <start>
 
     Args:
         expected_quantity: The number of (unique) serial numbers we expect
@@ -369,6 +371,13 @@ def extract_serial_numbers(serials, expected_quantity):
     numbers = []
     errors = []
 
+    # helpers
+    def number_add(n):
+        if n in numbers:
+            errors.append(_('Duplicate serial: {n}').format(n=n))
+        else:
+            numbers.append(n)
+
     try:
         expected_quantity = int(expected_quantity)
     except ValueError:
@@ -395,10 +404,7 @@ def extract_serial_numbers(serials, expected_quantity):
 
                     if a < b:
                         for n in range(a, b + 1):
-                            if n in numbers:
-                                errors.append(_('Duplicate serial: {n}').format(n=n))
-                            else:
-                                numbers.append(n)
+                            number_add(n)
                     else:
                         errors.append(_("Invalid group: {g}").format(g=group))
 
@@ -409,6 +415,31 @@ def extract_serial_numbers(serials, expected_quantity):
                 errors.append(_("Invalid group: {g}").format(g=group))
                 continue
 
+        # plus signals either
+        # 1:  'start+':  expected number of serials, starting at start
+        # 2:  'start+number': number of serials, starting at start
+        elif '+' in group:
+            items = group.split('+')
+
+            # case 1, 2
+            if len(items) == 2:
+                start = int(items[0])
+
+                # case 2
+                if bool(items[1]):
+                    end = start + int(items[1]) + 1
+
+                # case 1
+                else:
+                    end = start + expected_quantity
+
+                for n in range(start, end):
+                    number_add(n)
+            # no case
+            else:
+                errors.append(_("Invalid group: {g}").format(g=group))
+                continue
+
         else:
             if group in numbers:
                 errors.append(_("Duplicate serial: {g}".format(g=group)))
diff --git a/InvenTree/InvenTree/tests.py b/InvenTree/InvenTree/tests.py
index 8465473901..af812fe8a3 100644
--- a/InvenTree/InvenTree/tests.py
+++ b/InvenTree/InvenTree/tests.py
@@ -244,6 +244,14 @@ class TestSerialNumberExtraction(TestCase):
         self.assertIn(3, sn)
         self.assertIn(13, sn)
 
+        sn = e("1+", 10)
+        self.assertEqual(len(sn), 10)
+        self.assertEqual(sn, [_ for _ in range(1, 11)])
+
+        sn = e("4, 1+2", 4)
+        self.assertEqual(len(sn), 4)
+        self.assertEqual(sn, ["4", 1, 2, 3])
+
     def test_failures(self):
 
         e = helpers.extract_serial_numbers