From 972f93f6d82898eeeba690a9afb1b4773659088f Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 29 Dec 2021 15:53:04 +0100 Subject: [PATCH] always return a number --- InvenTree/InvenTree/helpers.py | 2 +- InvenTree/InvenTree/tests.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/InvenTree/InvenTree/helpers.py b/InvenTree/InvenTree/helpers.py index 4848b49e33..44d49c445f 100644 --- a/InvenTree/InvenTree/helpers.py +++ b/InvenTree/InvenTree/helpers.py @@ -504,7 +504,7 @@ def extract_serial_numbers(serials, expected_quantity, next_number: int): if group in numbers: errors.append(_("Duplicate serial: {g}".format(g=group))) else: - numbers.append(group) + numbers.append(int(group)) if len(errors) > 0: raise ValidationError(errors) diff --git a/InvenTree/InvenTree/tests.py b/InvenTree/InvenTree/tests.py index 0e99962afb..7fd62908a0 100644 --- a/InvenTree/InvenTree/tests.py +++ b/InvenTree/InvenTree/tests.py @@ -255,15 +255,15 @@ class TestSerialNumberExtraction(TestCase): sn = e("4, 1+2", 4, 1) self.assertEqual(len(sn), 4) - self.assertEqual(sn, ["4", 1, 2, 3]) + self.assertEqual(sn, [4, 1, 2, 3]) sn = e("~", 1, 1) self.assertEqual(len(sn), 1) - self.assertEqual(sn, ['1']) + self.assertEqual(sn, [1]) sn = e("~", 1, 3) self.assertEqual(len(sn), 1) - self.assertEqual(sn, ['3']) + self.assertEqual(sn, [3]) sn = e("~+", 2, 5) self.assertEqual(len(sn), 2) @@ -305,11 +305,11 @@ class TestSerialNumberExtraction(TestCase): sn = e("1 3-5 9+2", 7, 1) self.assertEqual(len(sn), 7) - self.assertEqual(sn, ['1', 3, 4, 5, 9, 10, 11]) + self.assertEqual(sn, [1, 3, 4, 5, 9, 10, 11]) sn = e("1,3-5,9+2", 7, 1) self.assertEqual(len(sn), 7) - self.assertEqual(sn, ['1', 3, 4, 5, 9, 10, 11]) + self.assertEqual(sn, [1, 3, 4, 5, 9, 10, 11]) sn = e("~+2", 3, 14) self.assertEqual(len(sn), 3)