Merge branch 'master' of https://github.com/inventree/inventree-python into add-oauth2

Author: matmair

README.md

@@ -18,6 +18,14 @@ The InvenTree python library can be easily installed using PIP:
 pip install inventree
 ```
 
+If you need to rely on system certificates from the OS certificate store instead of the bundled certificates, use
+
+```
+pip install inventree[system-certs]
+```
+
+This allows pip and Python applications to verify TLS/SSL connections to servers whose certificates are trusted by your system, and can be helpful if you're using a custom certificate authority (CA) for your InvenTree instance's cert.
+
 ## Documentation
 
 Refer to the [InvenTree documentation](https://docs.inventree.org/en/latest/api/python/python/)

inventree/base.py

@@ -7,7 +7,7 @@
 
 from . import api as inventree_api
 
-INVENTREE_PYTHON_VERSION = "0.17.5"
+INVENTREE_PYTHON_VERSION = "0.18.0"
 
 
 logger = logging.getLogger('inventree')

inventree/part.py

@@ -186,6 +186,15 @@ class BomItem(
     URL = 'bom'
 
 
+class BomItemSubstitute(
+    inventree.base.InventreeObject,
+    inventree.base.MetadataMixin,
+):
+    """Class representing the BomItemSubstitute database model"""
+
+    URL = "bom/substitute"
+
+
 class InternalPrice(inventree.base.InventreeObject):
     """ Class representing the InternalPrice model """
 

inventree/stock.py

@@ -11,6 +11,9 @@
 import inventree.report
 
 
+logger = logging.getLogger('inventree')
+
+
 class StockLocation(
     inventree.base.BarcodeMixin,
     inventree.base.MetadataMixin,
@@ -58,6 +61,31 @@ class StockItem(
 
     MODEL_TYPE = 'stockitem'
 
+    @classmethod
+    def create(cls, api, data, **kwargs):
+        """ Override default create method to support multiple object return. """
+
+        cls.checkApiVersion(api)
+
+        # Ensure the pk value is None so an existing object is not updated
+        if cls.getPkField() in data.keys():
+            data.pop(cls.getPkField())
+
+        response = api.post(cls.URL, data, **kwargs)
+
+        if response is None:
+            logger.error("Error creating new object")
+            return None
+
+        if isinstance(response, list):
+            allResponses = []
+            for element in response:
+                allResponses.append(cls(api, data=element))
+            return allResponses
+
+        else:
+            return [cls(api, data=response)]
+
     @classmethod
     def adjustStockItems(cls, api: inventree.api.InvenTreeAPI, method: str, items: list, **kwargs):
         """Perform a generic stock 'adjustment' action.

pyproject.toml

@@ -23,11 +23,13 @@ keywords = [
     "stock",
 ]
 dependencies = [
-    "pip-system-certs>=4.0",
-    "requests>=2.27.0",
+    "requests>=2.27.0", 
     "urllib3>=2.3.0",
     "requests-oauthlib",
 ]
+[project.optional-dependencies]
+"system-certs" = ["pip-system-certs>=4.0"]
+
 
 [project.urls]
 Homepage = "https://github.com/inventree/inventree-python/"

test/test_api.py

@@ -209,8 +209,7 @@ def test_create_stuff(self):
             'part': p.pk,
             'quantity': 45,
             'notes': 'This is a note',
-
-        })
+        })[0]
 
         self.assertIsNotNone(s)
         self.assertEqual(s.part, p.pk)
@@ -273,12 +272,12 @@ def test_add_result(self):
             'value': '0x123456',
         }
 
-        result = item.uploadTestResult('firmware', False, **args)
+        result = item.uploadTestResult('firmwareversion', False, **args)
 
         self.assertTrue(result)
 
-        item.uploadTestResult('paint', True)
-        item.uploadTestResult('extra test', False, value='some data')
+        item.uploadTestResult('temperaturetest', True)
+        item.uploadTestResult('settingschecksum', False, value='some data')
 
         # There should be 3 more test results now!
         results = item.getTestResults()

test/test_order.py

@@ -269,11 +269,15 @@ def test_order_complete_with_receive(self):
         result = po.receiveAll(location=use_location.pk)
 
         # Check the result returned
-        self.assertIsInstance(result, dict)
-        self.assertIn('items', result)
-        self.assertIn('location', result)
-        # Check that all except one line were marked
-        self.assertEqual(len(result['items']), len(po.getLineItems()) - 1)
+        if self.api.api_version < 385:  # Ref: https://github.com/inventree/InvenTree/pull/10174/
+            self.assertIsInstance(result, dict)
+            self.assertIn('items', result)
+            self.assertIn('location', result)
+            # Check that all except one line were marked
+            self.assertEqual(len(result['items']), len(po.getLineItems()) - 1)
+        else:
+            self.assertIsInstance(result, list)
+            self.assertEqual(len(result), len(po.getLineItems()) - 1)
 
         # Receive all line items again - make sure answer is None
         # use the StockLocation item here

test/test_part.py

@@ -703,14 +703,32 @@ def test_get_requirements(self):
 
         # Check for expected content
         self.assertIsInstance(req, dict)
-        self.assertIn('available_stock', req)
-        self.assertIn('on_order', req)
-        self.assertIn('required_build_order_quantity', req)
-        self.assertIn('allocated_build_order_quantity', req)
-        self.assertIn('required_sales_order_quantity', req)
-        self.assertIn('allocated_sales_order_quantity', req)
-        self.assertIn('allocated', req)
-        self.assertIn('required', req)
+
+        # Ref: https://github.com/inventree/InvenTree/pull/9798
+        if self.api.api_version < 350:
+            fields = [
+                'on_order',
+                'allocated_build_order_quantity',
+                'allocated_sales_order_quantity',
+                'required_build_order_quantity',
+                'required_sales_order_quantity',
+            ]
+        else:
+            fields = [
+                'total_stock',
+                'unallocated_stock',
+                'can_build',
+                'ordering',
+                'building',
+                'scheduled_to_build',
+                'required_for_build_orders',
+                'allocated_to_build_orders',
+                'required_for_sales_orders',
+                'allocated_to_sales_orders',
+            ]
+        
+        for f in fields:
+            self.assertIn(f, req)
 
 
 class PartBarcodeTest(InvenTreeTestCase):

test/test_stock.py

@@ -248,6 +248,25 @@ def test_barcode_support(self):
 
             item.unassignBarcode()
 
+    def test_serialized(self):
+        """Test serializing multiple objects on create"""
+
+        # Create items with serial numbers
+        items = StockItem.create(
+            self.api,
+            {
+                "part": 10004,
+                "quantity": 3,
+                "serial_numbers": "1005,1006,1007"
+            }
+        )
+
+        self.assertEqual(3, len(items))
+
+        self.assertEqual('1005', items[0].serial)
+        self.assertEqual('1006', items[1].serial)
+        self.assertEqual('1007', items[2].serial)
+
 
 class StockAdjustTest(InvenTreeTestCase):
     """Unit tests for stock 'adjustment' actions"""
@@ -407,6 +426,10 @@ def test_assign_stock(self):
             }
         )
 
+        # Verify a single result was returned
+        self.assertEqual(1, len(assignitem))
+        assignitem = assignitem[0]
+
         # Assign the item
         assignitem.assignStock(customer=customer, notes='Sell on the side')