Merge branch 'master' into optimize_test_statistic_queries

.github/scripts/version_check.py

@@ -18,6 +18,9 @@ from pathlib import Path
 
 import requests
 
+REPO = os.getenv('GITHUB_REPOSITORY', 'inventree/inventree')
+GITHUB_API_URL = os.getenv('GITHUB_API_URL', 'https://api.github.com')
+
 
 def get_existing_release_tags():
     """Request information on existing releases via the GitHub API."""
@@ -28,9 +31,7 @@ def get_existing_release_tags():
     if token:
         headers = {'Authorization': f'Bearer {token}'}
 
-    response = requests.get(
+    response = requests.get(f'{GITHUB_API_URL}/repos/{REPO}/releases', headers=headers)
-        'https://api.github.com/repos/inventree/inventree/releases', headers=headers
-    )
 
     if response.status_code != 200:
         raise ValueError(
@@ -90,6 +91,11 @@ def check_version_number(version_string, allow_duplicate=False):
 
 
 if __name__ == '__main__':
+    # Ensure that we are running in GH Actions
+    if os.environ.get('GITHUB_ACTIONS', '') != 'true':
+        print('This script is intended to be run within a GitHub Action!')
+        sys.exit(1)
+
     if 'only_version' in sys.argv:
         here = Path(__file__).parent.absolute()
         version_file = here.joinpath(
@@ -102,14 +108,13 @@ if __name__ == '__main__':
             results[0] = str(int(results[0]) - 1)
         print(results[0])
         exit(0)
+
     # GITHUB_REF_TYPE may be either 'branch' or 'tag'
     GITHUB_REF_TYPE = os.environ['GITHUB_REF_TYPE']
 
     # GITHUB_REF may be either 'refs/heads/<branch>' or 'refs/heads/<tag>'
     GITHUB_REF = os.environ['GITHUB_REF']
-
     GITHUB_REF_NAME = os.environ['GITHUB_REF_NAME']
-
     GITHUB_BASE_REF = os.environ['GITHUB_BASE_REF']
 
     # Print out version information, makes debugging actions *much* easier!
@@ -193,7 +198,7 @@ if __name__ == '__main__':
     # Ref: https://getridbug.com/python/how-to-set-environment-variables-in-github-actions-using-python/
     with open(os.getenv('GITHUB_ENV'), 'a') as env_file:
         # Construct tag string
-        tags = ','.join([f'inventree/inventree:{tag}' for tag in docker_tags])
+        tags = ','.join([f'{REPO}:{tag}' for tag in docker_tags])
 
         env_file.write(f'docker_tags={tags}\n')
 

src/backend/InvenTree/InvenTree/tasks.py

@@ -118,7 +118,7 @@ def check_daily_holdoff(task_name: str, n_days: int = 1) -> bool:
     if last_success:
         threshold = datetime.now() - timedelta(days=n_days)
 
-        if last_success > threshold:
+        if last_success.date() > threshold.date():
             logger.info(
                 "Last successful run for '%s' was too recent - skipping task", task_name
             )

src/backend/InvenTree/build/migrations/0021_auto_20201020_0908_squashed_0026_auto_20201023_1228.py

@@ -5,6 +5,8 @@ from django.db import migrations, models
 import django.db.models.deletion
 import mptt.fields
 
+from build.status_codes import BuildStatus
+
 
 class Migration(migrations.Migration):
 
@@ -40,7 +42,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='build',
             name='status',
-            field=models.PositiveIntegerField(choices=[(10, 'Pending'), (20, 'Production'), (30, 'Cancelled'), (40, 'Complete')], default=10, help_text='Build status code', validators=[django.core.validators.MinValueValidator(0)], verbose_name='Build Status'),
+            field=models.PositiveIntegerField(choices=BuildStatus.items(), default=BuildStatus.PENDING.value, help_text='Build status code', validators=[django.core.validators.MinValueValidator(0)], verbose_name='Build Status'),
         ),
         migrations.AlterField(
             model_name='build',

src/backend/InvenTree/build/status_codes.py

@@ -9,7 +9,7 @@ class BuildStatus(StatusCode):
     """Build status codes."""
 
     PENDING = 10, _('Pending'), 'secondary'  # Build is pending / active
-    PRODUCTION = 20, _('Production'), 'primary'  # BuildOrder is in production
+    PRODUCTION = 20, _('Production'), 'primary'  # Build is in production
     CANCELLED = 30, _('Cancelled'), 'danger'  # Build was cancelled
     COMPLETE = 40, _('Complete'), 'success'  # Build is complete
 
@@ -17,4 +17,7 @@ class BuildStatus(StatusCode):
 class BuildStatusGroups:
     """Groups for BuildStatus codes."""
 
-    ACTIVE_CODES = [BuildStatus.PENDING.value, BuildStatus.PRODUCTION.value]
+    ACTIVE_CODES = [
+        BuildStatus.PENDING.value,
+        BuildStatus.PRODUCTION.value,
+    ]

src/backend/InvenTree/order/migrations/0028_auto_20200423_0956.py

@@ -5,6 +5,8 @@ import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
 
+from order.status_codes import PurchaseOrderStatus
+
 
 class Migration(migrations.Migration):
 
@@ -17,7 +19,12 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='purchaseorder',
             name='status',
-            field=models.PositiveIntegerField(choices=[(10, 'Pending'), (20, 'Placed'), (30, 'Complete'), (40, 'Cancelled'), (50, 'Lost'), (60, 'Returned')], default=10, help_text='Purchase order status'),
+            field=models.PositiveIntegerField(
+                choices=PurchaseOrderStatus.items(),
+                default=PurchaseOrderStatus.PENDING.value,
+                help_text='Purchase order status',
+                verbose_name='Status',
+            ),
         ),
         migrations.AlterField(
             model_name='salesorder',

src/backend/InvenTree/order/migrations/0084_auto_20230321_1111.py

@@ -2,6 +2,8 @@
 
 from django.db import migrations, models
 
+from order.status_codes import ReturnOrderStatus
+
 
 class Migration(migrations.Migration):
 
@@ -23,7 +25,11 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='returnorder',
             name='status',
-            field=models.PositiveIntegerField(choices=[(10, 'Pending'), (20, 'In Progress'), (30, 'Complete'), (40, 'Cancelled')], default=10, help_text='Return order status', verbose_name='Status'),
+            field=models.PositiveIntegerField(
+                choices=ReturnOrderStatus.items(),
+                default=ReturnOrderStatus.PENDING.value,
+                help_text='Return order status', verbose_name='Status'
+            ),
         ),
         migrations.AlterField(
             model_name='salesorder',

src/backend/InvenTree/order/migrations/0087_alter_salesorder_status.py

@@ -2,6 +2,8 @@
 
 from django.db import migrations, models
 
+from order.status_codes import SalesOrderStatus
+
 
 class Migration(migrations.Migration):
 
@@ -13,6 +15,10 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='salesorder',
             name='status',
-            field=models.PositiveIntegerField(choices=[(10, 'Pending'), (15, 'In Progress'), (20, 'Shipped'), (40, 'Cancelled'), (50, 'Lost'), (60, 'Returned')], default=10, help_text='Purchase order status', verbose_name='Status'),
+            field=models.PositiveIntegerField(
+                choices=SalesOrderStatus.items(),
+                default=SalesOrderStatus.PENDING.value,
+                help_text='Sales order status', verbose_name='Status'
+            ),
         ),
     ]

src/backend/InvenTree/order/migrations/0099_alter_salesorder_status.py

@@ -15,6 +15,10 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='salesorder',
             name='status',
-            field=models.PositiveIntegerField(choices=order.status_codes.SalesOrderStatus.items(), default=10, help_text='Purchase order status', verbose_name='Status'),
+            field=models.PositiveIntegerField(
+                choices=order.status_codes.SalesOrderStatus.items(),
+                default=order.status_codes.SalesOrderStatus.PENDING.value,
+                help_text='Sales order status', verbose_name='Status'
+            ),
         ),
     ]

src/backend/InvenTree/order/models.py

@@ -474,6 +474,7 @@ class PurchaseOrder(TotalPriceMixin, Order):
     status = models.PositiveIntegerField(
         default=PurchaseOrderStatus.PENDING.value,
         choices=PurchaseOrderStatus.items(),
+        verbose_name=_('Status'),
         help_text=_('Purchase order status'),
     )
 
@@ -967,7 +968,7 @@ class SalesOrder(TotalPriceMixin, Order):
         default=SalesOrderStatus.PENDING.value,
         choices=SalesOrderStatus.items(),
         verbose_name=_('Status'),
-        help_text=_('Purchase order status'),
+        help_text=_('Sales order status'),
     )
 
     @property

src/backend/InvenTree/part/api.py

@@ -43,7 +43,6 @@ from InvenTree.mixins import (
 from InvenTree.permissions import RolePermission
 from InvenTree.serializers import EmptySerializer
 from order.status_codes import PurchaseOrderStatusGroups, SalesOrderStatusGroups
-from part.admin import PartCategoryResource, PartResource
 from stock.models import StockLocation
 
 from . import serializers as part_serializers
@@ -245,7 +244,7 @@ class CategoryList(CategoryMixin, DataExportViewMixin, ListCreateAPI):
     # Use hierarchical ordering by default
     ordering = ['tree_id', 'lft', 'name']
 
-    search_fields = ['name', 'description']
+    search_fields = ['name', 'description', 'pathstring']
 
 
 class CategoryDetail(CategoryMixin, CustomRetrieveUpdateDestroyAPI):

src/backend/InvenTree/stock/api.py

@@ -418,7 +418,7 @@ class StockLocationList(DataExportViewMixin, ListCreateAPI):
 
     filter_backends = SEARCH_ORDER_FILTER
 
-    search_fields = ['name', 'description', 'tags__name', 'tags__slug']
+    search_fields = ['name', 'description', 'pathstring', 'tags__name', 'tags__slug']
 
     ordering_fields = ['name', 'pathstring', 'items', 'level', 'tree_id', 'lft']
 

src/frontend/src/components/forms/fields/RelatedModelField.tsx

@@ -236,25 +236,23 @@ export function RelatedModelField({
   // Field doesn't follow Mantine theming
   // Define color theme to pass to field based on Mantine theme
   const theme = useMantineTheme();
-
-  const colorschema = vars.colors.primaryColors;
   const { colorScheme } = useMantineColorScheme();
 
   const colors = useMemo(() => {
     let colors: any;
     if (colorScheme === 'dark') {
       colors = {
-        neutral0: colorschema[6],
+        neutral0: vars.colors.dark[6],
-        neutral5: colorschema[4],
+        neutral5: vars.colors.dark[4],
-        neutral10: colorschema[4],
+        neutral10: vars.colors.dark[4],
-        neutral20: colorschema[4],
+        neutral20: vars.colors.dark[4],
-        neutral30: colorschema[3],
+        neutral30: vars.colors.dark[3],
-        neutral40: colorschema[2],
+        neutral40: vars.colors.dark[2],
-        neutral50: colorschema[1],
+        neutral50: vars.colors.dark[1],
-        neutral60: colorschema[0],
+        neutral60: vars.colors.dark[0],
-        neutral70: colorschema[0],
+        neutral70: vars.colors.dark[0],
-        neutral80: colorschema[0],
+        neutral80: vars.colors.dark[0],
-        neutral90: colorschema[0],
+        neutral90: vars.colors.dark[0],
         primary: vars.colors.primaryColors[7],
         primary25: vars.colors.primaryColors[6],
         primary50: vars.colors.primaryColors[5],

src/frontend/src/components/render/Instance.tsx

@@ -157,7 +157,8 @@ export function RenderInlineModel({
   labels,
   url,
   navigate,
-  showSecondary = true
+  showSecondary = true,
+  tooltip
 }: {
   primary: string;
   secondary?: string;
@@ -168,6 +169,7 @@ export function RenderInlineModel({
   labels?: string[];
   url?: string;
   navigate?: any;
+  tooltip?: string;
 }): ReactNode {
   // TODO: Handle labels
 
@@ -181,7 +183,7 @@ export function RenderInlineModel({
   );
 
   return (
-    <Group gap="xs" justify="space-between" wrap="nowrap">
+    <Group gap="xs" justify="space-between" wrap="nowrap" title={tooltip}>
       <Group gap="xs" justify="left" wrap="nowrap">
         {prefix}
         {image && <Thumbnail src={image} size={18} />}

src/frontend/src/components/render/Part.tsx

@@ -56,13 +56,18 @@ export function RenderPartCategory(
   props: Readonly<InstanceRenderInterface>
 ): ReactNode {
   const { instance } = props;
-  const lvl = '-'.repeat(instance.level || 0);
 
   return (
     <RenderInlineModel
       {...props}
-      prefix={instance.icon && <ApiIcon name={instance.icon} />}
+      tooltip={instance.pathstring}
-      primary={`${lvl} ${instance.name}`}
+      prefix={
+        <>
+          <div style={{ width: 10 * (instance.level || 0) }}></div>
+          {instance.icon && <ApiIcon name={instance.icon} />}
+        </>
+      }
+      primary={instance.name}
       secondary={instance.description}
       url={
         props.link

src/frontend/src/components/render/Stock.tsx

@@ -17,7 +17,13 @@ export function RenderStockLocation(
   return (
     <RenderInlineModel
       {...props}
-      prefix={instance.icon && <ApiIcon name={instance.icon} />}
+      tooltip={instance.pathstring}
+      prefix={
+        <>
+          <div style={{ width: 10 * (instance.level || 0) }}></div>
+          {instance.icon && <ApiIcon name={instance.icon} />}
+        </>
+      }
       primary={instance.name}
       secondary={instance.description}
       url={