Merge remote-tracking branch 'inventree/master'

.github/workflows/docker.yaml

@@ -21,10 +21,6 @@ on:
     branches:
       - 'master'
 
-  pull_request:
-    branches:
-      - 'master'
-
 jobs:
 
   # Build the docker image
@@ -58,6 +54,7 @@ jobs:
           docker-compose run inventree-dev-server invoke update
           docker-compose run inventree-dev-server invoke setup-dev
           docker-compose up -d
+          docker-compose run inventree-dev-server pip install --upgrade setuptools
           docker-compose run inventree-dev-server invoke wait
       - name: Check Data Directory
         # The following file structure should have been created by the docker image

InvenTree/InvenTree/config.py

@@ -59,13 +59,6 @@ def get_config_file(create=True) -> Path:
 def load_config_data() -> map:
     """Load configuration data from the config file."""
 
-    import sys
-
-    print("load_config_data()")
-    print("- cwd:", os.getcwd())
-    print("- exe:", sys.executable)
-    print("- path:", sys.path)
-
     import yaml
 
     cfg_file = get_config_file()

InvenTree/InvenTree/settings.py

@@ -33,13 +33,13 @@ TESTING = 'test' in sys.argv
 
 # Note: The following fix is "required" for docker build workflow
 # Note: 2022-12-12 still unsure why...
-if TESTING:
+if TESTING and os.getenv('INVENTREE_DOCKER'):
     # Ensure that sys.path includes global python libs
-    python_dir = os.path.dirname(sys.executable)
+    site_packages = '/usr/local/lib/python3.9/site-packages'
-    python_lib = os.path.join(python_dir, "lib", "site-packages")
 
-    if python_lib not in sys.path:
+    if site_packages not in sys.path:
-        sys.path.append(python_lib)
+        print("Adding missing site-packages path:", site_packages)
+        sys.path.append(site_packages)
 
 # Are environment variables manipulated by tests? Needs to be set by testing code
 TESTING_ENV = False

InvenTree/InvenTree/version.py

@@ -13,7 +13,7 @@ import common.models
 from InvenTree.api_version import INVENTREE_API_VERSION
 
 # InvenTree software version
-INVENTREE_SW_VERSION = "0.9.0 dev"
+INVENTREE_SW_VERSION = "0.10.0 dev"
 
 
 def inventreeInstanceName():

InvenTree/part/api.py

@@ -527,6 +527,9 @@ class PartScheduling(RetrieveAPI):
 
             quantity = max(line.quantity - line.received, 0)
 
+            # Multiply by the pack_size of the SupplierPart
+            quantity *= line.part.pack_size
+
             add_schedule_entry(
                 target_date,
                 quantity,

docker.dev.env

@@ -3,7 +3,7 @@
 
 # Set DEBUG to True for a development setup
 INVENTREE_DEBUG=True
-INVENTREE_DEBUG_LEVEL=INFO
+INVENTREE_LOG_LEVEL=INFO
 
 # Database configuration options
 # Note: The example setup is for a PostgreSQL database (change as required)

docker/requirements.txt

@@ -3,7 +3,7 @@
 # Basic package requirements
 invoke>=1.4.0                   # Invoke build tool
 pyyaml>=6.0
-setuptools==60.0.5
+setuptools==65.6.3
 wheel>=0.37.0
 
 # Database links