diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 3b3fa1e979..440b246f13 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,7 +1,7 @@
# Dockerfile for the InvenTree devcontainer
# This container is used for development of the InvenTree project, and includes all necessary dependencies for both backend and frontend development.
-FROM mcr.microsoft.com/devcontainers/python:3.14-trixie@sha256:66af9ee0a89e76f83b5c54a0cfdc19966ec8e443e294707f8f9b45f465b42cf1
+FROM mcr.microsoft.com/devcontainers/python:3.12-trixie@sha256:5440cb68898d190ad6c6e8a4634ce89d0645bea47f9c8beb75612bb8e3983711
# InvenTree paths
ENV INVENTREE_HOME="/home/inventree"
diff --git a/.devops/test_stats.yml b/.devops/test_stats.yml
deleted file mode 100644
index 5cf457b2e3..0000000000
--- a/.devops/test_stats.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-trigger:
- batch: true
- branches:
- include:
- - master
- - stable
- - refs/tags/*
- paths:
- include:
- - src/backend
-
-pool:
- vmImage: ubuntu-latest
-strategy:
- matrix:
- Python39:
- PYTHON_VERSION: 3.12
- maxParallel: 3
-
-steps:
-- task: UsePythonVersion@0
- inputs:
- versionSpec: '$(PYTHON_VERSION)'
- architecture: 'x64'
-
-- task: PythonScript@0
- displayName: 'Export project path'
- inputs:
- scriptSource: 'inline'
- script: |
- """Search all subdirectories for `manage.py`."""
- from glob import iglob
- from os import path
- # Python >= 3.5
- manage_py = next(iglob(path.join('**', 'manage.py'), recursive=True), None)
- if not manage_py:
- raise SystemExit('Could not find a Django project')
- project_location = path.dirname(path.abspath(manage_py))
- print('Found Django project in', project_location)
- print('##vso[task.setvariable variable=projectRoot]{}'.format(project_location))
-
-- script: |
- python -m pip install --upgrade pip setuptools wheel uv
- uv pip install --require-hashes -r src/backend/requirements.txt
- uv pip install --require-hashes -r src/backend/requirements-dev.txt
- sudo apt-get install poppler-utils
- sudo apt-get install libpoppler-dev
- uv pip install unittest-xml-reporting coverage invoke
- displayName: 'Install prerequisites'
- env:
- UV_SYSTEM_PYTHON: 1
-
-- script: |
- pushd '$(projectRoot)'
- invoke update --uv
- coverage run manage.py test --testrunner xmlrunner.extra.djangotestrunner.XMLTestRunner --no-input
- coverage xml -i
- displayName: 'Run tests'
- env:
- INVENTREE_DB_ENGINE: sqlite3
- INVENTREE_DB_NAME: inventree
- INVENTREE_MEDIA_ROOT: ./media
- INVENTREE_STATIC_ROOT: ./static
- INVENTREE_BACKUP_DIR: ./backup
- INVENTREE_SITE_URL: http://localhost:8000
- INVENTREE_PLUGINS_ENABLED: true
- UV_SYSTEM_PYTHON: 1
- INVENTREE_DEBUG: true
- INVENTREE_LOG_LEVEL: INFO
-
-- task: PublishTestResults@2
- inputs:
- testResultsFiles: "**/TEST-*.xml"
- testRunTitle: 'Python $(PYTHON_VERSION)'
- condition: succeededOrFailed()
-
-- task: PublishCodeCoverageResults@2
- inputs:
- summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml'
diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 2585d982d9..7065f6f054 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -15,6 +15,7 @@ on:
env:
python_version: 3.12
node_version: 24
+ plugin_creator_version: 1.20.0
# The OS version must be set per job
server_start_sleep: 60
@@ -153,7 +154,7 @@ jobs:
run: cd src/frontend && npx playwright install-deps
- name: Install Sample Plugin
run: |
- pip install -U inventree-plugin-creator
+ pip install -U inventree-plugin-creator==${{ env.plugin_creator_version }}
create-inventree-plugin --default
cd MyCustomPlugin && pip install -e . && cd frontend && npm install && npm run translate && npm run build
- name: Run Playwright tests
@@ -235,7 +236,7 @@ jobs:
run: cd src/frontend && npx playwright install-deps
- name: Install Sample Plugin
run: |
- pip install -U inventree-plugin-creator
+ pip install -U inventree-plugin-creator==${{ env.plugin_creator_version }}
create-inventree-plugin --default
cd MyCustomPlugin && pip install -e . && cd frontend && npm install && npm run translate && npm run build
- name: Playwright [${{ matrix.shard }} / 4]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 410d9a6054..4bea76d17c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
+- [#12250](https://github.com/inventree/InvenTree/pull/12250) adds "active" field to the ProjectCode model and API endpoints
+
### Changed
### Removed
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5fdb18c218..7b48b0db69 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,7 +23,6 @@ The InvenTree project is split into two main components: frontend and backend. T
```
InvenTree/
-├─ .devops/ # Files for Azure DevOps
├─ .github/ # Files for GitHub
│ ├─ actions/ # Reused actions
│ ├─ ISSUE_TEMPLATE/ # Templates for issues and pull requests
diff --git a/README.md b/README.md
index 7803cf8ec5..26afd2f362 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,6 @@
[](https://inventree.readthedocs.io/en/latest/?badge=latest)

[](https://app.netlify.com/sites/inventree/deploys)
-[](https://dev.azure.com/InvenTree/InvenTree%20test%20statistics/_build/latest?definitionId=3&branchName=testing)
[](https://bestpractices.coreinfrastructure.org/projects/7179)
[](https://securityscorecards.dev/viewer/?uri=github.com/inventree/InvenTree)
@@ -202,6 +201,7 @@ Find a full list of used third-party libraries in the license information dialog
+
diff --git a/contrib/container/Dockerfile b/contrib/container/Dockerfile
index 16418375e6..de1ab6ce8e 100644
--- a/contrib/container/Dockerfile
+++ b/contrib/container/Dockerfile
@@ -119,7 +119,8 @@ RUN pip install --user --require-hashes -r base_requirements.txt --no-cache-dir
rm -rf /root/.cache/pip
# Install frontend build dependencies
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.5/install.sh | bash && \
+# pinned to v0.40.5
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/1889911f0841e669de0be5bd02c737a3f1fd20fa/install.sh | bash && \
bash -c "export NVM_DIR="$HOME/.nvm" && source $HOME/.nvm/nvm.sh && \
nvm install $NODE_VERSION && corepack enable yarn && yarn config set network-timeout 600000 -g"
RUN bash -c "source $HOME/.nvm/nvm.sh && cd '${INVENTREE_HOME}' && invoke int.frontend-compile --extract"
diff --git a/contrib/container/requirements.in b/contrib/container/requirements.in
index 932b942c3d..1e29f27b0d 100644
--- a/contrib/container/requirements.in
+++ b/contrib/container/requirements.in
@@ -1,18 +1,18 @@
# Base python requirements for docker containers
# Basic package requirements
-invoke>=2.2.0 # Invoke build tool
-pyyaml>=6.0.1
-setuptools>=69.0.0
-wheel>=0.41.0
+invoke # Invoke build tool
+pyyaml
+setuptools
+wheel
# Database links
psycopg[binary, pool]
-mysqlclient>=2.2.0
-mariadb>=1.1.8
+mysqlclient
+mariadb
# gunicorn web server
-gunicorn>=22.0.0
+gunicorn
# LDAP required packages
django-auth-ldap # Django integration for ldap auth
diff --git a/contrib/container/requirements.txt b/contrib/container/requirements.txt
index 066208a24c..53d6a48a72 100644
--- a/contrib/container/requirements.txt
+++ b/contrib/container/requirements.txt
@@ -236,26 +236,26 @@ typing-extensions==4.15.0 \
# via
# -c src/backend/requirements.txt
# psycopg-pool
-uv==0.11.23 \
- --hash=sha256:03fbb0a1c7b6d15e96778bdd79e8d1826c6259fea17fc13337fb0744136953f2 \
- --hash=sha256:3a900c8fd757f8c3da9dc5532d9a22d30540e91fdefd63c93909fedbfd756655 \
- --hash=sha256:576d776a1ca62e3d8aba99f0d8ec607db91a5ebaf52feaff820f28ed820e1665 \
- --hash=sha256:61e6bd7e7f0fe24f103540ba19516443bea6e689022c787217310a1e64558e3f \
- --hash=sha256:6d7cea7d9ade3c1c3e3db1dfcc23d335bceaabf38f51e442b6f57f8f7885a9a6 \
- --hash=sha256:7a85330de0a7eb0d5c6cf03c80edfb86facad19df367a0b52fc906db1ab15ce9 \
- --hash=sha256:91d19c4249d7437b69b91c385134360d7ed9d0ee2e2e83e81d369867151e78c2 \
- --hash=sha256:985aa93c9d6223e32fc747e09662537c4073c9ebef59c0a4fd7c6949d1d24fb3 \
- --hash=sha256:9dd412127cbe0e115bd3fc5c6cbe9cf59f593273fafab9f7dc6b2ac95efcc7c1 \
- --hash=sha256:ac337dacd640aab1ef97cf00f8c01e2889f0fd0ef8460a0f4e816bf12bb5988b \
- --hash=sha256:b3f515fd6b43068f241467496bced62cb2ed36d52d4c0877cfe61a1240713d32 \
- --hash=sha256:b8abe7d6f5e0d92bd41a9c000bbd9c8387af7886df4790c0451a34e781b8a075 \
- --hash=sha256:bbc41182d655f92cd380ecdf378da7fc1598c6b19057208f450f0ee9c259f46a \
- --hash=sha256:c2089b992919858dabae89d410cbb5cecf9034d26bbb04f14e6da52dffced290 \
- --hash=sha256:ca1d37e851fb9323250385403d8512a71c0d1b6162c729ff4909f37cfd067920 \
- --hash=sha256:d256f90513d01ff6cbc2f17d88c0ccde65d138500df547ece214e6a50731c4b7 \
- --hash=sha256:d62410e5f60a961cfda00ead8a1cc5fd37d052afda021099e488e90c15419beb \
- --hash=sha256:e7e215d69ea21fd5824a63edf8fef933bee2c028a0c2930651cfa6b88ca4ff8e \
- --hash=sha256:f2476dda35866ea3ded3a5905759da2d32dfac36dfd5b3428191a99a8ce15b02
+uv==0.11.24 \
+ --hash=sha256:047d763d20d71968c00f4afec40b0e75d9da7e3693f725b9f502d84a25256893 \
+ --hash=sha256:0e100b9cbc59beff2730840ac989b1f100cc03c90514e7cab6992a1f3f13784e \
+ --hash=sha256:3176668ea8a2318d775c0d9188661c61ccc36790220724b1d360fcc8945d520e \
+ --hash=sha256:356435577fae11fafe7a067ee3269cccefd35b031b83a3a36c87fe9d192bffba \
+ --hash=sha256:38f38c9449aafd71dc0fa35e66a8a547ee48947b2f2f94084893c2afe6058cfa \
+ --hash=sha256:438f8291fb9daea30a4bd333299b82e6ef755578302745a021162f328cfcfc68 \
+ --hash=sha256:48a6123f71b801e0e0b8a38520b011632ad81e0a043445044ce5b1a7b1cec7b6 \
+ --hash=sha256:6ecdad43e870f88d3772d9d37e877259ae35ec374d51589805cdcf6196205829 \
+ --hash=sha256:79757f90b7765996366b80e77cad13555c7f7e1282ca8d8b686ee21773ab0b77 \
+ --hash=sha256:8346b0086d213b80430f3bb4477379a8a4fa550b03447d23c84eee85c2e52bc4 \
+ --hash=sha256:8602a1b6300a3a948afacc62e1cb933c8394c27966db85ed7e29483300b69dc4 \
+ --hash=sha256:9312b6fd44361674e9c847a828ded792493766697816261e05848a024fe34129 \
+ --hash=sha256:bf568c62dddd55ad9c85a16ffdfbcc7746be9c3159ed644e4f9e6f5e44905cbb \
+ --hash=sha256:c4ab221c0a949f8006a7582786dae384706b2f82016a0db60baa7cc696042705 \
+ --hash=sha256:c8ec3caf656645f58b53cb9aee9aa95cfc65c82ba2d7f1362bfd2660d1484307 \
+ --hash=sha256:d6a49543c659c0cf1ff4c944955d97e69dbce4b76e3d284f5a92cea19133ebb6 \
+ --hash=sha256:e499579f557abf17b8ffd1490d3e827748aea096f6eaa66737e729e046449f08 \
+ --hash=sha256:e7e78c18686202c8b8715bebb83bfaf58f82d7fb848b6a5ae4e925a9fac3de4c \
+ --hash=sha256:ed0c9a9d7909f0e48a9dafe666ca9ebefe2a1534e51ed05c0a7de7406465f868
# via -r contrib/container/requirements.in
wheel==0.47.0 \
--hash=sha256:212281cab4dff978f6cedd499cd893e1f620791ca6ff7107cf270781e587eced \
diff --git a/contrib/dev_reqs/requirements.in b/contrib/dev_reqs/requirements.in
index bb389b1af7..115b23c47f 100644
--- a/contrib/dev_reqs/requirements.in
+++ b/contrib/dev_reqs/requirements.in
@@ -1,4 +1,4 @@
# Packages needed for CI/packages
requests==2.34.2
pyyaml==6.0.3
-jc==1.25.6
+jc
diff --git a/contrib/dev_reqs/requirements.txt b/contrib/dev_reqs/requirements.txt
index 916e1453b7..d5a831592b 100644
--- a/contrib/dev_reqs/requirements.txt
+++ b/contrib/dev_reqs/requirements.txt
@@ -145,9 +145,9 @@ idna==3.18 \
# via
# -c src/backend/requirements.txt
# requests
-jc==1.25.6 \
- --hash=sha256:27f58befc7ae0a4c63322926c5f1ec892e3eac4a065eff3b07cfe420a6924a07 \
- --hash=sha256:7367b59e6e0da8babeede1e5b0da083f3c5aa6b6e585b4aed28dd7c4b2d76162
+jc==1.25.7 \
+ --hash=sha256:5ed6a0da915c931c04693cab806d5c31d9ef14ca998c6c32308460d37cb30baf \
+ --hash=sha256:63481e34d92715781e1b094eca7d76d122a14489463d45b7f3e8180f44ea3a10
# via -r contrib/dev_reqs/requirements.in
pygments==2.20.0 \
--hash=sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f \
diff --git a/docs/docs/project/sponsored_resources.md b/docs/docs/project/sponsored_resources.md
index 0a733b0686..4c206bcc06 100644
--- a/docs/docs/project/sponsored_resources.md
+++ b/docs/docs/project/sponsored_resources.md
@@ -14,6 +14,8 @@ Individuals and companies can also support via [GitHub sponsors](https://github.
- [Codecov](https://codecov.io) - Code coverage as a service, used to track the code coverage of the various components
- [Netlify](https://www.netlify.com/) - Static site hosting provider, used to test deploy the frontend and website
- [Depot](https://depot.dev/?utm_source=inventree) - Docker build accelerator, used to build the multi-arch images for the InvenTree docker image
+ - [CodSpeed](https://codspeed.io/) - Performance testing platform, used to track the performance of a few performance benchmarks
+- [Flakiness](https://flakiness.io/) - Frontend test flakiness detection, used to track the flakiness of the various test harnesses
## Past Supporters
diff --git a/docs/docs/settings/global.md b/docs/docs/settings/global.md
index 2e22defb8e..ee5820408a 100644
--- a/docs/docs/settings/global.md
+++ b/docs/docs/settings/global.md
@@ -226,6 +226,7 @@ Configuration of stock item options
{{ globalsetting("STOCK_SHOW_INSTALLED_ITEMS") }}
{{ globalsetting("STOCK_ENFORCE_BOM_INSTALLATION") }}
{{ globalsetting("STOCK_ALLOW_OUT_OF_STOCK_TRANSFER") }}
+{{ globalsetting("STOCK_MERGE_ON_TRANSFER") }}
{{ globalsetting("TEST_STATION_DATA") }}
### Build Orders
diff --git a/docs/mlc_config.json b/docs/mlc_config.json
index a3e538ca10..91d6692af8 100644
--- a/docs/mlc_config.json
+++ b/docs/mlc_config.json
@@ -31,9 +31,6 @@
},
{
"pattern": "https://opensource.org/license/MIT"
- },
- {
- "pattern": "^https://dev.azure.com"
}
]
}
diff --git a/pyproject.toml b/pyproject.toml
index 1bf6587443..1076f0896a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -105,17 +105,16 @@ generate-hashes=true
extra-paths = ["src/backend/InvenTree"]
[tool.ty.rules]
-unresolved-reference="ignore" # 21 # see https://github.com/astral-sh/ty/issues/220
-unresolved-attribute="ignore" # 505 # need Plugin Mixin typing
+unresolved-attribute="ignore" # 837 # need Plugin Mixin typing
call-non-callable="ignore" # 8 ##
-invalid-assignment="ignore" # 17 # need to wait for better django field stubs
-invalid-method-override="ignore" # 104
-invalid-return-type="ignore" # 22 ##
-# possibly-missing-attribute="ignore" # 25 # https://github.com/astral-sh/ty/issues/164
-unknown-argument="ignore" # 3 # need to wait for better django field stubs
+invalid-assignment="ignore" # 40 # need to wait for better django field stubs
+invalid-method-override="ignore" # 103
+invalid-return-type="ignore" # 44 ##
invalid-argument-type="ignore" # 49
-no-matching-overload="ignore" # 3 # need to wait for betterdjango field stubs
-# possibly-unbound-attribute="ignore" # 21
+no-matching-overload="ignore" # 10 # need to wait for betterdjango field stubs
+
+# warn about unused ignore comments
+unused-ignore-comment = "error"
[tool.coverage.run]
source = ["src/backend/InvenTree", "InvenTree"]
diff --git a/src/backend/InvenTree/InvenTree/api_version.py b/src/backend/InvenTree/InvenTree/api_version.py
index 14341d04fb..b34c1ef5c5 100644
--- a/src/backend/InvenTree/InvenTree/api_version.py
+++ b/src/backend/InvenTree/InvenTree/api_version.py
@@ -1,11 +1,19 @@
"""InvenTree API version information."""
# InvenTree API version
-INVENTREE_API_VERSION = 511
+INVENTREE_API_VERSION = 513
"""Increment this API version number whenever there is a significant change to the API that any clients need to know about."""
INVENTREE_API_TEXT = """
+v513 -> 2026-06-25 : https://github.com/inventree/InvenTree/pull/12250
+ - Adds "active" field to the ProjectCode model and API endpoints
+
+v512 -> 2026-06-20 : https://github.com/inventree/InvenTree/pull/12022
+ - Adds optional "merge" field to each item in the Stock Transfer API endpoint
+ - When merge is enabled, transferred stock is combined into compatible existing stock at the destination
+ - Stock merge tracking entries now include an "added" delta field.
+
v511 -> 2026-06-19 : https://github.com/inventree/InvenTree/pull/12204
- Adds new filtering options to PartCategoryTree and StockLocationTree API endpoints
diff --git a/src/backend/InvenTree/InvenTree/exceptions.py b/src/backend/InvenTree/InvenTree/exceptions.py
index 61bde3b275..597f1f5063 100644
--- a/src/backend/InvenTree/InvenTree/exceptions.py
+++ b/src/backend/InvenTree/InvenTree/exceptions.py
@@ -25,6 +25,7 @@ def log_error(
error_data: Optional[str] = None,
scope: Optional[str] = None,
plugin: Optional[str] = None,
+ user_id: Optional[int] = None,
):
"""Log an error to the database.
@@ -37,6 +38,7 @@ def log_error(
error_data: The error data (optional, overrides 'data')
scope: The scope of the error (optional)
plugin: The plugin name associated with this error (optional)
+ user_id: The user ID associated with this error (optional)
"""
import InvenTree.ready
@@ -71,6 +73,9 @@ def log_error(
except AttributeError:
data = 'No traceback information available'
+ if user_id:
+ data = f'User ID: {user_id}\n{data}'
+
# Log error to stderr
logger.error(info)
diff --git a/src/backend/InvenTree/common/admin.py b/src/backend/InvenTree/common/admin.py
index e35d269f0b..44ac152760 100644
--- a/src/backend/InvenTree/common/admin.py
+++ b/src/backend/InvenTree/common/admin.py
@@ -115,7 +115,8 @@ class BarcodeScanResultAdmin(admin.ModelAdmin):
class ProjectCodeAdmin(admin.ModelAdmin):
"""Admin settings for ProjectCode."""
- list_display = ('code', 'description')
+ list_display = ('code', 'description', 'active')
+ list_filter = ('active',)
search_fields = ('code', 'description')
diff --git a/src/backend/InvenTree/common/api.py b/src/backend/InvenTree/common/api.py
index f2bec5e94b..f2a1a4c636 100644
--- a/src/backend/InvenTree/common/api.py
+++ b/src/backend/InvenTree/common/api.py
@@ -491,7 +491,7 @@ class ProjectCodeList(DataExportViewMixin, ListCreateAPI):
filter_backends = SEARCH_ORDER_FILTER
ordering_fields = ['code']
-
+ filterset_fields = ['active']
search_fields = ['code', 'description']
diff --git a/src/backend/InvenTree/common/migrations/0045_projectcode_active.py b/src/backend/InvenTree/common/migrations/0045_projectcode_active.py
new file mode 100644
index 0000000000..c0a8461972
--- /dev/null
+++ b/src/backend/InvenTree/common/migrations/0045_projectcode_active.py
@@ -0,0 +1,22 @@
+# Generated by Django 5.2.15 on 2026-06-25 03:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("common", "0044_notificationmessage_charfield_pk"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="projectcode",
+ name="active",
+ field=models.BooleanField(
+ default=True,
+ help_text="Is this project code active?",
+ verbose_name="Active",
+ ),
+ ),
+ ]
diff --git a/src/backend/InvenTree/common/models.py b/src/backend/InvenTree/common/models.py
index 3e903ac9d2..b07dd08eeb 100644
--- a/src/backend/InvenTree/common/models.py
+++ b/src/backend/InvenTree/common/models.py
@@ -181,6 +181,12 @@ class ProjectCode(InvenTree.models.InvenTreeMetadataModel):
help_text=_('Project description'),
)
+ active = models.BooleanField(
+ default=True,
+ verbose_name=_('Active'),
+ help_text=_('Is this project code active?'),
+ )
+
responsible = models.ForeignKey(
users.models.Owner,
on_delete=models.SET_NULL,
diff --git a/src/backend/InvenTree/common/serializers.py b/src/backend/InvenTree/common/serializers.py
index 3c0ef9e859..f37e46e594 100644
--- a/src/backend/InvenTree/common/serializers.py
+++ b/src/backend/InvenTree/common/serializers.py
@@ -417,7 +417,14 @@ class ProjectCodeSerializer(DataImportExportSerializerMixin, InvenTreeModelSeria
"""Meta options for ProjectCodeSerializer."""
model = common_models.ProjectCode
- fields = ['pk', 'code', 'description', 'responsible', 'responsible_detail']
+ fields = [
+ 'pk',
+ 'code',
+ 'description',
+ 'active',
+ 'responsible',
+ 'responsible_detail',
+ ]
responsible_detail = OwnerSerializer(
source='responsible', read_only=True, allow_null=True
diff --git a/src/backend/InvenTree/common/setting/system.py b/src/backend/InvenTree/common/setting/system.py
index d6fe3e3a6b..f950129187 100644
--- a/src/backend/InvenTree/common/setting/system.py
+++ b/src/backend/InvenTree/common/setting/system.py
@@ -793,6 +793,14 @@ SYSTEM_SETTINGS: dict[str, InvenTreeSettingsKeyType] = {
'default': False,
'validator': bool,
},
+ 'STOCK_MERGE_ON_TRANSFER': {
+ 'name': _('Merge stock with existing stock on transfer by default'),
+ 'description': _(
+ 'Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)'
+ ),
+ 'default': False,
+ 'validator': bool,
+ },
'BUILDORDER_REFERENCE_PATTERN': {
'name': _('Build Order Reference Pattern'),
'description': _('Required pattern for generating Build Order reference field'),
diff --git a/src/backend/InvenTree/common/tests.py b/src/backend/InvenTree/common/tests.py
index 2bd0c41db8..6935e3b475 100644
--- a/src/backend/InvenTree/common/tests.py
+++ b/src/backend/InvenTree/common/tests.py
@@ -1752,6 +1752,22 @@ class ProjectCodesTest(InvenTreeAPITestCase):
str(response.data['code']),
)
+ def test_filter_active(self):
+ """Test that the 'active' field can be filtered via the API."""
+ # Mark one code as inactive
+ code = ProjectCode.objects.first()
+ code.active = False
+ code.save()
+
+ active_count = ProjectCode.objects.filter(active=True).count()
+ inactive_count = ProjectCode.objects.filter(active=False).count()
+
+ response = self.get(self.url, data={'active': True}, expected_code=200)
+ self.assertEqual(len(response.data), active_count)
+
+ response = self.get(self.url, data={'active': False}, expected_code=200)
+ self.assertEqual(len(response.data), inactive_count)
+
def test_write_access(self):
"""Test that non-staff users have read-only access."""
# By default user has staff access, can create a new project code
diff --git a/src/backend/InvenTree/data_exporter/mixins.py b/src/backend/InvenTree/data_exporter/mixins.py
index f40ee113f2..0d58d0efff 100644
--- a/src/backend/InvenTree/data_exporter/mixins.py
+++ b/src/backend/InvenTree/data_exporter/mixins.py
@@ -99,6 +99,10 @@ class DataExportSerializerMixin:
fields.update(self.get_child_fields(name, field))
continue
+ # Skip 'many' fields (e.g. nested serializers)
+ if getattr(field, 'many', False):
+ continue
+
fields[name] = field
return fields
diff --git a/src/backend/InvenTree/importer/models.py b/src/backend/InvenTree/importer/models.py
index 00f361be02..ce64e0677d 100644
--- a/src/backend/InvenTree/importer/models.py
+++ b/src/backend/InvenTree/importer/models.py
@@ -6,6 +6,7 @@ from datetime import datetime
from typing import Optional
from django.contrib.auth.models import User
+from django.core.exceptions import FieldDoesNotExist
from django.core.exceptions import ValidationError as DjangoValidationError
from django.core.validators import FileExtensionValidator
from django.db import models
@@ -200,7 +201,7 @@ class DataImportSession(models.Model):
related_field = model_class._meta.get_field(field_name)
model = related_field.remote_field.model
return model
- except (AttributeError, models.FieldDoesNotExist):
+ except (AttributeError, FieldDoesNotExist):
return None
def extract_columns(self) -> None:
diff --git a/src/backend/InvenTree/locale/ar/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/ar/LC_MESSAGES/django.po
index 55d5fd2370..42d29c23fd 100644
--- a/src/backend/InvenTree/locale/ar/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/ar/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Arabic\n"
"Language: ar_SA\n"
@@ -109,9 +109,9 @@ msgstr ""
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "ملاحظات"
@@ -550,13 +550,13 @@ msgstr ""
msgid "Parent Build"
msgstr ""
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr ""
msgid "Allocated"
msgstr ""
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr ""
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr ""
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr ""
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr ""
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr ""
msgid "Unit definition"
msgstr ""
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr ""
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr ""
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr ""
@@ -2673,8 +2673,8 @@ msgstr ""
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr ""
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr ""
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr ""
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr ""
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr ""
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr ""
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr ""
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr ""
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr ""
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr ""
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr ""
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr ""
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr ""
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr ""
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr ""
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr ""
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr ""
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr ""
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr ""
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr ""
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr ""
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr ""
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr ""
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr ""
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr ""
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr ""
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr ""
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr ""
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr ""
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr ""
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr ""
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9262,71 +9270,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr ""
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr ""
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr ""
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr ""
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9565,7 +9573,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/bg/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/bg/LC_MESSAGES/django.po
index d90b2d90f6..525e23765e 100644
--- a/src/backend/InvenTree/locale/bg/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/bg/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Bulgarian\n"
"Language: bg_BG\n"
@@ -109,9 +109,9 @@ msgstr ""
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Бележки"
@@ -550,13 +550,13 @@ msgstr ""
msgid "Parent Build"
msgstr ""
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr ""
msgid "Allocated"
msgstr ""
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr ""
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr ""
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr ""
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr ""
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr ""
msgid "Unit definition"
msgstr ""
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr ""
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr ""
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr ""
@@ -2673,8 +2673,8 @@ msgstr ""
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr ""
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr ""
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr ""
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr ""
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr ""
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr ""
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr ""
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr ""
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr ""
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr ""
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr ""
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr ""
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr ""
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr ""
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr ""
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr ""
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr ""
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr ""
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr ""
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr ""
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr ""
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr ""
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr ""
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr ""
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr ""
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr ""
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr ""
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr ""
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr ""
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr ""
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr ""
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9262,71 +9270,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr ""
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr ""
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr ""
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr ""
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9565,7 +9573,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/cs/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/cs/LC_MESSAGES/django.po
index 3b6dedbd31..56fd688344 100644
--- a/src/backend/InvenTree/locale/cs/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/cs/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Czech\n"
"Language: cs_CZ\n"
@@ -109,9 +109,9 @@ msgstr "Neplaté desetinné číslo"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Poznámky"
@@ -550,13 +550,13 @@ msgstr "Stav objednávky"
msgid "Parent Build"
msgstr "Nadřazená sestava"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "Zahrnout varianty"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "Objednávka nevyřízená"
msgid "Allocated"
msgstr "Přiděleno"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "Spotřebováno"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Dostupné"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "Na objednávku"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr "Sestava nenalezena"
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Výrobní příkaz"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Lokace"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr "Výstup"
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr "Filtrovat podle ID výstupní položky zásoby. Použijte 'null' pro nalezení odinstalovaných položek sestavení."
@@ -1830,7 +1830,7 @@ msgstr "Definice"
msgid "Unit definition"
msgstr "Definice jednotky"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Příloha"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr "Logický klíč statusu, který je rovný tomuto vlastnímu statusu v podnikové logice"
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Hodnota"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr "Data z odezvy z čárového kódu"
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Výsledek"
@@ -2673,8 +2673,8 @@ msgstr "Jak často aktualizovat směnné kurzy (pro vypnutí nastavte na nulu)"
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "dny"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "Umožnit přesun skladových položek, které nejsou na skladě, mezi skladovými místy"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "Referenční vzor objednávky sestavy"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Požadovaný vzor pro generování referenčního pole Objednávka sestavy"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "Vyžadovat odpovědného vlastníka"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "Ke každé objednávce musí být přiřazen odpovědný vlastník"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr "Vyžadovat aktivní díl"
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr "Zabránit vytváření výrobních příkazů pro neaktivní díly"
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr "Vyžadovat uzamčený díl"
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr "Zabránit vytváření výrobních příkazů pro odemčené díly"
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr "Vyžadovat schválený kusovník"
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr "Zabránit vytváření výrobních příkazů, dokud není schválen kusovník"
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr "Vyžadovat uzavření podobjednávek"
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr "Zabránit dokončení výrobního příkazu dokud nebudou uzavřeny všechny podpříkazy"
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr "Externí výrobní příkazy"
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr "Povolit funkcionalitu externích výrobních příkazů"
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr "Vyžadovat externí výrobní příkazy"
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr "Vyžadovat externí výrobní příkaz při objenání montovaných dílů od externího dodavatele"
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "Blokovat, dokud testy neprojdou"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "Zabránit dokončení výstupů sestavy, dokud neprojdou všechny požadované testy"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "Povolit vracení objednávek"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "Povolit funkci vrácení objednávky v uživatelském rozhraní"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "Referenční vzor návratové objednávky"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "Požadovaný vzor pro vygenerování referenčního pole Návratová objednávka"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "Úprava dokončených návratových objednávek"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "Umožnit úpravu návratových objednávek po jejich dokončení"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "Referenční vzor prodejní objednávky"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "Požadovaný vzor pro generování referenčního pole prodejní objednávky"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "Výchozí přeprava prodejní objednávky"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "Povolit vytvoření výchozí přepravy s prodejními objednávkami"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "Úprava dokončených prodejních objednávek"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "Umožnit úpravy prodejních objednávek po jejich odeslání nebo dokončení"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr "Zásilka vyžaduje kontrolu"
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr "Zabránit dokončení zásilek dokud nebudou zkontrolovány položky"
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "Označit odeslané objednávky jako dokončené"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "Prodejní objednávky označené jako odeslané se automaticky dokončí a obejdou stav „odesláno“"
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr "Povolit převodní příkazy"
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr "Povolit funkci převodních příkazů v uživatelském rozhraní"
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr "Referenční vzor převodního příkazu"
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr "Požadovaný vzor pro generování pole převodního příkazu"
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr "Blokovat nekompletné testy položky"
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr "Zabránit přiřazení skladových položek do prodejních objednávek, pokud jsou požadované testy neúplné"
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "Referenční vzor nákupní objednávky"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "Požadovaný vzor pro generování referenčního pole nákupní objednávky"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "Úprava dokončených nákupních objednávek"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "Umožnit úpravy nákupních objednávek po jejich odeslání nebo dokončení"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr "Převést měnu"
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr "Převést hodnotu předmětu na základní měnu při příjmu zásob"
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Automatické dokončování nákupních objednávek"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "Automaticky označit nákupní objednávky jako kompletní, jakmile jsou přijaty všechny řádkové položky"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Povolit pole zapomenutého hesla"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Povolení funkce zapomenutého hesla na přihlašovacích stránkách"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Povolit registrace"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Povolit samoregistraci uživatelů na přihlašovacích stránkách"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "Povolit SSO"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "Povolit SSO na přihlašovacích stránkách"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "Povolit SSO registraci"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Povolit samoregistraci uživatelů prostřednictvím SSO na přihlašovacích stránkách"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "Povolit synchronizaci SSO skupin"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "Povolit synchronizaci InvenTree skupin se skupinami poskytnutými IdP"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "klíč SSO skupiny"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr "Název deklarace skupinového atributu poskytnutého IdP"
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr "mapa SSO skupiny"
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr "Mapování ze skupin SSO do místních InvenTree skupin. Pokud místní skupina neexistuje, bude vytvořena."
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr "Odstranit skupiny mimo SSO"
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr "Zdali mají být skupiny přiřazené uživateli odstraněny pokud nemají backend of IdP. Vypnutí tohoto nastavení můžu způsobit problémy se zabezpečením"
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "Vyžadován e-mail"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "Požadovat, aby uživatel při registraci zadal e-mail"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "Automaticky vyplnit SSO uživatele"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Automaticky vyplnit údaje o uživateli z údajů o účtu SSO"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "Mail dvakrát"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "Při registraci dvakrát požádat uživatele o zadání e-mailu"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Heslo dvakrát"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "Při registraci dvakrát požádat uživatele o heslo"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Povolené domény"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "Omezit registraci na určité domény (oddělené čárkou a začínající @)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Skupina při registraci"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr "Skupina do které jsou nový uživatelé přiřazeni při registraci. Pokud je povolena synchronizace SSO skupin, tato skupina lze přiřadit pouze pokud nezle přiřadit skupinu od IdP."
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "Vynutit MFA"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "Uživatelé musí používat vícefaktorové zabezpečení."
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr "Povolení tohoto nastavení bude vyžadovat více fázové ověření u všech uživatelů. Všechny relace budou okamžitě ukončeny."
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Zkontrolovat pluginy při spuštění"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "Zkontrolujte, zda jsou při spuštění nainstalovány všechny pluginy - povolit v kontejnerových prostředích"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "Zkontrolovat aktualizace pluginů"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "Povolit pravidelné kontroly aktualizací nainstalovaných pluginů"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "Povolit integraci URL"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "Povolit plug-inům přidávat trasy URL"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "Povolit integraci navigace"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "Povolit integrování pluginů do navigace"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "Povolit integraci aplikací"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "Povolit pluginům přidávát aplikace"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "Povolit integraci plánu"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Povolit pluginům spouštění naplánovaných úloh"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "Povolit integraci událostí"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "Povolit pluginům reagovat na interní události"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "Povolit rozhraní intergace"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "Povolit integrování pluginů do uživatelského rozhraní"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr "Povolit integraci emailu"
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr "Povolit pluginům zpracování odchozích/příchozích emailů"
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr "Povolit projektové kódy"
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr "Povolit projektové kódy pro sledování projektů"
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr "Povolit inventuru"
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr "Povolit funkcionalitu pro zaznamenávání historických stavů zásob a hodnoty"
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "Vyloučit externí umístění"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr "Vyloučit skladové položky z externích lokací z inventury"
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "Perioda automatické inventury"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr "Počet dní mezi automatickým záznamem inventury"
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr "Odstranit staré záznamy inventur"
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr "Odstranit záznamy inventur starší než zadaný počet dní"
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr "Interval odstranění inventury"
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr "Záznamy inventur budou odstraněny po zadaném počtu dní"
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr "Odstranit staré záznamy sledování zásob"
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr "Odstranit staré záznamy sledování zásob starší než zadaný počet dní"
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr "Interval odstranění sledování zásob"
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr "Záznamy sledování zásob budou odstraněny po zadaném počtu dní"
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "Zobrazit celá jména uživatelů"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Zobrazit plná jména uživatelů namísto uživatelských jmen"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr "Zobrazit uživatelské profily"
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr "Zobrazit profily uživatelů na jejich profilové stránce"
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr "Týden začíná"
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr "Počáteční den v týdnu pro zobrazení v zobrazení kalendáře"
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr "Neděle"
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr "Pondělí"
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr "Úterý"
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr "Středa"
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr "Čtvrtek"
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr "Pátek"
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr "Sobota"
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr "Horizont kalendáře"
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr "Počet měsíců do budoucna, které se zobrazí v zobrazení kalendáře"
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr "měsíce"
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "Povolit data zkušební stanice"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "Povolit sběr dat ze zkušební stanice pro výsledky testů"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr "Povolit ping stroje"
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr "Povolit pravidelný úkol pingu registrovaných strojů pro kontrolu jejich stavu"
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr "Celkové dostupné zásoby v době inventury"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Datum"
@@ -8084,77 +8092,77 @@ msgstr "Poskytuje podporu pro skenování TME čárových kódů"
msgid "The Supplier which acts as 'TME'"
msgstr "Dodavatel, který funguje jako 'TME'"
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr "Pouze superuživatelské účty mohou spravovat pluginy"
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr "Instalace pluginu je zakázana"
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr "Není k dispozici žádný název balíčku nebo URL pro instalaci"
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr "Neplatné znaky v názvu balíčku nebo v URL"
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "Plugin byl úspěšně nainstalován"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "Plugin nainstalovaný do {path}"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr "Plugin nebyl nalezen v registru"
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr "Plugin není plugin balíček"
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr "Název balíčku pluginu nebyl nalezen"
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr "Pouze pracovníci mohou spravovat pluginy"
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr "Odinstalace pluginu je zakázána"
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr "Plugin nemůže být odinstalován, protože je aktuálně aktivní"
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr "Plugin nemůže být odinstalován, protože je povinný"
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr "Plugin nemůže být odinstalován, protože to je vzorový plugin"
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr "Plugin nemůže být odinstalován, protože to je vestavěný plugin"
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr "Plugin není nainstalován"
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr "Inslalace pluginu nebyla nalezena"
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr "Plugin odinstalován úspěšně"
@@ -8206,21 +8214,21 @@ msgstr "Balíčkový plugin"
msgid "Plugin"
msgstr "Plugin"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "Nebyl nalezen žádný autor"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "Plugin '{p}' není kompatibilní s aktuální verzí InvenTree {v}"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "Plugin vyžaduje alespoň verzi {v}"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "Plugin vyžaduje nanejvýš verzi {v}"
@@ -9218,7 +9226,7 @@ msgstr "Množství neodpovídá sériovým číslům"
msgid "Cannot assign stock to structural location"
msgstr "Nelze přiřadit zásoby ke strukturálnímu umístění"
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr "Testovací šablona neexistuje"
@@ -9238,7 +9246,7 @@ msgstr "Skladová položka obsahuje jiné položky"
msgid "Stock item has been assigned to a customer"
msgstr "Skladová položka byla přidělena zákazníkovi"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "Skladová položka je ve výrobě"
@@ -9262,71 +9270,71 @@ msgstr "Skladové položky musí odkazovat na stejný díl dodavatele"
msgid "Stock status codes must match"
msgstr "Kódy stavu zásob se musí shodovat"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "Zásobová položka nemůže být přesunuta, protože není skladem"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr "Sledování skladových položek"
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Poznámky k záznamu"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr "Výsledek testu skladové položky"
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Pro tuto zkoušku musí být uvedena hodnota"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "Pro tento test musí být nahrána příloha"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr "Neplatná hodnota pro tento test"
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Výsledek testu"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "Výstupní hodnota testu"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "Příloha výsledků testu"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "Poznámky testu"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr "Testovací stanice"
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr "Identifikátor testovací stanice kde byl test proveden"
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr "Začátek"
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr "Čas začátku testu"
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr "Ukončeno"
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr "Čas dokončení testu"
@@ -9440,8 +9448,8 @@ msgstr "Nebyla poskytnuta žádná skladová položka"
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "Množství nesmí překročit dostupné skladové množství ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "Cílové skladové umístění"
@@ -9565,7 +9573,7 @@ msgstr "Vybraná společnost není zákazník"
msgid "Stock assignment notes"
msgstr "Poznámky ke skladové položce"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "Musí být poskytnut seznam skladových položek"
@@ -9613,27 +9621,31 @@ msgstr "Skladová položka je již na skladě"
msgid "Quantity must not be negative"
msgstr "Množství nesmí být záporné"
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "Poznámky ke skladovací transakci"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr "Nastavit umístění zásob pro počítané položky (volitelné)"
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr "Sloučit do existující zásoby"
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "Poznámky ke skladovací transakci"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr "Nastavit umístění zásob pro počítané položky (volitelné)"
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr "Sloučit vrácené položky do existujích položek, pokud je to možné"
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr "Další sériové číslo"
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr "Předchozí sériové číslo"
diff --git a/src/backend/InvenTree/locale/da/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/da/LC_MESSAGES/django.po
index 1689042d54..3a95a591b3 100644
--- a/src/backend/InvenTree/locale/da/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/da/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Danish\n"
"Language: da_DK\n"
@@ -109,9 +109,9 @@ msgstr "Ugyldig decimalværdi"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Bemærkninger"
@@ -550,13 +550,13 @@ msgstr "Ordre status"
msgid "Parent Build"
msgstr "Overordnet produktion"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "Ordre Udestående"
msgid "Allocated"
msgstr "Allokeret"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Tilgængelig"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr ""
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Produktionsordre"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Lokation"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr ""
msgid "Unit definition"
msgstr ""
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Vedhæftning"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Værdi"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr ""
@@ -2673,8 +2673,8 @@ msgstr ""
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr ""
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr ""
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr ""
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr ""
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr ""
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr ""
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr ""
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr ""
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr ""
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr ""
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr ""
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr ""
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr ""
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr ""
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr ""
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr ""
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr ""
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr ""
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr ""
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr ""
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr ""
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr ""
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr ""
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr ""
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr ""
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr ""
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr ""
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr ""
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr ""
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr ""
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr ""
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9262,71 +9270,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr ""
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr ""
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr ""
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr ""
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9565,7 +9573,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/de/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/de/LC_MESSAGES/django.po
index 9a26d021ad..48f0fd79f4 100644
--- a/src/backend/InvenTree/locale/de/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/de/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: German\n"
"Language: de_DE\n"
@@ -109,9 +109,9 @@ msgstr "Ungültiger Dezimalwert"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Notizen"
@@ -550,13 +550,13 @@ msgstr "Bestellstatus"
msgid "Parent Build"
msgstr "Eltern-Bauauftrag"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "Varianten einschließen"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "Offene Bestellung"
msgid "Allocated"
msgstr "Zugeordnet"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "Verbraucht"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Verfügbar"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "Bestellt"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Bauauftrag"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Lagerort"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr "Bauprodukt"
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr "Definition"
msgid "Unit definition"
msgstr "Einheitsdefinition"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Anhang"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Wert"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Ergebnis"
@@ -2673,8 +2673,8 @@ msgstr "Wie oft Wechselkurse aktualisiert werden sollen (auf Null zum Deaktivier
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "Tage"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "Lagerartikel, die nicht auf Lager sind, können zwischen Lagerstandorten übertragen werden"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "Bauauftragsreferenz-Muster"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Benötigtes Muster für die Generierung des Referenzfeldes für Bauaufträge"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "Verantwortlicher Besitzer erforderlich"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "Jeder Bestellung muss ein verantwortlicher Besitzer zugewiesen werden"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "Blockieren bis Test bestanden"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "Verhindert die Fertigstellung bis alle erforderlichen Tests bestanden sind"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "Rücksendungen aktivieren"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "Aktivieren der Rücksendung-Funktion in der Benutzeroberfläche"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "Referenz Muster für Rücksendungen"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "Benötigtes Muster für die Generierung des Referenzfeldes für Rücksendungen"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "Abgeschlossene Rücksendungen bearbeiten"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "Bearbeitung von Rücksendungen nach Abschluss erlauben"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "Auftragsreferenz-Muster"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "Benötigtes Muster für die Generierung des Referenzfeldes für Aufträge"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "Auftrag Standardsendung"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "Erstelle eine Standardsendung für Aufträge"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "Abgeschlossene Aufträge bearbeiten"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "Bearbeitung von Aufträgen nach Versand oder Abschluss erlauben"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "Versendete Bestellungen als abgeschlossen markieren"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "Als versendet markierte Aufträge werden automatisch abgeschlossen und überspringen den Status \"Versandt\""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "Bestellungsreferenz-Muster"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "Benötigtes Muster für die Generierung des Referenzfeldes für Bestellungen"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "Abgeschlossene Einkaufsaufträge bearbeiten"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "Bearbeitung von Einkaufsaufträgen nach Versand oder Abschluss erlauben"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Bestellungen automatisch abschließen"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "Bestellung automatisch als abgeschlossen markieren, wenn der Empfang aller Artikel bestätigt wurde"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Passwort vergessen aktivieren"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Passwort-vergessen-Funktion auf den Anmeldeseiten aktivieren"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Registrierung erlauben"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Selbstregistrierung für Benutzer auf den Anmeldeseiten aktivieren"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "SSO aktivieren"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "SSO auf den Anmeldeseiten aktivieren"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "SSO Selbstregistrierung aktivieren"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Selbstregistrierung über SSO für Benutzer auf den Anmeldeseiten aktivieren"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "SSO Gruppensynchronisation aktivieren"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "SSO Gruppenschlüssel"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "Email-Adresse erforderlich"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "Benutzer müssen bei der Registrierung eine E-Mail angeben"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "SSO-Benutzer automatisch ausfüllen"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Benutzer-Details automatisch aus SSO-Konto ausfüllen"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "E-Mail zweimal"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "Bei der Registrierung den Benutzer zweimal nach der E-Mail-Adresse fragen"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Passwort zweimal"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "Bei der Registrierung den Benutzer zweimal nach dem Passwort fragen"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Erlaubte Domains"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "Anmeldung auf bestimmte Domänen beschränken (kommagetrennt, beginnend mit @)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Gruppe bei Registrierung"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "MFA erzwingen"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "Benutzer müssen Multifaktor-Authentifizierung verwenden."
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Plugins beim Start prüfen"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "Beim Start überprüfen, ob alle Plugins installiert sind - Für Container aktivieren"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "Nach Plugin-Aktualisierungen suchen"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "Periodische Überprüfungen auf Updates für installierte Plugins aktivieren"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "URL-Integration aktivieren"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "Plugins zum Hinzufügen von URLs aktivieren"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "Navigations-Integration aktivieren"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "Plugins zur Integration in die Navigation aktivieren"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "App-Integration aktivieren"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "Plugins zum Hinzufügen von Apps aktivieren"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "Terminplan-Integration aktivieren"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Geplante Aufgaben aktivieren"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "Ereignis-Integration aktivieren"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "Plugins ermöglichen auf interne Ereignisse zu reagieren"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "Externe Standorte ausschließen"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "Automatische Inventur-Periode"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "Vollständige Namen von Benutzern anzeigen"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Vollständigen Namen von Benutzern anstatt Benutzername anzeigen"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "Teststation-Daten aktivieren"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "Teststation-Datenerfassung für Testergebnisse aktivieren"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr "Insgesamt verfügbarer Lagerbestand zum Zeitpunkt der Inventur"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Datum"
@@ -8084,77 +8092,77 @@ msgstr "Unterstützt das Scannen von TME-Barcodes"
msgid "The Supplier which acts as 'TME'"
msgstr "Der Lieferant, der als 'TME' fungiert"
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr "Plugin-Installation ist deaktiviert"
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "Plugin wurde erfolgreich installiert"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "Plugin installiert in {path}"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr "Plugin wurde nicht in der Registry gefunden"
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr "Plugin ist kein gepacktes Plugin"
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr "Plugin-Paketname nicht gefunden"
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr "Nur Mitarbeiter können Plugins verwalten"
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr "Plugin-Deinstallation ist deaktiviert"
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr "Plugin kann nicht deinstalliert werden, da es momentan aktiv ist"
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr "Plugin erfolgreich deinstallieren"
@@ -8206,21 +8214,21 @@ msgstr "Paket-Plugin"
msgid "Plugin"
msgstr "Plugin"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "Kein Autor gefunden"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "Plugin '{p}' ist nicht kompatibel mit der aktuellen InvenTree Version {v}"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "Plugin benötigt mindestens Version {v}"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "Plugin benötigt maximal Version {v}"
@@ -9218,7 +9226,7 @@ msgstr "Anzahl stimmt nicht mit den Seriennummern überein"
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr "Testvorlage existiert nicht"
@@ -9238,7 +9246,7 @@ msgstr "Lagerartikel enthält andere Artikel"
msgid "Stock item has been assigned to a customer"
msgstr "Artikel wurde einem Kunden zugewiesen"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "Lagerartikel wird aktuell produziert"
@@ -9262,71 +9270,71 @@ msgstr "Lagerartikel müssen auf dasselbe Lieferantenteil verweisen"
msgid "Stock status codes must match"
msgstr "Status-Codes müssen zusammenpassen"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "Lagerartikel kann nicht bewegt werden, da kein Bestand vorhanden ist"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Eintrags-Notizen"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Wert muss für diesen Test angegeben werden"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "Anhang muss für diesen Test hochgeladen werden"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Testergebnis"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "Test Ausgabe Wert"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "Test Ergebnis Anhang"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "Test Notizen"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr "Teststation"
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr "Der Bezeichner der Teststation, in der der Test durchgeführt wurde"
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr "Gestartet"
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr "Der Zeitstempel des Teststarts"
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr "Fertiggestellt"
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr "Der Zeitstempel der Test-Beendigung"
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "Anzahl darf nicht die verfügbare Menge überschreiten ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "Ziel-Bestand"
@@ -9565,7 +9573,7 @@ msgstr "Ausgewählte Firma ist kein Kunde"
msgid "Stock assignment notes"
msgstr "Notizen zur Lagerzuordnung"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "Eine Liste der Lagerbestände muss angegeben werden"
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "Bestandsbewegungsnotizen"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "Bestandsbewegungsnotizen"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr "Nächste Seriennummer"
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr "Vorherige Seriennummer"
diff --git a/src/backend/InvenTree/locale/el/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/el/LC_MESSAGES/django.po
index 15494a6421..2cb2473cca 100644
--- a/src/backend/InvenTree/locale/el/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/el/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Greek\n"
"Language: el_GR\n"
@@ -109,9 +109,9 @@ msgstr "Μη έγκυρη δεκαδική τιμή"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Σημειώσεις"
@@ -550,13 +550,13 @@ msgstr "Κατάσταση παραγγελίας"
msgid "Parent Build"
msgstr "Γονική Κατασκευή"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "Συμπερίληψη παραλλαγών"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "Εκκρεμής παραγγελία"
msgid "Allocated"
msgstr "Κατανεμημένο"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "Καταναλωμένο"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Διαθέσιμο"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "Σε παραγγελία"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Σειρά Κατασκευής"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Τοποθεσία"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr "Έξοδος"
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr "Φιλτράρισμα με βάση το ID του αποθέματος εξόδου. Χρησιμοποιήστε 'null' για να βρείτε μη εγκατεστημένα στοιχεία κατασκευής"
@@ -1830,7 +1830,7 @@ msgstr "Ορισμός"
msgid "Unit definition"
msgstr "Ορισμός μονάδας"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Συνημμένο"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr "Λογικό κλειδί κατάστασης που είναι ισοδύναμο με αυτή την προσαρμοσμένη κατάσταση στη λογική της εφαρμογής"
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Τιμή"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr "Δεδομένα απόκρισης από τη σάρωση barcode"
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Αποτέλεσμα"
@@ -2673,8 +2673,8 @@ msgstr "Κάθε πότε θα ενημερώνονται οι συναλλαγ
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "ημέρες"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "Να επιτρέπεται η μεταφορά στοιχείων αποθέματος που δεν είναι διαθέσιμα μεταξύ τοποθεσιών αποθέματος"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "Πρότυπο αναφοράς εντολής κατασκευής"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Απαιτούμενο πρότυπο για τη δημιουργία του πεδίου αναφοράς εντολής κατασκευής"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "Απαίτηση υπεύθυνου κατόχου"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "Πρέπει να οριστεί υπεύθυνος ιδιοκτήτης για κάθε παραγγελία"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr "Απαίτηση ενεργού προϊόντος"
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr "Αποτροπή δημιουργίας εντολής παραγωγής για ανενεργά προϊόντα"
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr "Απαίτηση κλειδωμένου προϊόντος"
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr "Αποτροπή δημιουργίας εντολής παραγωγής για ξεκλείδωτα προϊόντα"
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr "Απαίτηση έγκυρης BOM"
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr "Αποτροπή δημιουργίας εντολής παραγωγής αν δεν έχει επικυρωθεί η BOM"
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr "Απαίτηση κλειστών θυγατρικών εντολών"
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr "Αποτροπή ολοκλήρωσης εντολής παραγωγής μέχρι να κλείσουν όλες οι θυγατρικές εντολές"
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr "Εξωτερικές εντολές παραγωγής"
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr "Ενεργοποίηση λειτουργίας εξωτερικών εντολών παραγωγής"
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "Φραγή έως ότου περάσουν τα τεστ"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "Αποτροπή ολοκλήρωσης εξόδων παραγωγής μέχρι να περάσουν όλα τα απαιτούμενα τεστ"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "Ενεργοποίηση εντολών επιστροφής"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "Ενεργοποίηση λειτουργίας εντολών επιστροφής στη διεπαφή χρήστη"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "Μοτίβο αναφοράς εντολής επιστροφής"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "Απαιτούμενο μοτίβο για τη δημιουργία του πεδίου αναφοράς εντολής επιστροφής"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "Επεξεργασία ολοκληρωμένων εντολών επιστροφής"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "Επιτρέπει την επεξεργασία εντολών επιστροφής μετά την ολοκλήρωσή τους"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "Μοτίβο αναφοράς εντολής πώλησης"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "Απαιτούμενο μοτίβο για τη δημιουργία του πεδίου αναφοράς εντολής πώλησης"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "Προεπιλεγμένη αποστολή εντολής πώλησης"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "Ενεργοποίηση δημιουργίας προεπιλεγμένης αποστολής με τις εντολές πώλησης"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "Επεξεργασία ολοκληρωμένων εντολών πώλησης"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "Επιτρέπει την επεξεργασία εντολών πώλησης μετά την αποστολή ή ολοκλήρωσή τους"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr "Η αποστολή απαιτεί έλεγχο"
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr "Αποτροπή ολοκλήρωσης αποστολών μέχρι να ελεγχθούν τα είδη"
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "Σήμανση αποσταλμένων εντολών ως ολοκληρωμένων"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "Οι εντολές πώλησης που επισημαίνονται ως αποσταλμένες ολοκληρώνονται αυτόματα, παρακάμπτοντας την κατάσταση «απεσταλμένο»"
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "Μοτίβο αναφοράς εντολής αγοράς"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "Απαιτούμενο μοτίβο για τη δημιουργία του πεδίου αναφοράς εντολής αγοράς"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "Επεξεργασία ολοκληρωμένων εντολών αγοράς"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "Επιτρέπει την επεξεργασία εντολών αγοράς μετά την αποστολή ή ολοκλήρωσή τους"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr "Μετατροπή νομίσματος"
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr "Μετατροπή της αξίας είδους στο βασικό νόμισμα κατά την παραλαβή αποθέματος"
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Αυτόματη ολοκλήρωση εντολών αγοράς"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "Αυτόματη σήμανση εντολών αγοράς ως ολοκληρωμένων όταν έχουν παραληφθεί όλα τα είδη"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Ενεργοποίηση υπενθύμισης κωδικού"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Ενεργοποίηση λειτουργίας υπενθύμισης κωδικού στις σελίδες σύνδεσης"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Ενεργοποίηση εγγραφής"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Ενεργοποίηση αυτοεγγραφής χρηστών στις σελίδες σύνδεσης"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "Ενεργοποίηση SSO"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "Ενεργοποίηση SSO στις σελίδες σύνδεσης"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "Ενεργοποίηση εγγραφής μέσω SSO"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Ενεργοποίηση αυτοεγγραφής μέσω SSO στις σελίδες σύνδεσης"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "Ενεργοποίηση συγχρονισμού ομάδων SSO"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "Ενεργοποίηση συγχρονισμού ομάδων InvenTree με ομάδες από τον IdP"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "Κλειδί ομάδας SSO"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr "Το όνομα του πεδίου ομάδων που παρέχεται από τον IdP"
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr "Χάρτης ομάδων SSO"
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr "Χαρτογράφηση ομάδων SSO σε τοπικές ομάδες InvenTree. Αν η ομάδα δεν υπάρχει, θα δημιουργηθεί."
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr "Αφαίρεση ομάδων εκτός SSO"
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr "Αν πρέπει να αφαιρούνται ομάδες από τον χρήστη όταν δεν παρέχονται από τον IdP. Η απενεργοποίηση μπορεί να προκαλέσει προβλήματα ασφαλείας"
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "Απαίτηση email"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "Απαίτηση συμπλήρωσης email κατά την εγγραφή"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "Αυτόματη συμπλήρωση χρηστών SSO"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Αυτόματη συμπλήρωση στοιχείων χρήστη από τα δεδομένα SSO"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "Email δύο φορές"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "Κατά την εγγραφή ζητείται το email δύο φορές"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Κωδικός δύο φορές"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "Κατά την εγγραφή ζητείται ο κωδικός δύο φορές"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Επιτρεπόμενοι τομείς"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "Περιορισμός εγγραφής σε συγκεκριμένους τομείς (χωρισμένοι με κόμμα, ξεκινούν με @)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Ομάδα κατά την εγγραφή"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr "Ομάδα στην οποία εκχωρούνται οι νέοι χρήστες κατά την εγγραφή. Με ενεργό SSO sync, χρησιμοποιείται μόνο όταν δεν μπορεί να δοθεί ομάδα από τον IdP."
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "Επιβολή MFA"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "Οι χρήστες πρέπει να χρησιμοποιούν πολυπαραγοντική ασφάλεια"
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Έλεγχος plugins κατά την εκκίνηση"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "Έλεγχος ότι όλα τα plugins είναι εγκατεστημένα κατά την εκκίνηση – χρήσιμο σε container περιβάλλοντα"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "Έλεγχος για ενημερώσεις plugin"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "Ενεργοποίηση περιοδικών ελέγχων για ενημερώσεις εγκατεστημένων plugins"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "Ενεργοποίηση URL integration"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "Ενεργοποίηση προσθήκης URL routes από plugins"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "Ενεργοποίηση ενσωμάτωσης στην πλοήγηση"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "Ενεργοποίηση ενσωμάτωσης των plugins στην πλοήγηση"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "Ενεργοποίηση ενσωμάτωσης εφαρμογών"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "Ενεργοποίηση προσθήκης εφαρμογών από plugins"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "Ενεργοποίηση ενσωμάτωσης χρονοπρογραμματισμού"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Ενεργοποίηση εκτέλεσης χρονοπρογραμματισμένων εργασιών από plugins"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "Ενεργοποίηση ενσωμάτωσης γεγονότων"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "Ενεργοποίηση απόκρισης plugins σε εσωτερικά γεγονότα"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "Ενεργοποίηση ενσωμάτωσης διεπαφής"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "Ενεργοποίηση ενσωμάτωσης plugins στη διεπαφή χρήστη"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr "Ενεργοποίηση ενσωμάτωσης email"
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr "Ενεργοποίηση επεξεργασίας εισερχόμενων/εξερχόμενων emails από plugins"
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr "Ενεργοποίηση κωδικών έργου"
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr "Ενεργοποίηση κωδικών έργου για την παρακολούθηση projects"
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr "Ενεργοποίηση καταγραφής ιστορικών επιπέδων και αξιών αποθέματος"
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "Εξαίρεση εξωτερικών τοποθεσιών"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "Περίοδος αυτόματης απογραφής"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "Εμφάνιση πλήρους ονόματος χρηστών"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Εμφάνιση του πλήρους ονόματος των χρηστών αντί για το όνομα χρήστη"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr "Εμφάνιση προφίλ χρηστών"
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr "Εμφάνιση προφίλ χρηστών στη σελίδα προφίλ τους"
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "Ενεργοποίηση δεδομένων σταθμού δοκιμών"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "Ενεργοποίηση συλλογής δεδομένων σταθμού δοκιμών για τα αποτελέσματα δοκιμών"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr "Ενεργοποίηση ping μηχανημάτων"
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr "Ενεργοποίηση περιοδικού ping των καταχωρημένων μηχανημάτων για έλεγχο της κατάστασής τους"
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr "Συνολικό διαθέσιμο απόθεμα κατά τον χρόνο απογραφής"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Ημερομηνία"
@@ -8084,77 +8092,77 @@ msgstr "Παρέχει υποστήριξη για σάρωση barcodes TME"
msgid "The Supplier which acts as 'TME'"
msgstr "Ο προμηθευτής που λειτουργεί ως 'TME'"
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr "Η εγκατάσταση πρόσθετων είναι απενεργοποιημένη"
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "Το πρόσθετο εγκαταστάθηκε με επιτυχία"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "Το πρόσθετο εγκαταστάθηκε στο {path}"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr "Το πρόσθετο δεν βρέθηκε στο μητρώο"
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr "Το πρόσθετο δεν είναι πακεταρισμένο πρόσθετο"
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr "Δεν βρέθηκε όνομα πακέτου πρόσθετου"
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr "Μόνο οι χρήστες προσωπικού μπορούν να διαχειρίζονται πρόσθετα"
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr "Η απεγκατάσταση προσθέτων είναι απενεργοποιημένη"
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr "Το πρόσθετο δεν μπορεί να απεγκατασταθεί καθώς είναι αυτή τη στιγμή ενεργό"
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr "Το πρόσθετο δεν μπορεί να απεγκατασταθεί καθώς είναι υποχρεωτικό"
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr "Το πρόσθετο δεν μπορεί να απεγκατασταθεί καθώς είναι δείγμα πρόσθετου"
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr "Το πρόσθετο δεν μπορεί να απεγκατασταθεί καθώς είναι ενσωματωμένο πρόσθετο"
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr "Το πρόσθετο δεν είναι εγκατεστημένο"
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr "Η εγκατάσταση του πρόσθετου δεν βρέθηκε"
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr "Το πρόσθετο απεγκαταστάθηκε με επιτυχία"
@@ -8206,21 +8214,21 @@ msgstr "Πρόσθετο πακέτου"
msgid "Plugin"
msgstr "Πρόσθετο"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "Δεν βρέθηκε δημιουργός"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "Το πρόσθετο '{p}' δεν είναι συμβατό με την τρέχουσα έκδοση InvenTree {v}"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "Το πρόσθετο απαιτεί τουλάχιστον την έκδοση {v}"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "Το πρόσθετο απαιτεί το πολύ την έκδοση {v}"
@@ -9218,7 +9226,7 @@ msgstr "Η ποσότητα δεν αντιστοιχεί στους σειρι
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr "Το πρότυπο δοκιμής δεν υπάρχει"
@@ -9238,7 +9246,7 @@ msgstr "Το είδος αποθέματος περιέχει άλλα είδη"
msgid "Stock item has been assigned to a customer"
msgstr "Το είδος αποθέματος έχει αντιστοιχιστεί σε πελάτη"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "Το είδος αποθέματος βρίσκεται αυτή τη στιγμή σε παραγωγή"
@@ -9262,71 +9270,71 @@ msgstr "Τα είδη αποθέματος πρέπει να αναφέροντ
msgid "Stock status codes must match"
msgstr "Οι κωδικοί κατάστασης αποθέματος πρέπει να ταιριάζουν"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "Το StockItem δεν μπορεί να μετακινηθεί καθώς δεν βρίσκεται σε απόθεμα"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr "Ιχνηλάτηση είδους αποθέματος"
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Σημειώσεις καταχώρησης"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr "Αποτέλεσμα δοκιμής είδους αποθέματος"
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Πρέπει να δοθεί τιμή για αυτή τη δοκιμή"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "Πρέπει να μεταφορτωθεί συνημμένο για αυτή τη δοκιμή"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr "Μη έγκυρη τιμή για αυτή τη δοκιμή"
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Αποτέλεσμα δοκιμής"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "Τιμή αποτελέσματος δοκιμής"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "Συνημμένο αποτελέσματος δοκιμής"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "Σημειώσεις δοκιμής"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr "Σταθμός δοκιμής"
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr "Ο αναγνωριστικός κωδικός του σταθμού δοκιμής όπου πραγματοποιήθηκε η δοκιμή"
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr "Έναρξη"
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr "Χρονική σήμανση έναρξης της δοκιμής"
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr "Ολοκλήρωση"
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr "Χρονική σήμανση λήξης της δοκιμής"
@@ -9440,8 +9448,8 @@ msgstr "Δεν δόθηκε είδος αποθέματος"
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "Η ποσότητα δεν πρέπει να υπερβαίνει το διαθέσιμο απόθεμα ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "Τοποθεσία προορισμού αποθέματος"
@@ -9565,7 +9573,7 @@ msgstr "Η επιλεγμένη εταιρεία δεν είναι πελάτη
msgid "Stock assignment notes"
msgstr "Σημειώσεις απόδοσης αποθέματος"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "Πρέπει να δοθεί λίστα ειδών αποθέματος"
@@ -9613,27 +9621,31 @@ msgstr "Το είδος βρίσκεται ήδη σε απόθεμα"
msgid "Quantity must not be negative"
msgstr "Η ποσότητα δεν πρέπει να είναι αρνητική"
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "Σημειώσεις συναλλαγής αποθέματος"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr "Συγχώνευση με υπάρχον απόθεμα"
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "Σημειώσεις συναλλαγής αποθέματος"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr "Συγχώνευση επιστρεφόμενων ειδών με υπάρχοντα είδη αποθέματος, όπου είναι δυνατό"
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr "Επόμενος σειριακός αριθμός"
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr "Προηγούμενος σειριακός αριθμός"
diff --git a/src/backend/InvenTree/locale/en/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/en/LC_MESSAGES/django.po
index 21d7d2ba02..b00403199c 100644
--- a/src/backend/InvenTree/locale/en/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -110,9 +110,9 @@ msgstr ""
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr ""
@@ -551,13 +551,13 @@ msgstr ""
msgid "Parent Build"
msgstr ""
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -693,52 +693,52 @@ msgstr ""
msgid "Allocated"
msgstr ""
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr ""
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr ""
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr ""
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr ""
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1831,7 +1831,7 @@ msgstr ""
msgid "Unit definition"
msgstr ""
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr ""
@@ -1949,7 +1949,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr ""
@@ -2284,7 +2284,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr ""
@@ -2674,8 +2674,8 @@ msgstr ""
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr ""
@@ -3278,538 +3278,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr ""
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr ""
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr ""
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr ""
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr ""
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr ""
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr ""
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr ""
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr ""
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr ""
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr ""
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr ""
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr ""
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr ""
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr ""
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr ""
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr ""
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr ""
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr ""
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr ""
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr ""
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr ""
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr ""
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr ""
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr ""
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr ""
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr ""
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6644,7 +6652,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr ""
@@ -8085,77 +8093,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8207,21 +8215,21 @@ msgstr ""
msgid "Plugin"
msgstr ""
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr ""
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9219,7 +9227,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9239,7 +9247,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9263,71 +9271,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr ""
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr ""
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr ""
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr ""
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9441,8 +9449,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9566,7 +9574,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9614,27 +9622,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/es/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/es/LC_MESSAGES/django.po
index addf67b5e2..6c2116cbd8 100644
--- a/src/backend/InvenTree/locale/es/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/es/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Spanish\n"
"Language: es_ES\n"
@@ -109,9 +109,9 @@ msgstr "Número decimal no válido"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Notas"
@@ -550,13 +550,13 @@ msgstr "Estado del pedido"
msgid "Parent Build"
msgstr "Construcción o Armado Superior"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "Incluye Variantes"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "Pedido pendiente"
msgid "Allocated"
msgstr "Asignadas"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "Agotado"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Disponible"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "En pedido"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Construir órden"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Ubicación"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr "Salida"
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr "Definición"
msgid "Unit definition"
msgstr "Definición de unidad"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Archivo adjunto"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Valor"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr "Respuesta de datos del escaneo de código de barras"
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Resultado"
@@ -2673,8 +2673,8 @@ msgstr "Con qué frecuencia actualizar los tipos de cambio (establecer a cero pa
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "días"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "Permitir que artículos del inventario sin existencias puedan ser transferidos entre ubicaciones de inventario"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "Patrón de Referencia de Ordenes de Armado"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Patrón requerido para generar el campo de referencia de la Orden de Ensamblado"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "Requerir Dueño Responsable"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "Se debe asignar un dueño responsable a cada orden"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr "Requerir Parte Activa"
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr "Impedir la creación de órdenes de fabricación para partes inactivas"
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr "Requerir Parte Bloqueada"
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr "Impedir la creación de órdenes de fabricación para partes bloqueadas"
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr "Impedir la creación de órdenes de fabricación a menos que se haya validado la lista de materiales"
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr "Prevenir la finalización de la orden de construcción hasta que todas las órdenes hijas estén cerradas"
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "Bloquear hasta que los Tests pasen"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "Evitar que las construcciones sean completadas hasta que todas las pruebas requeridas pasen"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "Habilitar órdenes de devolución"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "Habilitar la funcionalidad de orden de devolución en la interfaz de usuario"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "Patrón de referencia de orden de devolución"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "Patrón requerido para generar el campo de referencia de devolución de la orden"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "Editar ordenes de devolución completadas"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "Permitir la edición de ordenes de devolución después de que hayan sido completados"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "Patrón de Referencia de Ordenes de Venta"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "Patrón requerido para generar el campo de referencia de la orden de venta"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "Envío Predeterminado de Ordenes de Venta"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "Habilitar la creación de envío predeterminado con ordenes de entrega"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "Editar Ordenes de Venta Completados"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "Permitir la edición de ordenes de venta después de que hayan sido enviados o completados"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "Marcar pedidos enviados como completados"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "Los pedidos marcados como enviados se completarán automáticamente, evitando el estado de \"envío\""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "Patrón de Referencia de Orden de Compra"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "Patrón requerido para generar el campo de referencia de la Orden de Compra"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "Editar Ordenes de Compra Completados"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "Permitir la edición de órdenes de venta después de que hayan sido enviados o completados"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr "Convertir moneda"
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Autocompletar Ordenes de compra"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "Marcar automáticamente las órdenes de compra como completas cuando se reciben todos los artículos de línea"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Habilitar función de contraseña olvidada"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Activar la función olvido de contraseña en las páginas de inicio de sesión"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Habilitar registro"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Activar auto-registro para usuarios en las páginas de inicio de sesión"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "Habilitar SSO"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "Habilitar SSO en las páginas de inicio de sesión"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "Habilitar registro SSO"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Activar autoregistro a través de SSO para usuarios en las páginas de inicio de sesión"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "Habilitar sincronización de grupo SSO"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "Habilitar la sincronización de grupos de Inventree con grupos proporcionados por el IdP"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "Clave de grupo SSO"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr "El nombre del atributo reclamado por el grupo proporcionado por el IdP"
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr "Mapa del grupo SSO"
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr "Un mapeo de grupos SSO a grupos de Inventree locales. Si el grupo local no existe, se creará."
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr "Eliminar grupos fuera de SSO"
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "Email requerido"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "Requiere usuario para suministrar correo al registrarse"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "Auto-rellenar usuarios SSO"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Rellenar automáticamente los datos de usuario de la cuenta SSO"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "Correo dos veces"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "Al registrarse pregunte dos veces a los usuarios por su correo"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Contraseña dos veces"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "Al registrarse, preguntar dos veces a los usuarios por su contraseña"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Dominios permitidos"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "Restringir el registro a ciertos dominios (separados por comas, comenzando por @)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Grupo al registrarse"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr "Grupo al que se asignan nuevos usuarios al registrarse. Si la sincronización de grupo SSO está activada, este grupo sólo se establece si no se puede asignar ningún grupo desde el IdP."
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "Forzar MFA"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "Los usuarios deben utilizar seguridad multifactor."
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Comprobar complementos al iniciar"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "Comprobar que todos los complementos están instalados en el arranque - habilitar en entornos de contenedores"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "Revisar actualizaciones del plugin"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "Habilitar comprobaciones periódicas para actualizaciones de plugins instalados"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "Habilitar integración de URL"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "Habilitar plugins para añadir rutas de URL"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "Habilitar integración de navegación"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "Habilitar plugins para integrar en la navegación"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "Habilitar integración de la aplicación"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "Habilitar plugins para añadir aplicaciones"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "Habilitar integración de programación"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Habilitar plugins para ejecutar tareas programadas"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "Habilitar integración de eventos"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "Habilitar plugins para responder a eventos internos"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "Habilitar integración de interfaz"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "Habilitar complementos para integrar en la interfaz de usuario"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr "Habilitar códigos de proyecto para rastrear proyectos"
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "Excluir Ubicaciones Externas"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "Periodo de inventario automático"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "Mostrar nombres completos de los usuarios"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Mostrar nombres completos de usuarios en lugar de nombres de usuario"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "Habilitar datos de estación de prueba"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "Habilitar la recolección de datos de estaciones de prueba para resultados de prueba"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Fecha"
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr "El complemento no está instalado"
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr "Instalación del complemento no encontrada"
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr "Complemento"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "No se encontró autor"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "El complemento '{p}' no es compatible con la versión actual de InvenTree {v}"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "El complemento requiere al menos la versión {v}"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "El complemento requiere como máximo la versión {v}"
@@ -9218,7 +9226,7 @@ msgstr "La cantidad no coincide con los números de serie"
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr "Artículo de stock contiene otros artículos"
msgid "Stock item has been assigned to a customer"
msgstr "Artículo de stock ha sido asignado a un cliente"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "El artículo de stock está en producción"
@@ -9262,71 +9270,71 @@ msgstr "Los artículos de stock deben referirse a la misma parte del proveedor"
msgid "Stock status codes must match"
msgstr "Los códigos de estado del stock deben coincidir"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "Stock no se puede mover porque no está en stock"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Notas de entrada"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Debe proporcionarse un valor para esta prueba"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "El archivo adjunto debe ser subido para esta prueba"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Resultado de la prueba"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "Valor de salida de prueba"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "Adjunto de resultados de prueba"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "Notas de prueba"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr "Finalizó"
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "La cantidad no debe exceder la cantidad disponible de stock ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "Ubicación de stock de destino"
@@ -9565,7 +9573,7 @@ msgstr "La empresa seleccionada no es un cliente"
msgid "Stock assignment notes"
msgstr "Notas de asignación de stock"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "Debe proporcionarse una lista de artículos de stock"
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "Notas de transacción de stock"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "Notas de transacción de stock"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/es_MX/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/es_MX/LC_MESSAGES/django.po
index 4da5c62b94..79387a5e36 100644
--- a/src/backend/InvenTree/locale/es_MX/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/es_MX/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Spanish, Mexico\n"
"Language: es_MX\n"
@@ -109,9 +109,9 @@ msgstr "Número decimal inválido"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Notas"
@@ -550,13 +550,13 @@ msgstr "Estado del pedido"
msgid "Parent Build"
msgstr "Construcción o Armado Superior"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "Incluye Variantes"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "Pedido pendiente"
msgid "Allocated"
msgstr "Asignadas"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Disponible"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "En pedido"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Construir órden"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Ubicación"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr "Definición"
msgid "Unit definition"
msgstr "Definición de unidad"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Archivo adjunto"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr "Clave lógica del estado que es igual a este estado personalizado en la lógica de negocios"
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Valor"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr "Respuesta de datos del escaneo de código de barras"
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Resultado"
@@ -2673,8 +2673,8 @@ msgstr "Con qué frecuencia actualizar los tipos de cambio (establecer a cero pa
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "días"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "Permitir que artículos del inventario sin existencias puedan ser transferidos entre ubicaciones de inventario"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "Patrón de Referencia de Ordenes de Armado"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Patrón requerido para generar el campo de referencia de la Orden de Ensamblado"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "Requerir Dueño Responsable"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "Se debe asignar un dueño responsable a cada orden"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr "Requerir Parte Activa"
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr "Impedir la creación de órdenes de fabricación para partes inactivas"
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr "Requerir Parte Bloqueada"
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr "Impedir la creación de órdenes de fabricación para partes bloqueadas"
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr "Impedir la creación de órdenes de fabricación a menos que se haya validado la lista de materiales"
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr "Prevenir la finalización de la orden de construcción hasta que todas las órdenes hijas estén cerradas"
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "Bloquear hasta que los Tests pasen"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "Evitar que las construcciones sean completadas hasta que todas las pruebas requeridas pasen"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "Habilitar órdenes de devolución"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "Habilitar la funcionalidad de orden de devolución en la interfaz de usuario"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "Patrón de referencia de orden de devolución"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "Patrón requerido para generar el campo de referencia de devolución de la orden"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "Editar ordenes de devolución completadas"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "Permitir la edición de ordenes de devolución después de que hayan sido completados"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "Patrón de Referencia de Ordenes de Venta"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "Patrón requerido para generar el campo de referencia de la orden de venta"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "Envío Predeterminado de Ordenes de Venta"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "Habilitar la creación de envío predeterminado con ordenes de entrega"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "Editar Ordenes de Venta Completados"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "Permitir la edición de ordenes de venta después de que hayan sido enviados o completados"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "Marcar pedidos enviados como completados"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "Los pedidos marcados como enviados se completarán automáticamente, evitando el estado de \"envío\""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "Patrón de Referencia de Orden de Compra"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "Patrón requerido para generar el campo de referencia de la Orden de Compra"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "Editar Ordenes de Compra Completados"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "Permitir la edición de órdenes de venta después de que hayan sido enviados o completados"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Autocompletar Ordenes de compra"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "Marcar automáticamente las órdenes de compra como completas cuando se reciben todos los artículos de línea"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Habilitar función de contraseña olvidada"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Activar la función olvido de contraseña en las páginas de inicio de sesión"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Habilitar registro"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Activar auto-registro para usuarios en las páginas de inicio de sesión"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "Habilitar SSO"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "Habilitar SSO en las páginas de inicio de sesión"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "Habilitar registro SSO"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Activar autoregistro a través de SSO para usuarios en las páginas de inicio de sesión"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "Habilitar sincronización de grupo SSO"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "Habilitar la sincronización de grupos de Inventree con grupos proporcionados por el IdP"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "Clave de grupo SSO"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr "El nombre del atributo reclamado por el grupo proporcionado por el IdP"
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr "Mapa del grupo SSO"
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr "Un mapeo de grupos SSO a grupos de Inventree locales. Si el grupo local no existe, se creará."
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr "Eliminar grupos fuera de SSO"
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "Email requerido"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "Requiere usuario para suministrar correo al registrarse"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "Auto-rellenar usuarios SSO"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Rellenar automáticamente los datos de usuario de la cuenta SSO"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "Correo dos veces"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "Al registrarse pregunte dos veces a los usuarios por su correo"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Contraseña dos veces"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "Al registrarse, preguntar dos veces a los usuarios por su contraseña"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Dominios permitidos"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "Restringir el registro a ciertos dominios (separados por comas, comenzando por @)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Grupo al registrarse"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr "Grupo al que se asignan nuevos usuarios al registrarse. Si la sincronización de grupo SSO está activada, este grupo sólo se establece si no se puede asignar ningún grupo desde el IdP."
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "Forzar MFA"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "Los usuarios deben utilizar seguridad multifactor."
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Comprobar complementos al iniciar"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "Comprobar que todos los complementos están instalados en el arranque - habilitar en entornos de contenedores"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "Revisar actualizaciones del plugin"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "Habilitar comprobaciones periódicas para actualizaciones de plugins instalados"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "Habilitar integración de URL"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "Habilitar plugins para añadir rutas de URL"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "Habilitar integración de navegación"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "Habilitar plugins para integrar en la navegación"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "Habilitar integración de la aplicación"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "Habilitar plugins para añadir aplicaciones"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "Habilitar integración de programación"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Habilitar plugins para ejecutar tareas programadas"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "Habilitar integración de eventos"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "Habilitar plugins para responder a eventos internos"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "Habilitar integración de interfaz"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "Habilitar complementos para integrar en la interfaz de usuario"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "Excluir Ubicaciones Externas"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "Periodo de inventario automático"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "Mostrar nombres completos de los usuarios"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Mostrar nombres completos de usuarios en lugar de nombres de usuario"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "Habilitar datos de estación de prueba"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "Habilitar la recolección de datos de estaciones de prueba para resultados de prueba"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Fecha"
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr "El complemento no está instalado"
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr "Instalación del complemento no encontrada"
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr "Complemento"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "No se encontró autor"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "El complemento '{p}' no es compatible con la versión actual de InvenTree {v}"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "El complemento requiere al menos la versión {v}"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "El complemento requiere como máximo la versión {v}"
@@ -9218,7 +9226,7 @@ msgstr "La cantidad no coincide con los números de serie"
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr "Artículo de stock contiene otros artículos"
msgid "Stock item has been assigned to a customer"
msgstr "Artículo de stock ha sido asignado a un cliente"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "El artículo de stock está en producción"
@@ -9262,71 +9270,71 @@ msgstr "Los artículos de stock deben referirse a la misma parte del proveedor"
msgid "Stock status codes must match"
msgstr "Los códigos de estado del stock deben coincidir"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "Stock no se puede mover porque no está en stock"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Notas de entrada"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Debe proporcionarse un valor para esta prueba"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "El archivo adjunto debe ser subido para esta prueba"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Resultado de la prueba"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "Valor de salida de prueba"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "Adjunto de resultados de prueba"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "Notas de prueba"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr "Finalizó"
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "La cantidad no debe exceder la cantidad disponible de stock ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "Ubicación de stock de destino"
@@ -9565,7 +9573,7 @@ msgstr "La empresa seleccionada no es un cliente"
msgid "Stock assignment notes"
msgstr "Notas de asignación de stock"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "Debe proporcionarse una lista de artículos de stock"
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "Notas de transacción de stock"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "Notas de transacción de stock"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/et/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/et/LC_MESSAGES/django.po
index 6dc901ad1b..f1f7880a2c 100644
--- a/src/backend/InvenTree/locale/et/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/et/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Estonian\n"
"Language: et_EE\n"
@@ -109,9 +109,9 @@ msgstr ""
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Märkmed"
@@ -550,13 +550,13 @@ msgstr ""
msgid "Parent Build"
msgstr ""
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr ""
msgid "Allocated"
msgstr ""
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Saadaval"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr ""
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr ""
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Asukoht"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr "Definitsioon"
msgid "Unit definition"
msgstr "Ühiku definitsioon"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Manus"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr ""
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Tulemus"
@@ -2673,8 +2673,8 @@ msgstr ""
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "päeva"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr ""
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr ""
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr ""
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr ""
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr ""
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr ""
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr ""
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr ""
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr ""
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr ""
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr ""
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr ""
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr ""
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr ""
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr ""
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr ""
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr ""
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr ""
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr ""
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr ""
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr ""
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr ""
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr ""
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr ""
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr ""
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr ""
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "Luba liidese integreerimine"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "Luba pluginatel integreeruda kasutajaliidesesse"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr ""
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr ""
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr "Paki plugin"
msgid "Plugin"
msgstr "Plugin"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "Autorit ei leitud"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9262,71 +9270,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr ""
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr ""
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr ""
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Testitulemused"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9565,7 +9573,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/fa/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/fa/LC_MESSAGES/django.po
index de988bd3c3..e0066fd70b 100644
--- a/src/backend/InvenTree/locale/fa/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/fa/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Persian\n"
"Language: fa_IR\n"
@@ -109,9 +109,9 @@ msgstr "مقدار اعشاری نامعتبر است"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "یادداشت"
@@ -550,13 +550,13 @@ msgstr "وضعیت سفارش"
msgid "Parent Build"
msgstr ""
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "سفارش معوق"
msgid "Allocated"
msgstr "اختصاص داده شده"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "در دسترس"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr ""
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "سفارش ساخت"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "مکان"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr ""
msgid "Unit definition"
msgstr ""
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr ""
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr ""
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr ""
@@ -2673,8 +2673,8 @@ msgstr ""
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr ""
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr ""
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr ""
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr ""
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr ""
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr ""
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr ""
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr ""
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr ""
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr ""
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr ""
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr ""
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr ""
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr ""
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr ""
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr ""
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr ""
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr ""
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr ""
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr ""
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr ""
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr ""
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr ""
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr ""
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr ""
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr ""
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr ""
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr ""
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr ""
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr ""
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr ""
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9262,71 +9270,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr ""
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr ""
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr ""
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr ""
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9565,7 +9573,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/fi/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/fi/LC_MESSAGES/django.po
index 0d94561899..3d4f0e0044 100644
--- a/src/backend/InvenTree/locale/fi/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/fi/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Finnish\n"
"Language: fi_FI\n"
@@ -109,9 +109,9 @@ msgstr ""
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Merkinnät"
@@ -550,13 +550,13 @@ msgstr ""
msgid "Parent Build"
msgstr ""
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr ""
msgid "Allocated"
msgstr ""
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Saatavilla"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr ""
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr ""
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Sijainti"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr ""
msgid "Unit definition"
msgstr ""
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Liite"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Arvo"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr ""
@@ -2673,8 +2673,8 @@ msgstr ""
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "päivää"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr ""
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Salli salasananpalautus"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr ""
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Salli rekisteröinti"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr ""
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "Salli SSO"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "Salli SSO kirjautumissivuilla"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "Salli SSO rekisteröinti"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr ""
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "Sähköposti vaaditaan"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr ""
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr ""
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "Sähköpostiosoite kahdesti"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr ""
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Salasana kahdesti"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr ""
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Sallitut verkkotunnukset"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr ""
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "Pakota MFA"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr ""
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr ""
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr ""
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr ""
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr ""
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr ""
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr ""
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr ""
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Päivämäärä"
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr ""
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr ""
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9262,71 +9270,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr ""
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr ""
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr ""
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr ""
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9565,7 +9573,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/fr/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/fr/LC_MESSAGES/django.po
index 5c3af1ebb8..db9c659246 100644
--- a/src/backend/InvenTree/locale/fr/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/fr/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: French\n"
"Language: fr_FR\n"
@@ -109,9 +109,9 @@ msgstr "Valeur décimale invalide"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Notes"
@@ -550,13 +550,13 @@ msgstr "Statut de la commande"
msgid "Parent Build"
msgstr "Fabrication parente"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "Inclure les variantes"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "Commande en cours"
msgid "Allocated"
msgstr "Allouée"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "Consommé"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Disponible"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "En Commande"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Ordre de Fabrication"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Emplacement"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr "Sortie"
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr "Filtrer par l'identifiant (ID) des articles du stock de sortie. Utilisez 'null' pour trouver les éléments de fabrication non installés."
@@ -1830,7 +1830,7 @@ msgstr "Définition"
msgid "Unit definition"
msgstr "Définition de l'unité"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Pièce jointe"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr "Clé logique de l'état qui est égale à cet état personnalisé dans la logique métier"
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Valeur"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr "Données de réponse provenant de la lecture du code-barres"
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Résultat"
@@ -2673,8 +2673,8 @@ msgstr "Fréquence de mise à jour des taux de change (définir à zéro pour d
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "jours"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "Permettre le transfert d'articles qui ne sont pas en stock d'un magasin à l'autre"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "Modèle de référence de commande de construction"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Modèle requis pour générer le champ de référence de l'ordre de construction"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "Nécessite un Responsable propriétaire"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "Un propriétaire responsable doit être assigné à chaque commande"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr "Exiger une partie active"
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr "Empêcher la création d'un ordre de fabrication pour les pièces inactives"
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr "Requiert une pièce verrouillée"
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr "Empêcher la création d'un ordre de fabrication pour les pièces non verrouillées"
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr "Exiger une nomenclature valide"
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr "Empêcher la création d'un ordre de fabrication si la nomenclature n'a pas été validée"
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr "Exiger des ordonnances fermées pour les enfants"
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr "Empêcher l'achèvement de l'ordre de construction jusqu'à ce que tous les ordres d'enfants soient clôturés"
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr "Ordres de fabrication externes"
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr "Activer la fonctionnalité d'ordre de fabrication externe"
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "Blocage jusqu'à la réussite des tests"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "Empêcher l'achèvement des résultats de la construction jusqu'à ce que tous les tests requis soient réussis"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "Activer les retours de commandes"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "Activer la fonctionnalité de retour de commande dans l'interface utilisateur"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "Modèle de référence de retour de commande"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "Modèle requis pour générer le champ de référence de la commande de retour"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "Modifier les retours de commandes terminées"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "Autoriser la modification des retours après leur enregistrement"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "Modèle de référence de bon de commande"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "Modèle requis pour générer le champ de référence du bon de commande"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "Expédition par défaut du bon de commande"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "Activer la création d'expédition par défaut avec les bons de commandes"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "Modifier les commandes de vente terminées"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "Autoriser la modification des commandes de vente après avoir été expédiées ou complétées"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr "L'expédition nécessite une vérification"
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr "Empêcher l'achèvement des envois jusqu'à ce que les articles aient été vérifiés"
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "Marquer les commandes expédiées comme achevées"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "Les commandes marquées comme expédiées seront automatiquement complétées, en contournant le statut « expédié »"
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "Modèle de référence de commande d'achat"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "Modèle requis pour générer le champ de référence de bon de commande"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "Modifier les bons de commande terminés"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "Autoriser la modification des bons de commande après avoir été expédiés ou complétés"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr "Convertir la monnaie"
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr "Convertir la valeur de l'article dans la devise de base lors de la réception du stock"
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Achat automatique des commandes"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "Marquer automatiquement les bons de commande comme terminés lorsque tous les articles de la ligne sont reçus"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Activer les mots de passe oubliés"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Activer la fonction \"Mot de passe oublié\" sur les pages de connexion"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Activer les inscriptions"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Activer l'auto-inscription pour les utilisateurs sur les pages de connexion"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "Activer le SSO"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "Activer le SSO sur les pages de connexion"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "Activer l'inscription SSO"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Activer l'auto-inscription via SSO pour les utilisateurs sur les pages de connexion"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "Activer la synchronisation du groupe SSO"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "Permettre la synchronisation des groupes InvenTree avec les groupes fournis par l'IdP"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "Clé du groupe SSO"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr "Le nom de l'attribut de revendication de groupe fourni par l'IdP"
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr "Carte de groupe SSO"
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr "Une correspondance entre les groupes SSO et les groupes InvenTree locaux. Si le groupe local n'existe pas, il sera créé."
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr "Supprimer les groupes en dehors de SSO"
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr "Indique si les groupes attribués à l'utilisateur doivent être supprimés s'ils ne sont pas gérés par l'IdP. La désactivation de ce paramètre peut entraîner des problèmes de sécurité"
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "Email requis"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "Exiger que l'utilisateur fournisse un mail lors de l'inscription"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "Saisie automatique des utilisateurs SSO"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Remplir automatiquement les détails de l'utilisateur à partir des données de compte SSO"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "Courriel en double"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "Lors de l'inscription, demandez deux fois aux utilisateurs leur mail"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Mot de passe deux fois"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "Lors de l'inscription, demandez deux fois aux utilisateurs leur mot de passe"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Domaines autorisés"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "Restreindre l'inscription à certains domaines (séparés par des virgules, commençant par @)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Grouper sur inscription"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr "Groupe auquel les nouveaux utilisateurs sont assignés lors de l'enregistrement. Si la synchronisation des groupes SSO est activée, ce groupe n'est défini que si aucun groupe ne peut être attribué par l'IdP."
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "Forcer l'authentification multifacteurs"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "Les utilisateurs doivent utiliser l'authentification multifacteurs."
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr "Activer ce paramètre demandera à tous les utilisateurs de configurer l'authentification multi-facteurs. Toutes les sessions seront déconnectées immédiatement."
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Vérifier les plugins au démarrage"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "Vérifier que tous les plugins sont installés au démarrage - activer dans les environnements conteneurs"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "Vérifier les mises à jour des plugins"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "Activer les vérifications périodiques pour les mises à jour des plugins installés"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "Activer l'intégration d'URL"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "Autoriser les plugins à ajouter des chemins URL"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "Activer l'intégration de navigation"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "Activer les plugins à s'intégrer dans la navigation"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "Activer l'intégration de plugins"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "Activer l'intégration de plugin pour ajouter des apps"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "Activer l'intégration du planning"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Autoriser les plugins à éxécuter des tâches planifiées"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "Activer l'intégration des évènements"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "Autoriser les plugins à répondre aux évènements internes"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "Permettre l'intégration de l'interface"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "Permettre aux plugins de s'intégrer dans l'interface utilisateur"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr "Activer l'intégration mail"
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr "Autoriser les plugins à traiter les mails entrants/sortants"
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr "Activer les codes de projet"
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr "Activer les codes de projet pour le suivi des projets"
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr "Activer la fonctionnalité d'enregistrement des historiques de niveaux de stock et de leur valeur"
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "Exclure les localisations externes"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "Période de l'inventaire automatique"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "Afficher les noms des utilisateurs"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Afficher les noms complets des utilisateurs au lieu des noms d'utilisateur"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr "Afficher les profils d'utilisateur"
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr "Afficher les profils des utilisateurs sur leur page de profil"
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "Activer les données de station de test"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "Activer la collecte des données de la station de test pour les résultats de test"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr "Stock total disponible au moment de l'inventaire"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Date"
@@ -8084,77 +8092,77 @@ msgstr "Prise en charge de la lecture des codes-barres TME"
msgid "The Supplier which acts as 'TME'"
msgstr "Le fournisseur qui agit en tant que \"TME"
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr "L'installation du plugin est désactivée"
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "Installation réussie du plugin"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "Installation du plugin dans {path}"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr "Le plugin n'a pas été trouvé dans le registre"
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr "Le plugin n'est pas un plugin packagé"
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr "Le nom du paquet du plugin n'a pas été trouvé"
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr "Seuls les membres du personnel peuvent administrer les plugins"
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr "La désinstallation des plugins est désactivée"
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr "Le plugin ne peut pas être désinstallé car il est actuellement actif"
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr "Le plugin n'est pas installé"
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr "L'installation du plugin n'a pas été trouvée"
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr "Désinstallation réussie du plugin"
@@ -8206,21 +8214,21 @@ msgstr "Plugin Package"
msgid "Plugin"
msgstr "Extension"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "Aucun auteur trouvé"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "Le plugin '{p}' n'est pas compatible avec la version actuelle d'InvenTree {v}"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "Le plugin nécessite au moins la version {v}"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "Le plugin nécessite au maximum la version {v}"
@@ -9218,7 +9226,7 @@ msgstr "La quantité ne correspond pas au nombre de numéros de série"
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr "Le modèle de test n'existe pas"
@@ -9238,7 +9246,7 @@ msgstr "L'article de stock contient d'autres articles"
msgid "Stock item has been assigned to a customer"
msgstr "Un article de stock a été affecté à un client"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "L'article de stock est actuellement en production"
@@ -9262,71 +9270,71 @@ msgstr "Les articles en stock doivent se référer à la même pièce du fournis
msgid "Stock status codes must match"
msgstr "Les codes d'état des stocks doivent correspondre"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "StockItem ne peut pas être déplacé car il n'est pas en stock"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr "Suivi des articles en stock"
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Notes d'entrée"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr "Résultat du test de l'article en stock"
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Une valeur doit être fournie pour ce test"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "La pièce jointe doit être téléchargée pour ce test"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr "Valeur non valide pour ce test"
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Résultat du test"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "Valeur de sortie du test"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "Pièce jointe au résultat du test"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "Notes de test"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr "Station de test"
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr "L'identifiant de la station de test où le test a été effectué"
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr "Commencé"
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr "Horodatage du début du test"
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr "Fini"
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr "Horodatage de la fin du test"
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "La quantité ne doit pas dépasser la quantité disponible en stock ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "Emplacement du stock de destination"
@@ -9565,7 +9573,7 @@ msgstr "L'entreprise sélectionnée n'est pas un client"
msgid "Stock assignment notes"
msgstr "Notes d'affectation des stocks"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "Une liste des articles en stock doit être fournie"
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "Notes sur les transactions boursières"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "Notes sur les transactions boursières"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr "Numéro de série suivant"
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr "Numéro de série précédent"
diff --git a/src/backend/InvenTree/locale/he/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/he/LC_MESSAGES/django.po
index 29b573ac5d..622651df47 100644
--- a/src/backend/InvenTree/locale/he/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/he/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Hebrew\n"
"Language: he_IL\n"
@@ -109,9 +109,9 @@ msgstr ""
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr ""
@@ -550,13 +550,13 @@ msgstr ""
msgid "Parent Build"
msgstr "מקור הבנייה"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr ""
msgid "Allocated"
msgstr ""
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr ""
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr ""
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr ""
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr ""
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr ""
msgid "Unit definition"
msgstr ""
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "קובץ מצורף"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr ""
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr ""
@@ -2673,8 +2673,8 @@ msgstr ""
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr ""
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr ""
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr ""
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr ""
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr ""
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr ""
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr ""
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr ""
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr ""
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr ""
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr ""
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr ""
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr ""
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr ""
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr ""
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr ""
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr ""
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr ""
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr ""
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr ""
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr ""
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr ""
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr ""
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr ""
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr ""
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr ""
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr ""
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr ""
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr ""
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr ""
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr ""
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9262,71 +9270,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr ""
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr ""
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr ""
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr ""
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9565,7 +9573,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/hi/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/hi/LC_MESSAGES/django.po
index 88617dec56..641b4d51d5 100644
--- a/src/backend/InvenTree/locale/hi/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/hi/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Hindi\n"
"Language: hi_IN\n"
@@ -109,9 +109,9 @@ msgstr ""
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr ""
@@ -550,13 +550,13 @@ msgstr ""
msgid "Parent Build"
msgstr ""
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr ""
msgid "Allocated"
msgstr ""
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr ""
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr ""
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr ""
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr ""
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr ""
msgid "Unit definition"
msgstr ""
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr ""
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr ""
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr ""
@@ -2673,8 +2673,8 @@ msgstr ""
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr ""
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr ""
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr ""
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr ""
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr ""
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr ""
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr ""
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr ""
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr ""
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr ""
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr ""
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr ""
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr ""
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr ""
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr ""
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr ""
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr ""
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr ""
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr ""
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr ""
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr ""
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr ""
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr ""
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr ""
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr ""
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr ""
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr ""
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr ""
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr ""
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr ""
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr ""
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9262,71 +9270,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr ""
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr ""
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr ""
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr ""
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9565,7 +9573,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/hu/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/hu/LC_MESSAGES/django.po
index 1d97eed35c..b8f67b71d6 100644
--- a/src/backend/InvenTree/locale/hu/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/hu/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Hungarian\n"
"Language: hu_HU\n"
@@ -109,9 +109,9 @@ msgstr "Érvénytelen decimális érték"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Megjegyzések"
@@ -550,13 +550,13 @@ msgstr "Rendelés állapota"
msgid "Parent Build"
msgstr "Szülő gyártás"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "Változatokkal együtt"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "Befejezetlen rendelés"
msgid "Allocated"
msgstr "Lefoglalva"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "Felhasználva"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Elérhető"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "Rendelve"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr "Gyártás nem található"
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Gyártási utasítás"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Hely"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr "Kimenet"
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr "Szűrés a kimeneti készlet tétel azonosítójára. Használj 'null'-t ha a be nem épített gyártási tételeket keresed."
@@ -1831,7 +1831,7 @@ msgstr "Definíció"
msgid "Unit definition"
msgstr "Mértékegység definíció"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Melléklet"
@@ -1949,7 +1949,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr "Az állapot logikai kulcsa amely megegyezik az üzleti logika egyedi állapotával"
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Érték"
@@ -2284,7 +2284,7 @@ msgid "Response data from the barcode scan"
msgstr "Vonalkód olvasó válasz adat"
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Eredmény"
@@ -2674,8 +2674,8 @@ msgstr "Milyen gyakran frissítse az árfolyamokat (nulla a kikapcsoláshoz)"
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "nap"
@@ -3278,538 +3278,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "Lehet-e olyan készleteket mozgatni készlethelyek között amik nincsenek raktáron"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "Gyártási utasítás azonosító minta"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Szükséges minta a gyártási utasítás azonosító mező előállításához"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "Felelős tulajdonos szükséges"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "Minden rendeléshez felelőst kell rendelni"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr "Szükséges Aktív Alkatrész"
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr "Inaktív alkatrészekre nem lehet Gyártási Rendelést létrehozni"
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr "Elvárás a Lezárt Alkatrész"
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr "Megakadályozza, hogy nem lezárt alkatrészekre gyártási rendelést lehessen indítani"
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr "Jóváhagyott Alkatrészjegyzék Kötelező"
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr "Megakadályozza gyártási rendelés készítését ha nincsen az Alkatrészjegyzék jóváhagyva"
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr "Leszármazott Gyártásoknak Lezártnak Kell Lennie"
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr "Amíg minden leszármazott gyártás le nincsen zárva nem lehet a szülő gyártást lezárni"
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr "Külső Gyártási Rendelések"
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr "Engedélyezze a külső gyártási rendelés funkciót"
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "Blokkolás a tesztek sikeres végrehajtásáig"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "Nem lehet gyártási tételt befejezni amíg valamennyi kötelező teszt sikeres nem lett"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "Visszavétel engedélyezése"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "Visszavételek engedélyezése a felületen"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "Visszavétel azonosító minta"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "Szükséges minta a visszavétel azonosító mező előállításához"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "Befejezett visszavétel szerkesztése"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "Visszavétel szerkesztésének engedélyezése befejezés után"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "Vevői rendelés azonosító minta"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "Szükséges minta a vevői rendelés azonosító mező előállításához"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "Vevői rendeléshez alapértelmezett szállítmány"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "Szállítmány automatikus létrehozása az új vevő rendelésekhez"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "Befejezett vevői rendelés szerkesztése"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "Vevői rendelések szerkesztésének engedélyezése szállítás vagy befejezés után"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr "Szállítmány Ellenőrzést Igényel"
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr "Megakadályozza a szállítmányok befejezését, amíg a tételeket nem ellenőrizték"
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "Leszállított Rendelések Készre jelölése"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "Leszállítottnak jelölt Értékesítési rendelések automatikusan Kész-re lesznek állítva, a \"Leszállított\" állapot átugrásával"
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "Beszerzési rendelés azonosító minta"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "Szükséges minta a beszerzési rendelés azonosító mező előállításához"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "Befejezett beszerzési rendelés szerkesztése"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "Beszérzési rendelések szerkesztésének engedélyezése kiküldés vagy befejezés után"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr "Jelenlegi pénznem"
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr "Tétel érték bázis-pénznemre váltása készlet beérkezéskor"
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Beszerzési rendelések automatikus befejezése"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "A beszerzési rendelés automatikus befejezése ha minden sortétel beérkezett"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Elfelejtett jelszó engedélyezése"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Elfelejtett jelszó funkció engedélyezése a bejentkező oldalon"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Regisztráció engedélyezése"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Felhaszálók önkéntes regisztrációjának engedélyezése a bejelentkező oldalon"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "SSO engedélyezése"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "SSO engedélyezése a bejelentkező oldalon"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "SSO regisztráció engedélyezése"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Felhaszálók önkéntes regisztrációjának engedélyezése SSO-n keresztül a bejelentkező oldalon"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "SSO csoport szinkronizálás engedélyezése"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "Az InvenTree csoportok szinkronizálása a hitelesítésszolgáltatóhoz"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "SSO csoport kulcs"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr "A csoportkérés tulajdonság neve amit a hitelesítésszolgáltató nyújt"
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr "SSO csoport hozzárendelés"
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr "Az SSO csoportok hozzárendelése az InvenTree csoportokhoz. Ha a helyi csoport nem létezik, létre lesz hozva."
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr "Az SSO-n kívüli csoportok eltávolítása"
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr "Ha egy felhasználóhoz rendelt csoport nem létezik az azonosításszolgáltatóban azt eltávolítsuk el. Ennek a kikapcsolása biztonsági problémákhoz vezethet"
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "Email szükséges"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "Kötelező email megadás regisztrációkor"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "SSO felhasználók automatikus kitöltése"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Felhasználó adatainak automatikus kitöltése az SSO fiókadatokból"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "Email kétszer"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "Regisztráláskor kétszer kérdezze a felhasználó email címét"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Jelszó kétszer"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "Regisztráláskor kétszer kérdezze a felhasználó jelszavát"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Engedélyezett domainek"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "Feliratkozás korlátozása megadott domain-ekre (vesszővel elválasztva, @-al kezdve)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Csoport regisztráláskor"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr "Ehhez a csoporthoz lesznek az új felhasználók rendelve. Ha az SSO csoport szinkronizálás engedélyezve van, akkor ez a csoport csak akkor lesz hozzárendelve a felhasználóhoz ha az azonosítás szolgáltató semmilyen csoportot nem rendelt hozzá."
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "Többfaktoros hitelesítés kényszerítése"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "A felhasználóknak többfaktoros hitelesítést kell használniuk."
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Pluginok ellenőrzése indításkor"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "Ellenőrizze induláskor hogy minden plugin telepítve van - engedélyezd konténer környezetben (docker)"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "Plugin frissítések ellenőrzése"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "Frissítések periódikus ellenőrzésének engedélyezése a telepített pluginokra"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "URL integráció engedélyezése"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "URL útvonalalak hozzáadásának engedélyezése a pluginok számára"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "Navigációs integráció engedélyezése"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "Navigációs integráció engedélyezése a pluginok számára"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "App integráció engedélyezése"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "App hozzáadásának engedélyezése a pluginok számára"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "Ütemezés integráció engedélyezése"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Háttérben futó feladatok hozzáadásának engedélyezése a pluginok számára"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "Esemény integráció engedélyezése"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "Belső eseményekre reagálás engedélyezése a pluginok számára"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "Interfész integráció engedélyezése"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "Pluginok felhasználói felületbe épülésének engedélyezése"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr "Email integráció engedélyezése"
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr "Pluginok bejövő/kimenő levelekhez hozzáférésének engedélyezése"
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr "Projektszámok engedélyezése"
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr "Projectek nyomkövetéséhez projekt kódok engedélyezése"
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr "A készletek korábbi mennyiségének és értékének naplózásának engedélyezés"
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "Külső helyek nélkül"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "Automatikus leltár időpontja"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr "Készlettörténet törlési gyakoriság"
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "Felhasználók teljes nevének megjelenítése"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Felhasználói név helyett a felhasználók teljes neve jelenik meg"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr "Felhasználói profilok megjelenítése"
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr "Felhasználói profilok megjelenítése a profil oldalukon"
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "Teszt állomás adatok engedélyezése"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "Tesztállomás adatok gyűjtésének teszt eredménybe gyűjtésének engedélyezése"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr "Gép Ping Engedélyezése"
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr "Időszakos ping feladat engedélyezése a regisztrált gépekhez az állapotuk ellenőrzésére"
@@ -6644,7 +6652,7 @@ msgid "Total available stock at time of stocktake"
msgstr "Teljes készlet a leltárkor"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Dátum"
@@ -8085,77 +8093,77 @@ msgstr "TME vonalkódok támogatása"
msgid "The Supplier which acts as 'TME'"
msgstr "A 'TME' beszállító"
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr "Plugin telepítés letiltva"
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "Plugin telepítése sikeres"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "Plugin telepítve ide: {path}"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr "Ez a plugin nem található a tárolóban"
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr "A plugin nem egy csomagolt plugin"
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr "Plugin csomag neve nem található"
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr "Csak a személyzeti felhasználók adminisztrálhatják a pluginokat"
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr "Plugin eltávolítás letiltva"
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr "Plugin nem eltávolítható mivel még aktív"
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr "Kötelező plugint nem lehet uninstallálni"
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr "Plugin nem uninstallálható mert mintaplugin"
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr "Plugin nem uninstallálható mert beépített plugin"
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr "Plugin nincs telepítve"
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr "Plugin telepítés nem található"
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr "Plugin eltávolítása sikeres"
@@ -8207,21 +8215,21 @@ msgstr "Csomag plugin"
msgid "Plugin"
msgstr "Bővítmény"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "Nincs szerző"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "A '{p}' plugin nem kompatibilis az aktuális applikáció verzióval {v}"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "A pluginhoz minimum {v} verzió kell"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "A pluginhoz maximum {v} verzió kell"
@@ -9219,7 +9227,7 @@ msgstr "A mennyiség nem egyezik a megadott sorozatszámok számával"
msgid "Cannot assign stock to structural location"
msgstr "Nem lehet készletet strukturális helyre rendelni"
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr "Ez a Teszt sablon nem létezik"
@@ -9239,7 +9247,7 @@ msgstr "A készlet tétel más tételeket tartalmaz"
msgid "Stock item has been assigned to a customer"
msgstr "Készlet tétel hozzárendelve egy vevőhöz"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "Készlet tétel gyártás alatt"
@@ -9263,71 +9271,71 @@ msgstr "A készlet tétel ugyanarra a beszállítói alkatrészre kell vonatkozz
msgid "Stock status codes must match"
msgstr "Készlet tételek állapotainak egyeznie kell"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "Készlet tétel nem mozgatható mivel nincs készleten"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr "Készlettörténet"
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Bejegyzés megjegyzései"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr "Készlet Tétel Ellenőrzés Eredménye"
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Ehhez a teszthez meg kell adni értéket"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "Ehhez a teszthez fel kell tölteni mellékletet"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr "A teszt eredménye érvénytelen"
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Teszt eredménye"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "Teszt kimeneti értéke"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "Teszt eredmény melléklet"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "Tesztek megjegyzései"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr "Teszt állomás"
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr "A tesztet elvégző tesztállomás azonosítója"
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr "Elkezdődött"
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr "A teszt indításának időpontja"
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr "Befejezve"
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr "A teszt befejezésének időpontja"
@@ -9441,8 +9449,8 @@ msgstr "Nincsen készlettétel megadva"
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "A mennyiség nem lépheti túl a rendelkezésre álló készletet ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "Cél készlet hely"
@@ -9566,7 +9574,7 @@ msgstr "A kiválasztott cég nem egy vevő"
msgid "Stock assignment notes"
msgstr "Készlet hozzárendelés megjegyzései"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "A készlet tételek listáját meg kell adni"
@@ -9614,27 +9622,31 @@ msgstr "Készlettétel már készleten van"
msgid "Quantity must not be negative"
msgstr "Mennyiség nem lehet negatív"
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "Készlet tranzakció megjegyzései"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr "Meglévő készletbe olvasztás"
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "Készlet tranzakció megjegyzései"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr "Visszaérkezett tételek beolvasztása a készlettételekbe ha lehetséges"
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr "Következő sorozatszám"
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr "Előző Sorozatszám"
diff --git a/src/backend/InvenTree/locale/id/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/id/LC_MESSAGES/django.po
index a6f25b3013..f671dee065 100644
--- a/src/backend/InvenTree/locale/id/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/id/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Indonesian\n"
"Language: id_ID\n"
@@ -109,9 +109,9 @@ msgstr ""
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Catatan"
@@ -550,13 +550,13 @@ msgstr ""
msgid "Parent Build"
msgstr "Produksi Induk"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr ""
msgid "Allocated"
msgstr ""
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Tersedia"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr ""
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Order Produksi"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Lokasi"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr ""
msgid "Unit definition"
msgstr ""
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Lampiran"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr ""
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr ""
@@ -2673,8 +2673,8 @@ msgstr ""
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "Hari"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr ""
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr ""
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr ""
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr ""
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr ""
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr ""
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr ""
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr ""
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr ""
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "Surel diperlukan"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr ""
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr ""
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr ""
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr ""
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr ""
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr ""
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr ""
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr ""
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr ""
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr ""
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr ""
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr ""
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr ""
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr ""
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr ""
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr ""
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "Aktifkan Integrasi Antarmuka"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr ""
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Tanggal"
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr ""
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr ""
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9262,71 +9270,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr ""
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr ""
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "Lampiran perlu diunggah untuk tes ini"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr ""
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9565,7 +9573,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/it/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/it/LC_MESSAGES/django.po
index c84f131971..10d15adb82 100644
--- a/src/backend/InvenTree/locale/it/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/it/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Italian\n"
"Language: it_IT\n"
@@ -109,9 +109,9 @@ msgstr "Valore decimale non valido"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Note"
@@ -550,13 +550,13 @@ msgstr "Stato dell'ordine"
msgid "Parent Build"
msgstr "Produzione Genitore"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "Includi Varianti"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "Ordine In Corso"
msgid "Allocated"
msgstr "Allocato"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "Utilizzato"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Disponibile"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "Ordinato"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Ordine di Produzione"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Posizione"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr "Output"
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr "Filtra per ID articolo stock di output. Usa 'null' per trovare elementi di produzione disinstallati."
@@ -1830,7 +1830,7 @@ msgstr "Definizione"
msgid "Unit definition"
msgstr "Definizione unità"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Allegato"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr "Chiave logica dello stato che è uguale a questo stato personalizzato nella logica commerciale"
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Valore"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr "Dati di risposta dalla scansione del codice a barre"
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Risultato"
@@ -2673,8 +2673,8 @@ msgstr "Quanto spesso aggiornare i tassi di cambio (impostare a zero per disabil
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "giorni"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "Consenti il trasferimento di articoli non disponibili a magazzino tra le diverse ubicazioni di magazzino"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "Modello Di Riferimento Ordine Di Produzione"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Modello richiesto per generare il campo di riferimento ordine di produzione"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "È richiesto il Proprietario Responsabile"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "A ogni ordine deve essere assegnato un proprietario responsabile"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr "Richiede Articolo Attivo"
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr "Impedisci la creazione di ordini di produzione per gli articolo inattivi"
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr "Richiede Articolo Bloccato"
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr "Impedisci la creazione di ordini di costruzione per le parti sbloccate"
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr "Richiede un BOM valido"
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr "Previene la creazione di ordini di costruzione a meno che BOM non sia stato convalidato"
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr "Richiedi Ordini Dei Figli Chiusi"
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr "Impedisci il completamento dell'ordine di costruzione fino alla chiusura di tutti gli ordini figli"
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr "Ordini di Produzione Esterni"
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr "Abilita funzionalità ordini di produzione esterni"
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "Blocca Fino Al Passaggio Dei Test"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "Impedisci che gli output di costruzione siano completati fino al superamento di tutti i test richiesti"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "Abilita Ordini Di Reso"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "Abilita la funzionalità ordine di reso nell'interfaccia utente"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "Motivo di Riferimento per ordine di reso"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "Modello richiesto per generare il campo di riferimento ordine di reso"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "Modifica Ordini Di Reso Completati"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "Consenti la modifica degli ordini di reso dopo che sono stati completati"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "Modello Di Riferimento Ordine Di Vendita"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "Modello richiesto per generare il campo di riferimento ordine di vendita"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "Spedizione Predefinita Ordine Di Vendita"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "Abilita la creazione di spedizioni predefinite con ordini di vendita"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "Modifica Ordini Di Vendita Completati"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "Consenti la modifica degli ordini di vendita dopo che sono stati spediti o completati"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr "La Spedizione Richiede Controllo"
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr "Impedire il completamento delle spedizioni fino a quando gli articoli sono stati controllati"
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "Segna gli ordini spediti come completati"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "Gli ordini di vendita contrassegnati come spediti saranno automaticamente completati, bypassando lo stato \"spedito\""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "Modello di Riferimento Ordine D'Acquisto"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "Modello richiesto per generare il campo di riferimento ordine di acquisto"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "Modifica Ordini Di Acquisto Completati"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "Consenti la modifica degli ordini di acquisto dopo che sono stati spediti o completati"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr "Converti Valuta"
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr "Converti il valore dell'elemento in valuta base quando si riceve lo stock"
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Completa Automaticamente Gli Ordini D'Acquisto"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "Contrassegna automaticamente gli ordini di acquisto come completi quando tutti gli elementi della riga sono ricevuti"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Abilita password dimenticata"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Abilita la funzione password dimenticata nelle pagine di accesso"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Abilita registrazione"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Abilita auto-registrazione per gli utenti nelle pagine di accesso"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "SSO abilitato"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "Abilita SSO nelle pagine di accesso"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "Abilita registrazione SSO"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Abilita l'auto-registrazione tramite SSO per gli utenti nelle pagine di accesso"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "Abilita sincronizzazione dei gruppi SSO"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "Abilita la sincronizzazione dei gruppi InvenTree con i gruppi forniti dall'IdP"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "Chiave gruppo SSO"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr "Il nome dell'attributo di richiesta di gruppi fornito dall'IdP"
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr "Mappa del gruppo SSO"
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr "Una mappatura dai gruppi SSO ai gruppi InvenTree locali. Se il gruppo locale non esiste, verrà creato."
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr "Rimuovere i gruppi al di fuori dell'SSO"
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr "Indica se i gruppi assegnati all'utente debbano essere rimossi se non sono backend dall'IdP. La disattivazione di questa impostazione potrebbe causare problemi di sicurezza"
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "Email richiesta"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "Richiedi all'utente di fornire una email al momento dell'iscrizione"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "Riempimento automatico degli utenti SSO"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Compila automaticamente i dettagli dell'utente dai dati dell'account SSO"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "Posta due volte"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "Al momento della registrazione chiedere due volte all'utente l'indirizzo di posta elettronica"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Password due volte"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "Al momento della registrazione chiedere agli utenti due volte l'inserimento della password"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Domini consentiti"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "Limita la registrazione a determinati domini (separati da virgola, a partire da @)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Gruppo iscrizione"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr "Gruppo a cui i nuovi utenti sono assegnati alla registrazione. Se la sincronizzazione di gruppo SSO è abilitata, questo gruppo è impostato solo se nessun gruppo può essere assegnato dall'IdP."
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "Applica MFA"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "Gli utenti devono utilizzare la sicurezza a due fattori."
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr "Abilitare questa impostazione richiederà a tutti gli utenti di impostare l'autenticazione multi fattore. Tutte le sessioni saranno disconnesse immediatamente."
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Controlla i plugin all'avvio"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "Controlla che tutti i plugin siano installati all'avvio - abilita in ambienti contenitore"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "Controlla gli aggiornamenti dei plugin"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "Abilita controlli periodici per gli aggiornamenti dei plugin installati"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "Abilita l'integrazione URL"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "Attiva plugin per aggiungere percorsi URL"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "Attiva integrazione navigazione"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "Abilita i plugin per l'integrazione nella navigazione"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "Abilita l'app integrata"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "Abilita plugin per aggiungere applicazioni"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "Abilita integrazione pianificazione"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Abilita i plugin per eseguire le attività pianificate"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "Abilita eventi integrati"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "Abilita plugin per rispondere agli eventi interni"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "Abilita integrazione interfaccia"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "Abilita i plugin per l'integrazione nell'interfaccia utente"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr "Abilita integrazione email"
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr "Abilita i plugin per elaborare le email in uscita/in arrivo"
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr "Abilita codici progetto"
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr "Abilita i codici del progetto per tracciare i progetti"
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr "Abilita la funzionalità per registrare i livelli storici e il valore del magazzino"
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "Escludi Posizioni Esterne"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "Inventario periodico automatico"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "Visualizza i nomi completi degli utenti"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Mostra nomi completi degli utenti invece che nomi utente"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr "Visualizza Profili Utente"
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr "Visualizza i profili degli utenti sulla pagina del loro profilo"
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "Abilita Dati Stazione Di Prova"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "Abilita la raccolta dati della stazione di prova per i risultati del test"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr "Abilita Ping Macchina"
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr "Abilita l'attività di ping periodico delle macchine registrate per controllarne lo stato"
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr "Totale delle scorte disponibili al momento dell'inventario"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Data"
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr "L'installazione dei plugin è disattivata"
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "Plugin installato con successo"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "Plugin installato in {path}"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr "Plugin"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "Nessun autore trovato"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr "La quantità non corrisponde ai numeri di serie"
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr "L'elemento di magazzino contiene altri elementi"
msgid "Stock item has been assigned to a customer"
msgstr "L'elemento di magazzino è stato assegnato a un cliente"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "L'elemento di magazzino è attualmente in produzione"
@@ -9262,71 +9270,71 @@ msgstr "Gli elementi di magazzino devono riferirsi allo stesso articolo fornitor
msgid "Stock status codes must match"
msgstr "I codici di stato dello stock devono corrispondere"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "Le giacenze non possono essere spostate perché non disponibili"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Note d'ingresso"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Il valore deve essere fornito per questo test"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "L'allegato deve essere caricato per questo test"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Risultato Test"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "Test valore output"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "Risultato della prova allegato"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "Note del test"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "La quantità non deve superare la quantità disponibile ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "Posizione magazzino di destinazione"
@@ -9565,7 +9573,7 @@ msgstr "L'azienda selezionata non è un cliente"
msgid "Stock assignment notes"
msgstr "Note sull'assegnazione delle scorte"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "Deve essere fornito un elenco degli elementi di magazzino"
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "Note sugli spostamenti di magazzino"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "Note sugli spostamenti di magazzino"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/ja/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/ja/LC_MESSAGES/django.po
index 3770082aa7..7d9d8be78c 100644
--- a/src/backend/InvenTree/locale/ja/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/ja/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Japanese\n"
"Language: ja_JP\n"
@@ -109,9 +109,9 @@ msgstr "無効な10進数値"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "メモ"
@@ -550,13 +550,13 @@ msgstr "注文ステータス"
msgid "Parent Build"
msgstr "親ビルド"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "バリアントを含む"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "受注残高"
msgid "Allocated"
msgstr "割り当てられた"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "消費されました"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "利用可能"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "注文中"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr "ビルドが見つかりません"
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "組立注文"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "場所"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr "出力"
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr "出力ストックアイテムIDでフィルタリングします。未インストールビルドアイテムを検索するには「null」をご使用ください。"
@@ -1830,7 +1830,7 @@ msgstr "定義"
msgid "Unit definition"
msgstr "ユニットの定義"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "添付ファイル"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr "ビジネスロジックでこのカスタムステートに等しいステート論理キー"
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "値"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr "バーコードスキャンによるレスポンスデータ"
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "結果"
@@ -2673,8 +2673,8 @@ msgstr "為替レートの更新頻度 (ゼロに設定すると無効になり
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "日"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "在庫のないストックアイテムをストックロケーション間で移動可能"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "ビルド・オーダー参照パターン"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Build Order参照フィールドの生成に必要なパターン"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "責任ある所有者を要求"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "各注文には、責任ある所有者を指定する必要があります。"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr "アクティブパートが必要"
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr "非稼動部品の製造オーダー作成を防止"
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr "ロックされた部分を要求"
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr "ロックされていない部品の製造オーダー作成を防止"
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr "有効なBOMが必要"
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr "BOMが検証されない限り、製造オーダーが作成されないようにします。"
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr "クローズド・チャイルド・オーダー"
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr "すべてのチャイルドオーダーが終了するまで、ビルドオーダーの完了を防止します。"
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr "外部ビルドオーダー"
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr "外部ビルドオーダー機能の有効化"
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr "外部ビルドオーダーを必須とする"
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr "外部サプライヤーから組み立て済み部品を発注する際は、外部ビルドオーダーを指定する必要があります"
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "テストがパスするまでブロック"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "必要なテストがすべて合格するまで、ビルド出力が完了しないようにします。"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "返品注文の有効化"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "ユーザーインターフェイスで返品注文機能を有効にします。"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "リターンオーダー参照パターン"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "返品注文参照フィールドの生成に必要なパターン"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "完了した返品注文の編集"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "注文完了後の返品注文の編集が可能"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "販売注文参照パターン"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "販売注文参照フィールドの生成に必要なパターン"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "販売注文のデフォルト出荷"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "販売注文でデフォルト出荷を作成可能"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "完了した販売注文の編集"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "出荷または完了後の販売注文の編集を許可します。"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr "出荷には確認が必要です"
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr "商品が確認されるまで、出荷の完了をお控えください。"
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "出荷された注文を完了としてマーク"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "出荷済みと表示された販売注文は、「出荷済み」ステータスを回避して自動的に完了します。"
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr "在庫移動指示を有効"
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr "ユーザーインターフェースで在庫移動指示機能を有効にします"
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr "在庫移動指示コード採番フォーマット"
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr "在庫移動指示コードを自動採番するために使用するフォーマット(必須項目)"
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr "未完了項目のテストのブロック"
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr "必要な品目チェックが完了していない場合、販売注文への在庫品目の割り当てを防止します"
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "発注書参照パターン"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "発注書参照フィールドの生成に必要なパターン"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "完了した発注書の編集"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "出荷後または完了後の発注書の編集が可能"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr "通貨の変換"
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr "在庫を受け取る際、商品価値を基準通貨に変換"
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "自動発注"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "すべての品目を受領した時点で、発注書を完了として自動的にマーク"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "パスワード忘れ"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "ログインページでのパスワード忘れ防止機能の有効化"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "登録の有効化"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "ログインページでユーザーの自己登録を可能にします。"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "SSOの有効化"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "ログインページでSSOを有効化"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "SSO登録の有効化"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "ログインページでSSOによるユーザーの自己登録を可能にします。"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "SSOグループ同期の有効化"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "InvenTreeグループとIdPが提供するグループの同期を有効にします。"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "SSOグループキー"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr "IdP が提供する groups claim 属性の名前。"
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr "SSOグループマップ"
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr "SSOグループからローカルのInvenTreeグループへのマッピング。ローカル・グループが存在しない場合は、作成されます。"
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr "SSO外のグループを削除"
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr "ユーザーに割り当てられたグループがIdPによってバックエンドされていない場合に削除するかどうか。この設定を無効にすると、セキュリティ上の問題が発生する可能性があります。"
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "メールアドレスは必須です"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "サインアップ時にメールの入力を要求"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "SSOユーザーの自動入力"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "SSOアカウントデータからユーザー詳細を自動入力"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "メール2回"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "サインアップの際、ユーザーに2度メールを尋ねます。"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "パスワード2回"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "サインアップ時にパスワードを2回要求"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "許可ドメイン"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "特定のドメイン(@で始まるカンマ区切り)へのサインアップを制限します。"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "登録時のグループ"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr "新規ユーザ登録時に割り当てられるグループ。SSOグループ同期が有効な場合、このグループはIdPからグループを割り当てられない場合にのみ設定されます。"
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "MFAの実施"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "ユーザーは多要素セキュリティを使用する必要があります。"
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr "この設定を有効にすると、すべてのユーザーに多要素認証の設定が必須となります。すべてのセッションは直ちに切断されます。"
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "起動時にプラグインをチェック"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "起動時にすべてのプラグインがインストールされていることを確認 - コンテナ環境では有効にします。"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "プラグインのアップデートの確認"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "インストールされているプラグインのアップデートを定期的にチェックします。"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "URL統合の有効化"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "プラグインがURLルートを追加できるようにします"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "ナビゲーション統合の有効化"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "プラグインをナビゲーションに統合可能"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "アプリとの統合"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "プラグインを有効にしてアプリを追加"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "スケジュール統合の有効化"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "スケジュールタスクを実行するプラグインの有効化"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "イベント統合の有効化"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "プラグインが内部イベントに応答できるようにします。"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "インターフェース統合の有効化"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "プラグインがユーザー・インターフェースに統合できるようにします。"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr "メール連携を有効にする"
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr "プラグインを有効にして、送信/受信メールを処理できるようにします"
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr "プロジェクトコードの有効化"
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr "プロジェクトを追跡するためのプロジェクトコードの有効化"
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr "棚卸機能を有効"
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr "過去の在庫数量および価値を記録する機能を有効にします"
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "外部ロケーションを除く"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr "外部拠点にある在庫品を棚卸計算から除外します"
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "自動引取期間"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr "自動棚卸記録の間隔(日数)"
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr "古い棚卸の記録を削除"
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr "指定した日数より古い棚卸し記録を削除します"
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr "棚卸しの削除間隔"
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr "棚卸し記録は、指定された日数が経過すると削除されます"
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr "古い在庫追跡記録を削除"
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr "指定した日数より古い在庫追跡記録を削除します"
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr "在庫追跡記録の削除間隔"
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr "在庫追跡記録は、指定された日数が経過すると削除されます"
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "ユーザーのフルネームを表示"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "ユーザー名の代わりにフルネームを表示"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr "ユーザープロファイルの表示"
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr "プロフィールページにユーザーのプロフィールを表示"
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr "週の始まり"
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr "カレンダー表示における週開始曜日"
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr "日曜日"
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr "月曜日"
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr "火曜日"
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr "水曜日"
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr "木曜日"
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr "金曜日"
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr "土曜日"
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "テストステーションデータの有効化"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "テスト結果のテストステーションデータ収集の有効化"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr "マシン ping を有効にする"
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr "登録されたマシンの状態を確認するため、定期的なpingタスクを有効にしてください"
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr "ストックテイク時の在庫可能量"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "日付"
@@ -8084,77 +8092,77 @@ msgstr "TMEバーコードのスキャンをサポートします。"
msgid "The Supplier which acts as 'TME'"
msgstr "「TME」として活動するサプライヤー"
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr "プラグインの管理ができるのは、スーパーユーザーアカウントのみです"
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr "プラグインのインストールが無効"
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr "インストール用のパッケージ名またはURLが指定されていません"
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr "パッケージ名またはURLに無効な文字が含まれています"
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "プラグインのインストールに成功しました"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "{path} にプラグインをインストール"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr "プラグインがレジストリに見つかりませんでした"
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr "プラグインはパッケージ化されていません"
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr "プラグインパッケージ名が見つかりません"
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr "スタッフユーザーのみがプラグインを管理できます"
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr "プラグインのアンインストールが無効"
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr "プラグインがアクティブなため、アンインストールできません。"
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr "このプラグインは必須のため、アンインストールすることはできません。"
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr "このプラグインはサンプルプラグインのため、アンインストールすることはできません。"
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr "プラグインは組み込みプラグインのため、アンインストールすることはできません。"
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr "プラグインがインストールされていません"
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr "プラグインのインストールが見つかりません"
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr "プラグインのアンインストールに成功"
@@ -8206,21 +8214,21 @@ msgstr "パッケージプラグイン"
msgid "Plugin"
msgstr "プラグイン"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "著者は見つかりませんでした"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "プラグイン'{p}'は現在のInvenTreeバージョン{v}と互換性がありません。"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "プラグインには少なくともバージョン {v} が必要です。"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "プラグインに必要なバージョンは最大で{v}です。"
@@ -9218,7 +9226,7 @@ msgstr "数量がシリアル番号と一致しません"
msgid "Cannot assign stock to structural location"
msgstr "構造上ロケーションに在庫を割り当てることはできません"
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr "テストテンプレートが存在しません"
@@ -9238,7 +9246,7 @@ msgstr "在庫商品には他の商品が含まれています。"
msgid "Stock item has been assigned to a customer"
msgstr "在庫商品が顧客に割り当てられました"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "在庫品は現在生産中です。"
@@ -9262,71 +9270,71 @@ msgstr "在庫品は同じサプライヤーの部品を参照する必要があ
msgid "Stock status codes must match"
msgstr "在庫状況コードが一致していること"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "在庫がないため移動できません。"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr "ストックアイテムのトラッキング"
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "記入上の注意"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr "在庫品テスト結果"
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "このテストには値を指定する必要があります。"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "このテストには添付ファイルをアップロードする必要があります。"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr "このテストでは無効な値です。"
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "試験結果"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "テスト出力値"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "試験結果添付"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "テストノート"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr "テストステーション"
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr "試験が実施された試験ステーションの識別子。"
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr "開始"
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr "テスト開始のタイムスタンプ"
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr "修了済み"
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr "テスト終了のタイムスタンプ"
@@ -9440,8 +9448,8 @@ msgstr "在庫品目がしていされていません"
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "数量は在庫数 ({q}) を超えてはなりません。"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "仕向け地"
@@ -9565,7 +9573,7 @@ msgstr "選択された企業は顧客ではありません"
msgid "Stock assignment notes"
msgstr "株式譲渡に関する注意事項"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "在庫品のリストが必要です。"
@@ -9613,27 +9621,31 @@ msgstr "在庫品目は既に在庫にあります"
msgid "Quantity must not be negative"
msgstr "数量は負の数であってはなりません。"
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "株式取引に関する注記"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr "既存の在庫に統合します"
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "株式取引に関する注記"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr "可能なら、返品された商品を既存の在庫商品に統合してください"
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr "次のシリアル番号"
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr "以前のシリアル番号"
diff --git a/src/backend/InvenTree/locale/ko/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/ko/LC_MESSAGES/django.po
index 8a9b7e84a0..0b32f2cb32 100644
--- a/src/backend/InvenTree/locale/ko/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/ko/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Korean\n"
"Language: ko_KR\n"
@@ -109,9 +109,9 @@ msgstr "잘못된 소수 값"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "메모"
@@ -550,13 +550,13 @@ msgstr "주문 상태"
msgid "Parent Build"
msgstr "직상위 빌드"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "변형(Variant) 포함"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "미결 주문"
msgid "Allocated"
msgstr "할당됨"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "소모됨"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "사용 가능"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "주문 중"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr "빌드를 찾을 수 없습니다"
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "작업 지시서"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "위치"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr "산출물"
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr "산출물 재고 항목 ID로 필터링합니다. 설치되지 않은 빌드 항목을 찾으려면 'null'을 사용하세요."
@@ -1830,7 +1830,7 @@ msgstr "정의"
msgid "Unit definition"
msgstr "단위 정의"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "첨부파일"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr "업무 로직에서 이 사용자 정의 상태와 동일한 상태 논리 키"
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "값"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr "바코드 스캔의 응답 데이터"
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "결과"
@@ -2673,8 +2673,8 @@ msgstr "환율을 업데이트하는 주기(0으로 설정하면 비활성화)"
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "일"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "재고가 없는 재고 항목을 재고 위치 간에 이동할 수 있도록 허용합니다"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "작업 지시서 참조번호 패턴"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "작업 지시서 참조번호 필드를 생성하기 위한 필수 패턴"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "책임자 필수"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "각 주문에는 책임자가 지정되어야 합니다"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr "활성 부품 필수"
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr "비활성 부품에 대해 작업 지시서 생성을 방지합니다"
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr "잠긴 부품 필수"
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr "잠기지 않은 부품에 대해 작업 지시서 생성을 방지합니다"
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr "유효한 BOM 필수"
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr "BOM이 검증되지 않으면 작업 지시서 생성을 방지합니다"
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr "하위 주문 종료 필수"
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr "모든 하위 주문이 종료될 때까지 작업 지시서 완료를 방지합니다"
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr "외주 생산 작업 지시서"
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr "외주 생산 작업 지시서 기능 사용"
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "테스트 통과 전까지 차단"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "필수 테스트가 모두 통과될 때까지 생산 완제품 완료를 방지합니다"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "반품 주문 사용"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "사용자 인터페이스에서 반품 주문 기능을 사용합니다"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "반품 주문 참조 패턴"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "반품 주문 참조 필드를 생성하기 위한 필수 패턴"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "완료된 반품 주문 편집"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "반품 주문이 완료된 후에도 편집을 허용합니다"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "판매 주문 참조 패턴"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "판매 주문 참조 필드를 생성하기 위한 필수 패턴"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "판매 주문 기본 배송"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "판매 주문과 함께 기본 배송 생성 사용"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "완료된 판매 주문 편집"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "판매 주문이 배송되었거나 완료된 후에도 편집을 허용합니다"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr "배송 확인 필요"
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr "항목이 확인될 때까지 배송 완료를 방지합니다"
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "배송된 주문을 완료로 표시"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "\"배송됨\" 상태를 건너뛰고, 배송된 것으로 표시된 판매 주문을 자동으로 완료 처리합니다"
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "구매 주문 참조 패턴"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "구매 주문 참조 필드를 생성하기 위한 필수 패턴"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "완료된 구매 주문 편집"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "구매 주문이 배송되었거나 완료된 후에도 편집을 허용합니다"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr "통화 변환"
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr "재고 수령 시 항목 값을 기준 통화로 변환합니다"
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "구매 주문 자동 완료"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "모든 라인 항목을 수령하면 구매 주문을 자동으로 완료로 표시합니다"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "비밀번호 찾기 사용"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "로그인 페이지에서 비밀번호 찾기 기능을 사용합니다"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "회원가입 사용"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "로그인 페이지에서 사용자 자기 등록(회원가입)을 사용합니다"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "SSO 사용"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "로그인 페이지에서 SSO를 사용합니다"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "SSO 등록 사용"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "로그인 페이지에서 SSO를 통한 자기 등록(회원가입)을 사용합니다"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "SSO 그룹 동기화 사용"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "IdP에서 제공하는 그룹과 InvenTree 그룹의 동기화를 사용합니다"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "SSO 그룹 키"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr "IdP에서 제공하는 groups 클레임 속성의 이름"
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr "SSO 그룹 매핑"
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr "SSO 그룹을 로컬 InvenTree 그룹으로 매핑합니다. 로컬 그룹이 없으면 생성됩니다."
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr "SSO 외부 그룹 제거"
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr "IdP에서 제공되지 않는 그룹이 사용자에게 할당되어 있으면 제거할지 여부입니다. 이 설정을 비활성화하면 보안 문제가 발생할 수 있습니다"
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "이메일 필수"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "회원가입 시 이메일 입력을 요구합니다"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "SSO 사용자 자동 입력"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "SSO 계정 데이터에서 사용자 상세 정보를 자동으로 채웁니다"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "이메일 2회 입력"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "회원가입 시 이메일을 두 번 입력하도록 요청합니다"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "비밀번호 2회 입력"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "회원가입 시 비밀번호를 두 번 입력하도록 요청합니다"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "허용된 도메인"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "특정 도메인으로 회원가입을 제한합니다(쉼표로 구분, @로 시작)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "회원가입 시 그룹"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr "등록 시 새 사용자가 할당될 그룹입니다. SSO 그룹 동기화가 활성화된 경우, IdP에서 그룹을 할당할 수 없을 때만 이 그룹이 설정됩니다."
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "MFA 강제"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "사용자는 다중 요소 보안을 사용해야 합니다."
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr "이 설정을 활성화하면 모든 사용자가 다중 요소 인증을 설정해야 합니다. 모든 세션이 즉시 연결 해제됩니다."
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "시작 시 플러그인 확인"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "시작 시 모든 플러그인이 설치되어 있는지 확인합니다(컨테이너 환경에서 사용)"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "플러그인 업데이트 확인"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "설치된 플러그인의 업데이트를 주기적으로 확인합니다"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "URL 통합 사용"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "플러그인이 URL 라우트를 추가할 수 있도록 허용합니다"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "내비게이션 통합 사용"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "플러그인이 내비게이션에 통합될 수 있도록 허용합니다"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "앱 통합 사용"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "플러그인이 앱을 추가할 수 있도록 허용합니다"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "스케줄 통합 사용"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "플러그인이 예약 작업을 실행할 수 있도록 허용합니다"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "이벤트 통합 사용"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "플러그인이 내부 이벤트에 응답할 수 있도록 허용합니다"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "인터페이스 통합 사용"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "플러그인이 사용자 인터페이스에 통합될 수 있도록 허용합니다"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr "메일 통합 사용"
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr "플러그인이 발신/수신 메일을 처리할 수 있도록 허용합니다"
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr "프로젝트 코드 사용"
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr "프로젝트를 추적하기 위한 프로젝트 코드를 사용합니다"
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr "재고 실사 사용"
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr "과거 재고 수준과 가치를 기록하는 기능을 사용합니다"
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "외부 위치 제외"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr "외부 위치의 재고 품목을 재고 실사 계산에서 제외합니다"
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "자동 재고 실사 주기"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr "자동 재고 실사 기록 간격(일)"
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr "오래된 재고 실사 항목 삭제"
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr "지정된 일수보다 오래된 재고 실사 항목을 삭제합니다"
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr "재고 실사 삭제 간격"
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr "재고 실사 항목은 지정된 일수 후 삭제됩니다"
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr "오래된 재고 추적 항목 삭제"
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr "지정된 일수보다 오래된 재고 추적 항목을 삭제합니다"
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr "재고 추적 삭제 간격"
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr "재고 추적 항목은 지정된 일수 후 삭제됩니다"
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "사용자 전체 이름 표시"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "사용자 이름 대신 사용자 전체 이름을 표시합니다"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr "사용자 프로필 표시"
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr "프로필 페이지에 사용자 프로필을 표시합니다"
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "테스트 스테이션 데이터 사용"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "테스트 결과를 위한 테스트 스테이션 데이터 수집을 사용합니다"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr "장비 핑 사용"
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr "등록된 장비의 상태를 확인하기 위해 주기적으로 핑 작업을 수행합니다"
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr "재고 조사 시점의 사용 가능한 총 재고"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "날짜"
@@ -8084,77 +8092,77 @@ msgstr "TME 바코드 스캔을 지원합니다"
msgid "The Supplier which acts as 'TME'"
msgstr "'TME' 역할을 하는 공급업체"
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr "슈퍼유저 계정만 플러그인을 관리할 수 있습니다"
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr "플러그인 설치가 비활성화되어 있습니다"
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr "설치할 패키지 이름 또는 URL이 제공되지 않았습니다"
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr "패키지 이름 또는 URL에 잘못된 문자가 있습니다"
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "플러그인을 성공적으로 설치했습니다"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "플러그인을 {path}에 설치했습니다"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr "레지스트리에서 플러그인을 찾을 수 없습니다"
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr "플러그인이 패키지 플러그인이 아닙니다"
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr "플러그인 패키지 이름을 찾을 수 없습니다"
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr "스태프 사용자만 플러그인을 관리할 수 있습니다"
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr "플러그인 제거가 비활성화되어 있습니다"
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr "플러그인이 현재 활성 상태이므로 제거할 수 없습니다"
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr "플러그인이 필수이므로 제거할 수 없습니다"
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr "플러그인이 샘플 플러그인이므로 제거할 수 없습니다"
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr "플러그인이 내장 플러그인이므로 제거할 수 없습니다"
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr "플러그인이 설치되어 있지 않습니다"
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr "플러그인 설치 정보를 찾을 수 없습니다"
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr "플러그인을 성공적으로 제거했습니다"
@@ -8206,21 +8214,21 @@ msgstr "패키지 플러그인"
msgid "Plugin"
msgstr "플러그인"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "작성자를 찾을 수 없습니다"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "플러그인 '{p}'은(는) 현재 InvenTree 버전 {v}와 호환되지 않습니다"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "플러그인은 최소 버전 {v}가 필요합니다"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "플러그인은 최대 버전 {v}까지 지원합니다"
@@ -9218,7 +9226,7 @@ msgstr "수량이 시리얼 번호와 일치하지 않습니다"
msgid "Cannot assign stock to structural location"
msgstr "구조적 위치에 재고를 할당할 수 없습니다"
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr "테스트 템플릿이 존재하지 않습니다"
@@ -9238,7 +9246,7 @@ msgstr "재고 품목에 다른 품목이 포함되어 있습니다"
msgid "Stock item has been assigned to a customer"
msgstr "재고 품목이 고객에게 할당되었습니다"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "재고 품목이 현재 생산 중입니다"
@@ -9262,71 +9270,71 @@ msgstr "재고 항목은 동일한 공급업체 부품을 참조해야 합니다
msgid "Stock status codes must match"
msgstr "재고 상태 코드는 일치해야 합니다"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "재고에 없으므로 재고 항목을 이동할 수 없습니다"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr "재고 항목 추적"
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "항목 메모"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr "재고 항목 테스트 결과"
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "이 테스트에는 값을 제공해야 합니다"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "이 테스트에는 첨부 파일을 업로드해야 합니다"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr "이 테스트의 값이 올바르지 않습니다"
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "테스트 결과"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "테스트 출력 값"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "테스트 결과 첨부 파일"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "테스트 메모"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr "테스트 스테이션"
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr "테스트가 수행된 테스트 스테이션의 식별자"
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr "시작됨"
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr "테스트 시작 시각"
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr "완료됨"
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr "테스트 종료 시각"
@@ -9440,8 +9448,8 @@ msgstr "재고 항목이 제공되지 않았습니다"
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "수량은 사용 가능한 재고 수량({q})을(를) 초과할 수 없습니다"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "대상 재고 위치"
@@ -9565,7 +9573,7 @@ msgstr "선택한 회사는 고객이 아닙니다"
msgid "Stock assignment notes"
msgstr "재고 할당 메모"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "재고 항목 목록을 제공해야 합니다"
@@ -9613,27 +9621,31 @@ msgstr "재고 항목이 이미 재고에 있습니다"
msgid "Quantity must not be negative"
msgstr "수량은 음수일 수 없습니다"
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "재고 거래 메모"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr "기존 재고로 병합"
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "재고 거래 메모"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr "가능하면 반품된 항목을 기존 재고 항목에 병합합니다"
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr "다음 일련 번호"
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr "이전 일련 번호"
diff --git a/src/backend/InvenTree/locale/lt/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/lt/LC_MESSAGES/django.po
index 5aa37f323a..e1487a2ee8 100644
--- a/src/backend/InvenTree/locale/lt/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/lt/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Lithuanian\n"
"Language: lt_LT\n"
@@ -109,9 +109,9 @@ msgstr "Neteisinga dešimtainė reikšmė"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Pastabos"
@@ -550,13 +550,13 @@ msgstr "Užsakymo būsena"
msgid "Parent Build"
msgstr "Pirminė gamyba"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "Įtraukti variantus"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "Liko neįvykdytų užsakymų"
msgid "Allocated"
msgstr "Priskirta"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Prieinama"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "Užsakyta"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Gamybos užsakymas"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Vieta"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr "Apibrėžimas"
msgid "Unit definition"
msgstr "Vieneto apibrėžimas"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Priedas"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr "Loginis būsenos raktas, atitinkantis šią pasirinkitinę būseną"
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Reikšmė"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr "Atsako duomenys iš brūkšninio kodo nuskaitymo"
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Rezultatas"
@@ -2673,8 +2673,8 @@ msgstr "Kaip dažnai atnaujinti valiutų kursus (nulis – išjungti)"
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "dienos"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "Leisti perkelti atsargas tarp vietų net jei jų nėra atsargose"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "Gamybos užsakymo nuorodos šablonas"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Privalomas šablonas gamybos užsakymo nuorodos laukui generuoti"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "Reikalauti atsakingo savininko"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "Kiekvienam užsakymui turi būti priskirtas atsakingas savininkas"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr "Reikalauti aktyvios detalės"
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr "Neleidžia kurti gamybos užsakymų neaktyvioms detalėms"
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr "Reikalauti užrakintos detalės"
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr "Neleidžia kurti gamybos užsakymų neužrakintoms detalėms"
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr "Reikalauti galiojančio komplektavimo sąrašo (BOM)"
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr "Neleidžia kurti gamybos užsakymų, kol BOM nėra patvirtintas"
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr "Reikalauti uždarytų antrinių užsakymų"
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr "Neleidžia užbaigti gamybos užsakymo, kol visi antriniai užsakymai neuždaryti"
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "Blokuoti, kol testai bus išlaikyti"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "Neleidžia užbaigti gaminių, kol visi privalomi testai nėra išlaikyti"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "Įjungti grąžinimo užsakymus"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "Įjungia grąžinimo užsakymų funkciją vartotojo sąsajoje"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "Grąžinimo užsakymo nuorodos šablonas"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "Būtinas šablonas grąžinimo užsakymo nuorodos laukui generuoti"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "Redaguoti užbaigtus grąžinimo užsakymus"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "Leisti redaguoti grąžinimo užsakymus po jų užbaigimo"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "Pardavimo užsakymo nuorodos šablonas"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "Būtinas šablonas pardavimo užsakymo nuorodos laukui generuoti"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "Numatytasis siuntinys pardavimo užsakymui"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "Leisti automatiškai sukurti siuntinį kartu su pardavimo užsakymu"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "Redaguoti užbaigtus pardavimo užsakymus"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "Leisti redaguoti pardavimo užsakymus po jų išsiuntimo arba užbaigimo"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "Pažymėti išsiųstus užsakymus kaip užbaigtus"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "Pardavimo užsakymai, pažymėti kaip išsiųsti, bus automatiškai užbaigti, praleidžiant būseną „išsiųsta“"
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "Pirkimo užsakymo nuorodos šablonas"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "Būtinas šablonas pirkimo užsakymo nuorodos laukui generuoti"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "Redaguoti užbaigtus pirkimo užsakymus"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "Leisti redaguoti pirkimo užsakymus po jų išsiuntimo arba užbaigimo"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr "Konvertuoti valiutą"
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr "Konvertuoti prekių vertę į pagrindinę valiutą priimant prekes"
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Automatiškai užbaigti pirkimo užsakymus"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "Automatiškai pažymėti pirkimo užsakymus kaip užbaigtus, kai visos eilutės yra gautos"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Įjungti pamiršto slaptažodžio funkciją"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Leisti naudoti pamiršto slaptažodžio funkciją prisijungimo puslapyje"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Įjungti registraciją"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Leisti vartotojams savarankiškai registruotis prisijungimo puslapyje"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "Įjungti vieningą prisijungimą (SSO)"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "Įjungti vieningą prisijungimą (SSO) prisijungimo puslapyje"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "Įjungti registraciją per SSO"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Leisti vartotojams registruotis per SSO prisijungimo puslapyje"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "Įjungti SSO grupių sinchronizavimą"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "Įjungti InvenTree grupių sinchronizavimą su tapatybės tiekėjo (IdP) grupėmis"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "SSO grupės raktas"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr "Grupių atributo pavadinimas, kurį pateikia tapatybės tiekėjas (IdP)"
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr "SSO grupių susiejimas"
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr "SSO grupių susiejimas su vietinėmis InvenTree grupėmis. Jei vietinė grupė neegzistuoja, ji bus sukurta."
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr "Pašalinti grupes, nepriklausančias SSO"
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr "Ar pašalinti vartotojui priskirtas grupes, jei jos nėra pateikiamos per IdP. Išjungus gali kilti saugumo problemų"
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "El. paštas privalomas"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "Reikalauti vartotojo el. pašto registracijos metu"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "Automatiškai užpildyti SSO naudotojų duomenis"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Automatiškai užpildyti vartotojo informaciją pagal SSO paskyros duomenis"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "Įvesti el. paštą du kartus"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "Registracijos metu prašyti vartotojų du kartus įvesti el. paštą"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Įvesti slaptažodį du kartus"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "Registracijos metu prašyti vartotojų du kartus įvesti slaptažodį"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Leidžiami domenai"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "Riboti registraciją tik tam tikriems domenams (atskiriama kableliais, prasideda @)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Grupė registruojantis"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr "Grupė, į kurią priskiriami nauji vartotojai registracijos metu. Jei įjungta SSO grupių sinchronizacija, ši grupė nustatoma tik tuo atveju, jei grupė negaunama iš IdP."
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "Reikalauti kelių veiksnių autentifikacijos (MFA)"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "Vartotojai privalo naudoti kelių veiksnių apsaugą."
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Tikrinti įskiepius paleidimo metu"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "Tikrina, ar visi įskiepiai įdiegti paleidžiant – naudoti konteinerių aplinkose"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "Tikrinti įskiepių atnaujinimus"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "Įjungti periodinius įdiegtų įskiepių atnaujinimų tikrinimus"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "Įjungti URL integravimą"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "Leisti įskiepiams pridėti URL maršrutus"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "Įjungti navigacijos integraciją"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "Leisti įskiepiams integruotis į navigaciją"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "Įjungti programų integraciją"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "Leisti įskiepiams pridėti programas"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "Įjungti planavimo integraciją"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Leisti įskiepiams vykdyti suplanuotas užduotis"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "Įjungti įvykių integraciją"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "Leisti įskiepiams reaguoti į vidinius įvykius"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "Įjungti sąsajos integraciją"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "Leisti įskiepiams integruotis į vartotojo sąsają"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr "Įjungti projektų kodus"
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr "Įjungti projektų kodų naudojimą projektų sekimui"
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "Neįtraukti išorinių vietų"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "Automatinės inventorizacijos periodas"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "Rodyti pilnus vartotojų vardus"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Rodyti pilnus vardus vietoj vartotojo vardų"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr "Rodyti vartotojų profilius"
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr "Rodyti vartotojų profilius jų paskyros puslapyje"
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "Įjungti bandymų stoties duomenis"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "Įjungti bandymų stoties duomenų rinkimą testų rezultatams"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr "Bendras prieinamas atsargų kiekis inventorizacijos metu"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Data"
@@ -8084,77 +8092,77 @@ msgstr "Suteikia palaikymą TME brūkšninių kodų nuskaitymui"
msgid "The Supplier which acts as 'TME'"
msgstr "Tiekėjas, veikiantis kaip 'TME'"
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr "Įskiepių diegimas išjungtas"
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "Įskiepis sėkmingai įdiegtas"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "Įskiepis įdiegtas į {path}"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr "Įskiepis neaptiktas registre"
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr "Įskiepis nėra supakuotas įskiepis"
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr "Įskiepio paketo pavadinimas nerastas"
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr "Tik personalo vartotojai gali tvarkyti įskiepius"
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr "Įskiepių šalinimas išjungtas"
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr "Įskiepis negali būti pašalintas, nes šiuo metu yra aktyvus"
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr "Įskiepis neįdiegtas"
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr "Įskiepio diegimas nerastas"
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr "Įskiepis sėkmingai pašalintas"
@@ -8206,21 +8214,21 @@ msgstr "Pakuotės įskiepis"
msgid "Plugin"
msgstr "Įskiepis"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "Autorius nerastas"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "Įskiepis '{p}' nesuderinamas su dabartine InvenTree versija {v}"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "Įskiepiui reikalinga bent versija {v}"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "Įskiepiui reikalinga ne aukštesnė nei versija {v}"
@@ -9218,7 +9226,7 @@ msgstr "Kiekis nesutampa su serijos numeriais"
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr "Bandomasis šablonas neegzistuoja"
@@ -9238,7 +9246,7 @@ msgstr "Atsargų elementas turi kitų elementų"
msgid "Stock item has been assigned to a customer"
msgstr "Atsargų elementas buvo priskirtas klientui"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "Atsargų elementas šiuo metu gaminamas"
@@ -9262,71 +9270,71 @@ msgstr "Atsargų elementai turi būti susiję su ta pačia tiekėjo detale"
msgid "Stock status codes must match"
msgstr "Atsargų būsenos kodai turi sutapti"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "Atsargų elemento negalima perkelti, nes jo nėra sandėlyje"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr "Atsargų elemento sekimas"
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Įrašo pastabos"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr "Atsargų elemento bandymo rezultatas"
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Šiam bandymui turi būti pateikta reikšmė"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "Šiam bandymui turi būti įkeltas priedas"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr "Netinkama reikšmė šiam bandymui"
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Bandymo rezultatas"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "Bandymo išvesties reikšmė"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "Bandymo rezultato priedas"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "Bandymo pastabos"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr "Bandymų stotis"
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr "Bandymų stoties identifikatorius, kurioje atliktas bandymas"
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr "Pradėta"
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr "Bandymo pradžios laiko žyma"
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr "Pabaigta"
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr "Bandymo pabaigos laiko žyma"
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "Kiekis negali viršyti galimų atsargų kiekio ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "Paskirties atsargų vieta"
@@ -9565,7 +9573,7 @@ msgstr "Pasirinkta įmonė nėra klientas"
msgid "Stock assignment notes"
msgstr "Atsargų priskyrimo pastabos"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "Turi būti pateiktas atsargų elementų sąrašas"
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "Atsargų operacijos pastabos"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "Atsargų operacijos pastabos"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr "Kitas serijos numeris"
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr "Ankstesnis serijos numeris"
diff --git a/src/backend/InvenTree/locale/lv/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/lv/LC_MESSAGES/django.po
index ec7a5c0613..64fe7515ed 100644
--- a/src/backend/InvenTree/locale/lv/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/lv/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Latvian\n"
"Language: lv_LV\n"
@@ -109,9 +109,9 @@ msgstr ""
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Piezīmes"
@@ -550,13 +550,13 @@ msgstr ""
msgid "Parent Build"
msgstr ""
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr ""
msgid "Allocated"
msgstr ""
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr ""
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr ""
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr ""
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr ""
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr ""
msgid "Unit definition"
msgstr ""
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr ""
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr ""
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr ""
@@ -2673,8 +2673,8 @@ msgstr ""
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr ""
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr ""
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr ""
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr ""
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr ""
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr ""
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr ""
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr ""
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr ""
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr ""
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr ""
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr ""
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr ""
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr ""
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr ""
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr ""
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr ""
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr ""
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr ""
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr ""
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr ""
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr ""
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr ""
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr ""
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr ""
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr ""
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr ""
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr ""
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr ""
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr ""
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr ""
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9262,71 +9270,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr ""
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr ""
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr ""
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr ""
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9565,7 +9573,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/nl/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/nl/LC_MESSAGES/django.po
index 867b17aaec..91fe4c7168 100644
--- a/src/backend/InvenTree/locale/nl/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/nl/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Dutch\n"
"Language: nl_NL\n"
@@ -109,9 +109,9 @@ msgstr "Ongeldige decimale waarde"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Opmerkingen"
@@ -550,13 +550,13 @@ msgstr "Status van bestelling"
msgid "Parent Build"
msgstr "Bovenliggende Productie"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "Inclusief varianten"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "Openstaande order"
msgid "Allocated"
msgstr "Toegewezen"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "Verbruikt"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Beschikbaar"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "In bestelling"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr "Build niet gevonden"
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Productieorder"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Locatie"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr "Uitvoer"
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr "Filter op uitvoer standaard item ID. Gebruik 'null' om niet geïnstalleerde build items te vinden."
@@ -1830,7 +1830,7 @@ msgstr "Definitie"
msgid "Unit definition"
msgstr "Definitie van eenheid"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Bijlage"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr "Staat logische sleutel die gelijk is aan deze staat in zakelijke logica"
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Waarde"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr "Reactiegegevens van de barcode scan"
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Resultaat"
@@ -2673,8 +2673,8 @@ msgstr "Hoe vaak te controleren op updates (nul om uit te schakelen)"
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "dagen"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "Toestaan dat voorraadartikelen die niet op voorraad zijn worden overgebracht tussen voorraadlocaties"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "Productieorderreferentiepatroon"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Vereist patroon voor het genereren van het Bouworderreferentieveld"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "Vereis verantwoordelijke eigenaar"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "Een verantwoordelijke eigenaar moet worden toegewezen aan elke bestelling"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr "Vereist een actief onderdeel"
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr "Voorkom het maken van orders voor inactieve onderdelen"
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr "Vergrendeld onderdeel vereisen"
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr "Voorkom het maken van orders voor ontgrendelde onderdelen"
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr "Vereist een geldige BOM"
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr "Voorkom het creëren van bouworders tenzij BOM is gevalideerd"
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr "Onderliggende bestellingen vereist"
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr "Voorkom voltooiing van de bouw tot alle sub orders gesloten zijn"
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr "Externe Bouw Orders"
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr "Inschakelen externe build order functionaliteit"
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "Blokkeren tot test geslaagd"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "Voorkom dat de bouw van de uitvoer wordt voltooid totdat alle vereiste testen zijn geslaagd"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "Retourorders inschakelen"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "Retourorder functionaliteit inschakelen in de gebruikersinterface"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "Retourorder referentie patroon"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "Verplicht patroon voor het genereren van Retourorder referentie veld"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "Bewerk voltooide retourorders"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "Bewerken van retourorders toestaan nadat deze zijn voltooid"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "Verkooporderreferentiepatroon"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "Vereist patroon voor het genereren van het Verkooporderreferentieveld"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "Standaard Verzending Verkooporder"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "Aanmaken standaard verzending bij verkooporders inschakelen"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "Bewerk voltooide verkooporders"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "Bewerken van verkooporders toestaan nadat deze zijn verzonden of voltooid"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr "Zending moet gecontroleerd worden"
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr "Voorkom voltooiing van verzendingen totdat items zijn gecontroleerd"
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "Verstuurde bestellingen markeren als voltooid"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "Verkooporders gemarkeerd als verzonden zullen automatisch worden voltooid, zonder de status \"verzonden\""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "Inkooporderreferentiepatroon"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "Vereist patroon voor het genereren van het Inkooporderreferentieveld"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "Bewerk voltooide verkooporders"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "Bewerken van inkooporders toestaan nadat deze zijn verzonden of voltooid"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr "Valuta converteren"
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr "Verander artikelwaarde naar basisvaluta bij het ontvangen van voorraad"
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Inkooporders automatisch voltooien"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "Markeer orders automatisch als voltooid wanneer alle regelitems worden ontvangen"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Wachtwoord vergeten functie inschakelen"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Wachtwoord vergeten functie inschakelen op de inlogpagina's"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Registratie inschakelen"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Zelfregistratie voor gebruikers op de inlogpagina's inschakelen"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "SSO inschakelen"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "SSO inschakelen op de inlogpagina's"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "Schakel gebruikersregistratie met SSO in"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Zelfregistratie voor gebruikers middels SSO op de inlogpagina's inschakelen"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "SSO-groep synchroniseren inschakelen"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "Inschakelen van het synchroniseren van InvenTree groepen met groepen geboden door de IdP"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "SSO groep sleutel"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr "De naam van de groepen claim attribuut van de IdP"
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr "SSO groep kaart"
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr "Een mapping van SSO-groepen naar lokale InvenTree groepen. Als de lokale groep niet bestaat, zal deze worden aangemaakt."
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr "Verwijder groepen buiten SSO"
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr "Of groepen die zijn toegewezen aan de gebruiker moeten worden verwijderd als ze geen backend zijn door de IdP. Het uitschakelen van deze instelling kan beveiligingsproblemen veroorzaken"
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "E-mailadres verplicht"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "Vereis gebruiker om e-mailadres te registreren bij aanmelding"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "SSO-gebruikers automatisch invullen"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Gebruikersdetails van SSO-accountgegevens automatisch invullen"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "E-mail twee keer"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "Bij inschrijving gebruikers twee keer om hun e-mail vragen"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Wachtwoord tweemaal"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "Laat gebruikers twee keer om hun wachtwoord vragen tijdens het aanmelden"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Toegestane domeinen"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "Inschrijven beperken tot bepaalde domeinen (komma-gescheiden, beginnend met @)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Groep bij aanmelding"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr "Groep waaraan nieuwe gebruikers zijn toegewezen op registratie. Als SSO-groepssynchronisatie is ingeschakeld, is deze groep alleen ingesteld als er geen groep vanuit de IdP kan worden toegewezen."
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "MFA afdwingen"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "Gebruikers moeten multifactor-beveiliging gebruiken."
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr "Het inschakelen van deze instelling zal ervoor zorgen dat alle gebruikers multifactor authenticatie instellen. Alle sessies worden onmiddellijk verbroken."
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Controleer plugins bij het opstarten"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "Controleer of alle plug-ins zijn geïnstalleerd bij het opstarten - inschakelen in container-omgevingen"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "Controleren op plug-in updates"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "Schakel periodieke controles voor updates voor geïnstalleerde plug-ins in"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "Activeer URL-integratie"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "Plugins toestaan om URL-routes toe te voegen"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "Activeer navigatie integratie"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "Plugins toestaan om te integreren in navigatie"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "Activeer app integratie"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "Activeer plug-ins om apps toe te voegen"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "Activeer planning integratie"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Activeer plugin om periodiek taken uit te voeren"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "Activeer evenement integratie"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "Activeer plugin om op interne evenementen te reageren"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "Interface integratie activeren"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "Plug-ins inschakelen om te integreren in de gebruikersinterface"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr "E-mail integratie inschakelen"
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr "Schakel plug-ins in om uitgaande / inkomende mails te verwerken"
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr "Activeer project codes"
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr "Schakel projectcodes in voor het bijhouden van projecten"
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr "Voorraadcontrole inschakelen"
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr "Functionaliteit voor het opnemen van historische voorraadniveaus en -waarde inschakelen"
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "Externe locaties uitsluiten"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr "Voorraadartikelen op externe locaties uitsluiten van voorraadberekeningen"
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "Automatische Voorraadcontrole Periode"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr "Aantal dagen tussen automatische voorraadgegevens opnemen"
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr "Oude voorraadgegevens verwijderen"
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr "Voorraadgegevens verwijderen die ouder zijn dan het opgegeven aantal dagen"
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr "Interval Voorraadgegevens verwijderen"
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr "Voorraadgegevens zal worden verwijderd na het opgegeven aantal dagen"
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr "Oude voorraadgegevens verwijderen"
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr "Inverval voor verwijderen van voorraadtracking"
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "Gebruikers volledige namen weergeven"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Laat gebruikers volledige namen zien in plaats van gebruikersnamen"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr "Gebruikersprofielen tonen"
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr "Toon gebruikersprofielen op hun profielpagina"
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr "De week begint op"
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr "Eerste dat van de week, voor in de kalenderweergaven"
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr "Zondag"
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr "Maandag"
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr "Dinsdag"
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr "woensdag"
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr "Donderdag"
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr "Vrijdag"
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr "Zaterdag"
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr "maanden"
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "Inschakelen van teststation data"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "Schakel teststation gegevensverzameling in voor testresultaten"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr "Machine Ping inschakelen"
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr "Schakel periodieke ping taak van geregistreerde machines in om hun status te controleren"
@@ -6644,7 +6652,7 @@ msgid "Total available stock at time of stocktake"
msgstr "Totale voorraad op het moment van voorraadcontrole"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Datum"
@@ -8085,77 +8093,77 @@ msgstr "Biedt ondersteuning voor het scannen van TME barcodes "
msgid "The Supplier which acts as 'TME'"
msgstr "De leverancier die als \"TME” optreedt "
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr "Plug-in installatie is uitgeschakeld"
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "Plug-in succesvol geïnstalleerd"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "Plug-in geïnstalleerd in {path}"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr "De plug-in is niet gevonden in het register"
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr "De plug-in is geen verpakte plug-in"
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr "Naam van plug-in pakket niet gevonden"
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr "Alleen medewerker gebruikers kunnen plug-ins beheren"
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr "Verwijderen van plug-in is uitgeschakeld"
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr "De plug-in kan niet worden verwijderd omdat deze momenteel actief is"
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr "De plug-in kan niet gedeïnstalleerd worden omdat deze verplicht is"
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr "De plug-in kan niet worden gedeïnstalleerd omdat het een voorbeeld plug-in is"
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr "De plug-in kan niet worden gedeïnstalleerd omdat het een ingebouwde plug-in is"
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr "De plug-in is niet geïnstalleerd"
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr "Plug-in installatie niet gevonden"
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr "Deïnstalleerde plug-in succesvol"
@@ -8207,21 +8215,21 @@ msgstr "Pakket plug-in"
msgid "Plugin"
msgstr "Plug-in"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "Geen auteur gevonden"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "De plug-in '{p}' is niet compatibel met de huidige InvenTree versie {v}"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "De plug-in vereist minimaal versie {v}"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "Plug-in vereist op de hoogste versie {v}"
@@ -9219,7 +9227,7 @@ msgstr "Hoeveelheid komt niet overeen met serienummers"
msgid "Cannot assign stock to structural location"
msgstr "Kan voorraad niet toewijzen aan structurele locatie"
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr "Testsjabloon bestaat niet"
@@ -9239,7 +9247,7 @@ msgstr "Voorraadartikel bevat andere producten"
msgid "Stock item has been assigned to a customer"
msgstr "Voorraadartikel is aan een klant toegewezen"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "Voorraad item is momenteel in productie"
@@ -9263,71 +9271,71 @@ msgstr "Voorraadartikelen moeten verwijzen naar dezelfde leveranciersdeel"
msgid "Stock status codes must match"
msgstr "De voorraad statuscodes moeten overeenkomen"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "Voorraadartikel kan niet worden verplaatst omdat het niet op voorraad is"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr "Voorraad item volgen"
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Item notities"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr "Resultaat voorraad test resultaten"
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Waarde moet voor deze test worden opgegeven"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "Bijlage moet worden geüpload voor deze test"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr "Ongeldige waarde voor deze test"
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Test resultaat"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "Test uitvoer waarde"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "Test resultaat bijlage"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "Test notities"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr "Test station"
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr "De identificatie van het teststation waar de test werd uitgevoerd"
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr "Gestart"
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr "Het tijdstip van de start test"
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr "Afgerond"
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr "Het tijdstip van de afgeronde test"
@@ -9441,8 +9449,8 @@ msgstr "Geen voorraad item opgegeven"
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "Hoeveelheid mag niet hoger zijn dan de beschikbare voorraad ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "Locatie van bestemming"
@@ -9566,7 +9574,7 @@ msgstr "Geselecteerde bedrijf is geen klant"
msgid "Stock assignment notes"
msgstr "Voorraad toewijzing notities"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "Een lijst met voorraad artikelen moet worden opgegeven"
@@ -9614,27 +9622,31 @@ msgstr "Voorraad artikel is al in voorraad"
msgid "Quantity must not be negative"
msgstr "Hoeveelheid mag niet negatief zijn"
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "Voorraad transactie notities"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr "Samenvoegen in bestaande voorraad"
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "Voorraad transactie notities"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr "Voeg indien mogelijk geretourneerde items samen in bestaande voorraad"
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr "Volgend serienummer"
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr "Vorig serienummer"
diff --git a/src/backend/InvenTree/locale/no/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/no/LC_MESSAGES/django.po
index 438a19ca1c..4d6f3dd788 100644
--- a/src/backend/InvenTree/locale/no/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/no/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Norwegian\n"
"Language: no_NO\n"
@@ -109,9 +109,9 @@ msgstr ""
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Notater"
@@ -550,13 +550,13 @@ msgstr "Ordrestatus"
msgid "Parent Build"
msgstr "Overordnet produksjon"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr ""
msgid "Allocated"
msgstr "Tildelt"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Tilgjengelig"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "I bestilling"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Produksjonsordre"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Plassering"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr "Definisjon"
msgid "Unit definition"
msgstr "Enhetsdefinisjon"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Vedlegg"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Verdi"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Resultat"
@@ -2673,8 +2673,8 @@ msgstr "Hvor ofte valutakurser skal oppdateres (sett til null for å deaktiverer
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "dager"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "Produksjonsordre-referansemønster"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Nødvendig mønster for å generere Produksjonsordre-referansefeltet"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "Aktiver returordrer"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "Aktiver returordrefunksjonalitet i brukergrensesnittet"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "Returordre-referansemønster"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "Rediger fullførte returordrer"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "Tillat redigering av returordrer etter de er fullført"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "Salgsordre-referansemønster"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "Påkrevd mønster for å generere salgsordrereferansefelt"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "Salgsordre standard fraktmetode"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "Aktiver opprettelse av standard forsendelse med salgsordrer"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "Rediger fullførte salgsordrer"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "Tillat redigering av salgsordrer etter de har blitt sendt eller fullført"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "Referansemønster for innkjøpsordre"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "Obligatorisk mønster for generering av referansefelt for innkjøpsordre"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "Rediger fullførte innkjøpsordre"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "Tillat redigering av innkjøpsordre etter at de har blitt sendt eller fullført"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Autofullfør innkjøpsordrer"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "Automatisk merk innkjøpsordre som fullført når alle ordrelinjer er mottatt"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Aktiver passord glemt"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Ativer funskjon for glemt passord på innloggingssidene"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Aktiver registrering"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Aktiver egenregistrerting for brukerer på påloggingssidene"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "Aktiver SSO"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "Aktiver SSO på innloggingssidene"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "Aktiver SSO-registrering"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Aktiver selvregistrering via SSO for brukere på innloggingssiden"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "E-postadresse kreves"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "Krevt at brukere angir e-post ved registrering"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "Auto-utfyll SSO-brukere"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Fyll automatisk ut brukeropplysninger fra SSO-kontodata"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "E-post to ganger"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "Spør brukeren om e-post to ganger ved registrering"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Passord to ganger"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "Spør brukeren om passord to ganger ved registrering"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Tillatte domener"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "Begrens registrering til bestemte domener (kommaseparert, begynner med @)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Gruppe ved registrering"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "Krev MFA"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "Brukere må bruke flerfaktorsikkerhet."
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Sjekk utvidelser ved oppstart"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "Sjekk at alle utvidelser er installert ved oppstart - aktiver i containermiljøer"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "Aktiver URL-integrasjon"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "Tillat utvidelser å legge til URL-ruter"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "Aktiver navigasjonsintegrasjon"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "Tillat utvidelser å integrere mot navigasjon"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "Aktiver app-integrasjon"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "Tillat utvidelser å legge til apper"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "Aktiver tidsplanintegrasjon"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Tillat utvidelser å kjøre planlagte oppgaver"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "Aktiver hendelsesintegrasjon"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "Tillat utvidelser å reagere på interne hendelser"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "Ekskluder eksterne plasseringer"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "Automatisk varetellingsperiode"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "Vis brukernes fulle navn"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Vis brukernes fulle navn istedet for brukernavn"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr "Total tilgjengelig lagerbeholdning på tidspunkt for varetelling"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Dato"
@@ -8084,77 +8092,77 @@ msgstr "Gir støtte for å skanne TME-strekkoder"
msgid "The Supplier which acts as 'TME'"
msgstr "Leverandøren som fungerer som \"TME\""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "Installasjon av utvidelse vellykket"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "Installerte utvidelsen til {path}"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr "Utvidelse"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "Ingen forfatter funnet"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "Utvidensen '{p}' er ikke kompatibel med nåværende InvenTree-versjon {v}"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "Utvidelsen krever minst versjon {v}"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "Utvidelsen krever maks versjon {v}"
@@ -9218,7 +9226,7 @@ msgstr "Antallet stemmer ikke overens med serienumrene"
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr "Lagervare inneholder andre artikler"
msgid "Stock item has been assigned to a customer"
msgstr "Lagervare har blitt tildelt til en kunde"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "Lagervare er for tiden i produksjon"
@@ -9262,71 +9270,71 @@ msgstr "Lagervarer må referere til samme leverandørdel"
msgid "Stock status codes must match"
msgstr "Lagerstatuskoder må være like"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "Lagervare kan ikke flyttes fordi den ikke er på lager"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Oppføringsnotater"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Verdi må angis for denne testen"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "Vedlegg må lastes opp for denne testen"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Testresultat"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "Testens verdi"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "Vedlegg til testresultat"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "Testnotater"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "Antall kan ikke overstige tilgjengelig lagerbeholdning ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "Til Lagerplassering"
@@ -9565,7 +9573,7 @@ msgstr "Valgt firma er ikke en kunde"
msgid "Stock assignment notes"
msgstr "Lagervare-tildelignsnotater"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "En liste av lagervarer må oppgis"
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "Lager transaksjonsnotater"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "Lager transaksjonsnotater"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/pl/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/pl/LC_MESSAGES/django.po
index 0b530ebf61..30079e5287 100644
--- a/src/backend/InvenTree/locale/pl/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/pl/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Polish\n"
"Language: pl_PL\n"
@@ -109,9 +109,9 @@ msgstr "Niepoprawna wartość dziesiętna"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Uwagi"
@@ -550,13 +550,13 @@ msgstr "Status zamówienia"
msgid "Parent Build"
msgstr "Budowa nadrzędna"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "Obejmuje warianty"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "Zaległe zamówienie"
msgid "Allocated"
msgstr "Przydzielono"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Dostępne"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "W Zamówieniu"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Zlecenie Budowy"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Lokalizacja"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr "Wyjście"
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr "Definicja"
msgid "Unit definition"
msgstr "Definicja jednostki"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Załącznik"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Wartość"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Wynik"
@@ -2673,8 +2673,8 @@ msgstr "Jak często aktualizować kursy wymiany walut (ustaw zero aby wyłączy
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "dni"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr "Przekonwertuj walutę"
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr "Konwertuj wartość przedmiotu na walutę bazową podczas otrzymywania zapasów"
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Automatycznie wypełniaj zlecenia zakupu"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "Automatycznie oznacz zlecenia jako zakończone po odebraniu wszystkich pozycji"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Włącz opcję zapomnianego hasła"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Włącz funkcję zapomnianego hasła na stronach logowania"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Włącz rejestrację"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Włącz samodzielną rejestrację dla użytkowników na stronach logowania"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "Włącz SSO"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "Włącz SSO na stronach logowania"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "Włącz rejestrację SSO"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Włącz samodzielną rejestrację przez SSO dla użytkowników na stronach logowania"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "Włącz synchronizację grupy SSO"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "Włącz synchronizację grup InvenTree z grupami dostarczonymi przez IdP"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "Adres e-mail jest wymagany"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "Autouzupełnianie użytkowników SSO"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Automatycznie wypełnij dane użytkownika z danych konta SSO"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "E-mail dwa razy"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "Przy rejestracji dwukrotnie zapytaj użytkowników o ich adres e-mail"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Hasło dwukrotnie"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "Przy rejestracji dwukrotnie zapytaj użytkowników o ich hasło"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr ""
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Grupuj przy rejestracji"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "Wymuś MFA"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "Użytkownicy muszą używać zabezpieczeń wieloskładnikowych."
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Sprawdź wtyczki przy starcie"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "Sprawdź dostępność aktualizacji wtyczek"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "Włącz okresowe sprawdzanie aktualizacji zainstalowanych wtyczek"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "Włącz integrację URL"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "Włącz wtyczki, aby dodać ścieżki URL"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "Włącz integrację z aplikacją"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "Włącz wtyczki, aby dodać aplikacje"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Włącz wtyczki, aby uruchamiać zaplanowane zadania"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr "Włącz kody projektów"
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr "Włącz kody projektów do śledzenia projektów"
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr "Włącz funkcjonalność dla zapisywania historycznych poziomów zapasów i wartości"
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr ""
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Data"
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr "Wtyczka"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "Nie znaleziono autora"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9262,71 +9270,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Notatki do wpisu"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Należy podać wartość dla tego testu"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr ""
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Wynik testu"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9565,7 +9573,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/pt/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/pt/LC_MESSAGES/django.po
index cce1b30e52..4fe73003da 100644
--- a/src/backend/InvenTree/locale/pt/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/pt/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Portuguese\n"
"Language: pt_PT\n"
@@ -109,9 +109,9 @@ msgstr ""
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Anotações"
@@ -550,13 +550,13 @@ msgstr "Situação do pedido"
msgid "Parent Build"
msgstr "Produção Progenitor"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr ""
msgid "Allocated"
msgstr "Alocado"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Disponível"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "No pedido"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Ordem de Produção"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Local"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr "Definição"
msgid "Unit definition"
msgstr "Definição de unidade"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Anexo"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Valor"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Resultado"
@@ -2673,8 +2673,8 @@ msgstr "Com que frequência atualizar as taxas de câmbio (defina como zero para
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "dias"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "Permitir que os itens que não estão em estoque sejam transferidos entre locais de estoque"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "Modelo de Referência de Pedidos de Produção"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Modelo necessário para gerar campo de referência do Pedido de Produção"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "Requer Proprietário Responsável"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "Um proprietário responsável deve ser atribuído a cada ordem"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "Bloquear até os Testes serem Aprovados"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "Impedir que as saídas da produção sejam concluídas até que todos os testes sejam aprovados"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "Ativar Pedidos de Devolução"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "Ativar funcionalidade de pedido de retorno na interface do usuário"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "Modelo de Referência de Pedidos de Devolução"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "Editar os Pedidos de Devolução Concluídos"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "Permitir a edição de pedidos de devolução após serem enviados ou concluídos"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "Modelo de Referência de Pedidos de Venda"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "Modelo necessário para gerar campo de referência do Pedido de Venda"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "Envio Padrão de Pedidos de Venda"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "Habilitar criação de envio padrão com Pedidos de Vendas"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "Editar os Pedidos de Vendas concluídos"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "Permitir a edição de pedidos de vendas após serem enviados ou concluídos"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "Modelo de Referência de Pedidos de Compras"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "Modelo necessário para gerar campo de referência do Pedido de Compra"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "Editar Pedidos de Compra Concluídos"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "Permitir a edição de pedidos de compras após serem enviados ou concluídos"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Autocompletar Pedidos de Compra"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "Marcar automaticamente os pedidos de compra como concluídos quando todos os itens de linha forem recebidos"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Habitar esquecer senha"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Habilitar a função \"Esqueci minha senha\" nas páginas de acesso"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Habilitar cadastro"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Ativar auto-registro para usuários na página de entrada"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "Ativar SSO"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "Ativar SSO na página de acesso"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "Ativar registro SSO"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Ativar auto-registro por SSO para usuários na página de entrada"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "Email obrigatório"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "Exigir do usuário o e-mail no cadastro"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "Auto-preencher usuários SSO"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Preencher automaticamente os detalhes do usuário a partir de dados da conta SSO"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "Enviar email duplo"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "No registro pedir aos usuários duas vezes pelo email"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Senha duas vezes"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "No registro pedir aos usuários duas vezes pela senha"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Domínios permitidos"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "Restringir registros a certos domínios (separados por vírgula, começando com @)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Grupo no cadastro"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "Forçar AMF"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "Os usuários devem usar uma segurança multifator."
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Checar extensões no início"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "Checar que todas as extensões instaladas no início — ativar em ambientes de contêineres"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "Verificar por atualizações de plugin"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "Habilitar verificações periódicas de atualizações para plugins instalados"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "Ativar integração URL"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "Ativar extensão para adicionar rotas URL"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "Ativar integração de navegação"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "Ativar extensões para integrar à navegação"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "Ativa integração com aplicativo"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "Ativar extensões para adicionar aplicativos"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "Ativar integração do calendário"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Ativar extensões para executar tarefas agendadas"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "Ativar integração de eventos"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "Ativar extensões para responder a eventos internos"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "Excluir Locais Externos"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "Período de Balanço Automático"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "Mostrar nomes completos dos usuários"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Mostrar Nomes Completos em vez de Nomes de Usuário"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr "Estoque total disponível no momento do balanço"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Data"
@@ -8084,77 +8092,77 @@ msgstr "Fornece suporte para escanear códigos de barras TME"
msgid "The Supplier which acts as 'TME'"
msgstr "O fornecedor que atua como 'TME'"
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "Plugin instalado com sucesso"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "Plugin instalado na {path}"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr "Extensões"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "Nenhum autor encontrado"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "A extensão '{p}' não é compatível com a versão atual do InvenTree {v}"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "Extensão requer pelo menos a versão {v}"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "Extensão requer no máximo a versão {v}"
@@ -9218,7 +9226,7 @@ msgstr "A quantidade não corresponde aos números de série"
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr "item em estoque contem outro(s) items"
msgid "Stock item has been assigned to a customer"
msgstr "Item em estoque foi reservado para outro cliente"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "Item no estoque está em produção no momento"
@@ -9262,71 +9270,71 @@ msgstr "Itens de estoque devem se referir à mesma peça do fornecedor"
msgid "Stock status codes must match"
msgstr "Códigos de estado do estoque devem corresponder"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "Item do estoque não pode ser realocado se não houver estoque da mesma"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Observações de entrada"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Deve-se fornecer o valor desse teste"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "O anexo deve ser enviado para este teste"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Resultado do teste"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "Valor da saída do teste"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "Anexo do resultado do teste"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "Notas do teste"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "Quantidade não deve exceder a quantidade disponível em estoque ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "Local de destino do estoque"
@@ -9565,7 +9573,7 @@ msgstr "A empresa selecionada não é um cliente"
msgid "Stock assignment notes"
msgstr "Nodas atribuídas a estoque"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "Uma lista de item de estoque deve ser providenciada"
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "Notas da transação de estoque"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "Notas da transação de estoque"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/pt_BR/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/pt_BR/LC_MESSAGES/django.po
index f4485cf01e..f54a06c881 100644
--- a/src/backend/InvenTree/locale/pt_BR/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/pt_BR/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Portuguese, Brazilian\n"
"Language: pt_BR\n"
@@ -109,9 +109,9 @@ msgstr "Valor decimal inválido"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Observações"
@@ -550,13 +550,13 @@ msgstr "Status de pedido"
msgid "Parent Build"
msgstr "Produção principal"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "Incluir variáveis"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "Pedido pendente"
msgid "Allocated"
msgstr "Alocado"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "Consumido"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Disponível"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "Em pedido"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr "Produção não encontrada"
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Pedido de produção"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Local"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr "Saída"
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr "Filtrar por ID do item de estoque de saída. Use 'null' para encontrar itens de produção não instalados."
@@ -1830,7 +1830,7 @@ msgstr "Definição"
msgid "Unit definition"
msgstr "Definição de unidade"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Anexo"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr "Chave lógica de estado que é igual a este estado personalizado na lógica de negócios"
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Valor"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr "Dados de resposta da verificação de código de barras"
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Resultado"
@@ -2673,8 +2673,8 @@ msgstr "Com que frequência atualizar as taxas de câmbio (defina como zero para
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "Dias"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "Permitir que os itens que não estão em estoque sejam transferidos entre locais de estoque"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "Modelo de referência de pedidos de produção"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Modelo necessário para gerar campo de referência do pedido de produção"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "Exigir proprietário responsável"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "Um proprietário responsável deve ser atribuído a cada pedido"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr "Requer peça ativa"
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr "Impedir a criação de ordem para peças inativas"
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr "Exigir peça bloqueada"
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr "Impedir criação de pedidos para peças desbloqueadas"
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr "Exigir validade, BOM"
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr "Impedir criação de pedido de produção a menos que lista de materiais tenha sido validada"
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr "Exigir pedidos secundários fechados"
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr "Impedir o preenchimento do pedido de construção até que todos os pedidos secundários sejam fechados"
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr "Pedido de produção externo"
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr "Ativar funcionalidade de pedido de construção externa"
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr "Exigir pedidos de produção externos"
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr "Exigir um pedido de produção externo ao solicitar peças montadas de um fornecedor externo"
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "Bloquear até passagem de testes"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "Impedir que as saídas da produção sejam concluídas até que todos os testes necessários passem"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "Ativar pedidos de devolução"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "Ativar funcionalidade de pedido de devolução na interface do usuário"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "Modelo de referência de pedidos de devolução"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "Modelo necessário para gerar campo de referência do pedido de devolução"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "Editar os pedidos de devolução concluídos"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "Permitir a edição de pedidos de devolução após serem enviados ou concluídos"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "Modelo de referência de pedidos de venda"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "Modelo necessário para gerar campo de referência do pedido de venda"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "Envio padrão de pedidos de venda"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "Habilitar criação de envio padrão com pedidos de vendas"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "Editar os pedidos de vendas concluídos"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "Permitir a edição de pedidos de vendas após serem enviados ou concluídos"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr "Remessa requer verificação"
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr "Impedir a conclusão de remessas até que os itens sejam verificados"
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "Marcar pedidos enviados como concluídos"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "Pedidos de vendas marcados como enviados automaticamente serão concluídos, ignorando o status \"enviado\""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr "Habilitar pedidos de transferência"
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr "Habilitar a funcionalidade de pedido de transferência na interface do usuário"
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr "Padrão de referência do pedido de transferência"
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr "Padrão obrigatório para gerar o campo de referência do pedido de transferência"
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr "Bloquear testes de item incompletos"
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr "Impedir a alocação de itens de estoque a pedidos de venda se os testes obrigatórios do item estiverem incompletos"
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "Modelo de referência de pedidos de compras"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "Modelo necessário para gerar campo de referência do pedido de compra"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "Editar pedidos de compra concluídos"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "Permitir a edição de pedidos de compras após serem enviados ou concluídos"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr "Converter moeda"
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr "Converter valor de item para moeda base quando receber o estoque"
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Completar automaticamente os pedidos de compra"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "Marcar automaticamente os pedidos de compra como concluídos quando todos os itens de linha forem recebidos"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Ativar senha esquecida"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Ativar a função \"Esqueci minha senha\" nas páginas de acesso"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Ativar cadastro"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Ativar auto-registro para usuários na página de entrada"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "Ativar SSO"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "Ativar SSO na página de acesso"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "Ativar registro SSO"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Ativar auto-registro via SSO para usuários nas páginas de login"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "Ativar sincronização de grupo SSO"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "Ativar sincronização de grupos do InvenTree com grupos fornecidos pelo IdP"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "Chave de grupo SSO"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr "O nome dos grupos reivindicam o atributo fornecido pelo IdP"
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr "Mapa do grupo SSO"
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr "Um mapeamento de grupos de SSO para grupos locais de InvenTree. Se o grupo local não existir, será criado."
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr "Remover grupos fora do SSO"
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr "Se os grupos atribuídos ao usuário devem ser removidos somente se eles não são o backend pelo IdP. Pois essa configuração desabilitada pode causar problemas de segurança"
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "E-mail obrigatório"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "Exigir do usuário o e-mail no cadastro"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "Auto-preencher usuários SSO"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Preencher automaticamente os detalhes do usuário a partir de dados da conta SSO"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "Enviar e-mail duplo"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "Ao se registrar, peça aos usuários duas vezes por seus e-mails"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Senha duas vezes"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "No registro pedir aos usuários duas vezes pela senha"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Domínios permitidos"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "Restringir registros a certos domínios (separados por vírgula, começando com @)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Grupo no cadastro"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr "Grupo ao qual novos usuários serão atribuídos ao registro. Se a sincronização de grupo SSO estiver ativada, este grupo só estará definido se nenhum grupo puder ser atribuído a partir do IdP."
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "Forçar AMF"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "Os usuários devem usar uma segurança multifatorial."
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr "Habilitar esta configuração exigirá que todos os usuários configurem a autenticação multifator. Todas as sessões serão desconectadas imediatamente."
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Verificar extensões na inicialização"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "Checar que todas as extensões instaladas no início — ativar em ambientes de contêineres"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "Verificar por atualizações de extensão"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "Ativar verificações periódicas de atualizações para a extensão instalados"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "Ativar integração URL"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "Ativar extensão para adicionar rotas URL"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "Ativar integração de navegação"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "Ativar extensões para integrar à navegação"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "Ativar integração com aplicativo"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "Ativar extensões para adicionar aplicativos"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "Ativar integração com agendas"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Ativar extensões para executar tarefas agendadas"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "Ativar integração de eventos"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "Ativar extensões para responder a eventos internos"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "Ativar integração de interface"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "Ativar extensões para integrar na interface do usuário"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr "Ativar integração com o e-mail"
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr "Ativar extensão para processar e-mails de saída/entrada"
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr "Ativar códigos de projeto"
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr "Ativar códigos de projeto para rastrear projetos"
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr "Habilitar inventário"
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr "Ativar funcionalidade para gravação de níveis e valor de estoque históricos"
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "Excluir locais externos"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr "Excluir dos cálculos de inventário os itens de estoque em locais externos"
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "Período de contagem automática"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr "Número de dias entre os registros automáticos de inventário"
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr "Excluir registros de inventário antigos"
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr "Excluir registros de inventário com mais dias do que o especificado"
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr "Intervalo de exclusão de inventário"
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr "Os registros de inventário serão excluídos após o número de dias especificado"
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr "Excluir registros de rastreamento de estoque antigos"
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr "Excluir registros de rastreamento de estoque com mais dias do que o especificado"
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr "Intervalo de exclusão de rastreamento de estoque"
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr "Os registros de rastreamento de estoque serão excluídos após o número de dias especificado"
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "Exibir nomes completos dos usuários"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Exibir nomes completos dos usuários em vez de nomes de usuários"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr "Exibir perfis de usuário"
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr "Exibir perfis de usuários em sua página de perfil"
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr "Semana começa em"
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr "Dia inicial da semana, para exibição nas visualizações de calendário"
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr "Domingo"
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr "Segunda-feira"
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr "Terça-feira"
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr "Quarta-feira"
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr "Quinta-feira"
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr "Sexta-feira"
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr "Sábado"
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr "Horizonte do calendário"
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr "Número de meses no futuro a exibir nas visualizações de calendário"
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr "meses"
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "Ativar dados da estação de teste"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "Ativar coleção de dados da estação de teste para resultados de teste"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr "Habilitar ping de máquina"
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr "Habilitar a tarefa periódica de ping das máquinas registradas para verificar seu status"
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr "Estoque total disponível no momento do inventário"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Data"
@@ -8084,77 +8092,77 @@ msgstr "Fornece suporte para ler códigos de barras da TME"
msgid "The Supplier which acts as 'TME'"
msgstr "O fornecedor que atua como 'TME'"
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr "Apenas contas de superusuário podem administrar plugins"
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr "A instalação de plugins está desabilitada"
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr "Nenhum nome de pacote ou URL fornecido para instalação"
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr "Caracteres inválidos no nome do pacote ou URL"
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "Plugin instalado com sucesso"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "Plugin instalado em {path}"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr "O plugin não foi encontrado no registro"
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr "O plugin não é um plugin empacotado"
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr "Nome do pacote do plugin não encontrado"
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr "Apenas usuários da equipe podem administrar plugins"
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr "A desinstalação de plugins está desabilitada"
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr "O plugin não pode ser desinstalado porque está ativo no momento"
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr "O plugin não pode ser desinstalado porque é obrigatório"
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr "O plugin não pode ser desinstalado porque é um plugin de exemplo"
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr "O plugin não pode ser desinstalado porque é um plugin integrado"
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr "O plugin não está instalado"
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr "Instalação do plugin não encontrada"
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr "Plugin desinstalado com sucesso"
@@ -8206,21 +8214,21 @@ msgstr "Plugin empacotado"
msgid "Plugin"
msgstr "Plugin"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "Nenhum autor encontrado"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "O plugin '{p}' não é compatível com a versão atual do InvenTree {v}"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "O plugin requer pelo menos a versão {v}"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "O plugin requer no máximo a versão {v}"
@@ -9218,7 +9226,7 @@ msgstr "A quantidade não corresponde aos números de série"
msgid "Cannot assign stock to structural location"
msgstr "Não é possível atribuir estoque a um local estrutural"
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr "O modelo de teste não existe"
@@ -9238,7 +9246,7 @@ msgstr "O item de estoque contém outros itens"
msgid "Stock item has been assigned to a customer"
msgstr "O item de estoque foi atribuído a um cliente"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "O item de estoque está atualmente em produção"
@@ -9262,71 +9270,71 @@ msgstr "Os itens de estoque devem se referir à mesma peça de fornecedor"
msgid "Stock status codes must match"
msgstr "Os códigos de status do estoque devem coincidir"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "O item de estoque não pode ser movido porque não está em estoque"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr "Rastreamento do item de estoque"
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Notas do registro"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr "Resultado de teste do item de estoque"
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Um valor deve ser fornecido para este teste"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "Um anexo deve ser enviado para este teste"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr "Valor inválido para este teste"
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Resultado do teste"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "Valor de saída do teste"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "Anexo do resultado do teste"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "Notas do teste"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr "Estação de teste"
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr "O identificador da estação de teste onde o teste foi realizado"
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr "Iniciado"
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr "A data/hora de início do teste"
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr "Concluído"
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr "A data/hora de término do teste"
@@ -9440,8 +9448,8 @@ msgstr "Nenhum item de estoque fornecido"
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "A quantidade não pode exceder a quantidade de estoque disponível ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "Local de estoque de destino"
@@ -9565,7 +9573,7 @@ msgstr "A empresa selecionada não é um cliente"
msgid "Stock assignment notes"
msgstr "Notas da atribuição de estoque"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "Uma lista de itens de estoque deve ser fornecida"
@@ -9613,27 +9621,31 @@ msgstr "O item de estoque já está em estoque"
msgid "Quantity must not be negative"
msgstr "A quantidade não pode ser negativa"
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "Notas da transação de estoque"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr "Definir local de estoque para os itens contados (opcional)"
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr "Mesclar com o estoque existente"
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "Notas da transação de estoque"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr "Definir local de estoque para os itens contados (opcional)"
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr "Mesclar itens devolvidos com itens de estoque existentes, se possível"
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr "Próximo número de série"
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr "Número de série anterior"
diff --git a/src/backend/InvenTree/locale/ro/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/ro/LC_MESSAGES/django.po
index c7c48e8a57..35834a2f87 100644
--- a/src/backend/InvenTree/locale/ro/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/ro/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Romanian\n"
"Language: ro_RO\n"
@@ -109,9 +109,9 @@ msgstr "Valoare zecimală nevalidă"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Notițe"
@@ -550,13 +550,13 @@ msgstr "Starea comenzii"
msgid "Parent Build"
msgstr "Construcție părinte"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "İnclude variante"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "Comandă restantă"
msgid "Allocated"
msgstr "Alocate"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "Consumat"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Disponibil"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "Pe comandă"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Comenzi de Producție"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Locatie"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr "Ieșire"
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr "Filtrează după ID-ul elementelor de ieșire din stoc. Utilizați \"null\" pentru a găsi elemente de construcție dezinstalate."
@@ -1830,7 +1830,7 @@ msgstr ""
msgid "Unit definition"
msgstr ""
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr ""
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr ""
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr ""
@@ -2673,8 +2673,8 @@ msgstr ""
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr ""
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "Necesită Titularul Responsabil"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "Titularul responsabil trebuie să fie atribuit fiecărei comenzi"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr "Comenzi externe de producție"
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "Blochează până la trecerea testelor"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "Previne ca ieșirile de construcție să fie finalizate până când toate testele necesare trec"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "Comenzile de vânzare marcate ca expediate vor fi finalizate automat, ocolind starea \"expediate\""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr ""
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Activează parola uitată"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Activare parolă uitată funcție pe paginile de autentificare"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr ""
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr ""
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr ""
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr ""
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr ""
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr ""
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr ""
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr ""
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr ""
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr ""
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr ""
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Parola de două ori"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "La înscriere, cere de două ori parola lor"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr ""
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr ""
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr ""
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr ""
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr ""
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr ""
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr ""
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr ""
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr ""
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr ""
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Afișează numele complet al utilizatorilor în loc de nume de utilizator"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr ""
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr ""
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr ""
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9262,71 +9270,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr ""
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr ""
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr ""
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr ""
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9565,7 +9573,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/ru/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/ru/LC_MESSAGES/django.po
index 3477f31b54..44a302a2f7 100644
--- a/src/backend/InvenTree/locale/ru/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/ru/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Russian\n"
"Language: ru_RU\n"
@@ -109,9 +109,9 @@ msgstr "Не верное десятичное значение"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Заметки"
@@ -550,13 +550,13 @@ msgstr "Статус заказа"
msgid "Parent Build"
msgstr "Родительский заказ на производство"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "Включая варианты"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "Невыполненные заказы"
msgid "Allocated"
msgstr "Зарезервировано"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "Потреблено"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Доступно"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "В заказе"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Заказ на производство"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Расположение"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr "Выход"
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr "Фильтрация по идентификатору исходящей складской позиции. Используйте 'null', чтобы найти несмонтированные элементы сборки."
@@ -1830,7 +1830,7 @@ msgstr "Определение"
msgid "Unit definition"
msgstr "Определение единицы измерения"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Вложения"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr "Логическое состояние, соответствующее пользовательскому состоянию в бизнес-логике"
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Значение"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr "Данные ответа от сканирования штрихкода"
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Результат"
@@ -2673,8 +2673,8 @@ msgstr "Как часто обновлять курс валют (установ
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "дней"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "Разрешить перемещение товаров, которых нет на складе, между складами"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "Паттерн ссылки заказа на производство"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Поле требуемого паттерна для создания ссылки заказа на производство"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "Требуется ответственный владелец"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "Ответственный владелец должен быть назначен для каждого заказа"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr "Требовать активную деталь"
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr "Запрещать создание заказов на сборку для неактивных деталей"
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr "Требовать заблокированную деталь"
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr "Запрещать создание заказов на сборку для разблокированных деталей"
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr "Требовать валидную спецификацию"
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr "Запрещать создание заказов на сборку, пока спецификация не будет подтверждена"
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr "Требовать закрытия дочерних заказов"
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr "Запрещать завершение заказа на сборку, пока не закрыты все дочерние заказы"
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr "Сторонний заказ на сборку"
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr "Включить функциональность сторонних заказов на сборку"
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "Блокировать до прохождения тестов"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "Запретить вывод сборки до тех пор, пока не пройдут все необходимые тесты"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "Включить заказы на возврат"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "Включите функцию заказа на возврат в пользовательском интерфейсе"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "Шаблон заказа на возврат товара"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "Необходимый шаблон для создания поля «Возврат заказа»"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "Редактировать завершенные возвратные заказы"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "Разрешить редактирование возвращенных заказов после их завершения"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "Шаблон заказа на возврат товара"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "Необходимый шаблон для создания поля «Возврат заказа»"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "Отгрузка по умолчанию для заказа на продажу"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "Включить создание отгрузки по умолчанию для заказов на продажу"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "Редактирование завершённых заказов на продажу"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "Разрешить редактирование заказов на продажу после их отправки или завершения"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr "Отгрузка требует проверки"
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr "Запрещать завершение отгрузок, пока товары не проверены"
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "Отмечать отправленные заказы как завершённые"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "Заказы на продажу, помеченные как отгруженные, будут автоматически завершены, минуя статус 'отгружено'"
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "Шаблон ссылки заказа на закупку"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "Требуемый шаблон для генерации поля ссылки заказа на закупку"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "Редактировать завершённые заказы на закупку"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "Разрешить редактирование заказов после их отправки или завершения"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr "Конвертировать валюту"
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr "Преобразовывать стоимость товара в базовую валюту при поступлении на склад"
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Автоматически выполнять заказы на закупку"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "Автоматически отмечать заказы на закупку как завершённые при получении всех позиций"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Включить функцию восстановления пароля"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Включить функцию восстановления пароля на странице входа"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Разрешить регистрацию"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Включить самостоятельную регистрацию пользователей на странице входа"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "Включить SSO"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "Включить SSO на странице входа"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "Включить регистрацию через SSO"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Включить самостоятельную регистрацию пользователей через SSO на странице входа"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "Включить синхронизацию групп через SSO"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "Включить синхронизацию групп InvenTree с группами, предоставляемыми IdP"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "Ключ группы SSO"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr "Имя атрибута группы, предоставленного провайдером идентификации"
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr "Отображение групп SSO"
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr "Отображение от групп SSO к локальным группам InvenTree. Если локальная группа не существует, она будет создана."
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr "Удалять группы вне SSO"
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr "Удалять ли группы, назначенные пользователю, если они не поддерживаются провайдером идентификации. Отключение этой настройки может привести к проблемам безопасности"
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "Необходимо указать EMail"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "Требовать электронную почту при регистрации"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "Автозаполнение пользователей SSO"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Автоматически заполнять данные пользователя из аккаунта SSO"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "Написать дважды"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "При регистрации дважды спрашивать адрес электронной почты"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Пароль дважды"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "При регистрации запросить пароль у пользователей дважды"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Разрешенные домены"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "Ограничить регистрацию определёнными доменами (через запятую, начиная с @)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Группа при новой регистрации"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr "Группа, на которую назначаются новые пользователи при регистрации. Если включена синхронизация группы SSO, эта группа задается только в том случае, если ни одна группа не может быть назначена через IdP."
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "Принудительное MFA"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "Пользователи должны использовать многофакторную безопасность."
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr "Включение этой настройки потребует от всех пользователей настройки многофакторной аутентификации. Все сессии будут отключены немедленно."
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Проверять плагины при запуске"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "Проверять, что все плагины установлены при запуске — включать в контейнерных средах"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "Проверка обновлений плагинов"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "Включить периодическую проверку обновлений установленных плагинов"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "Включить интеграцию URL"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "Разрешить плагинам добавлять маршруты URL"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "Включить интеграцию навигации"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "Разрешить плагинам интегрироваться в навигацию"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "Включить интеграцию приложений"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "Разрешить плагинам добавлять приложения"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "Включить интеграцию расписаний"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Разрешить плагинам запускать запланированные задачи"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "Включить интеграцию событий"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "Разрешить плагинам реагировать на внутренние события"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "Включить интеграцию интерфейса"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "Разрешить плагинам интегрироваться в пользовательский интерфейс"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr "Включить интеграцию почты"
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr "Разрешить плагинам обрабатывать исходящую и входящую почту"
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr "Включить коды проекта"
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr "Включить коды проекта для отслеживания проектов"
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr "Включить инвентаризацию"
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr "Включить функцию записи истории уровней и стоимости запасов"
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "Исключить сторонний склад"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr "Исключить из инвентаризации единицы хранения на внешних складах"
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "Автоматический период инвентаризации"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr "Кол-во дней между автоматических записей инвентаризации"
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr "Удалять устаревшие записи инвентаризаций"
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr "Удалять записи инвентаризаций старше N дней"
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr "Частота удаления записей инвентаризаций"
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr "Записи инвентаризации будут удалены после N дней"
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr "Удалять старые записи истории запасов"
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr "Удалять записи истории запасов старше указанного количества дней"
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr "Интервал удаления истории запасов"
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr "Записи истории запасов будут удалены через указанное количество дней"
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "Показывать полные имена пользователей"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Отображать полные имена пользователей вместо логинов"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr "Отображать профили пользователей"
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr "Отображать профили пользователей на их странице профиля"
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "Добавлять данные об испытательном оборудовании"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "Добавлять данные об испытательном оборудовании в результаты тестирования"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr "Включить пинг машин"
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr "Включить периодическую задачу пинга зарегистрированных машин для проверки их статуса"
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr "Общий доступный запас на момент инвентаризации"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Дата"
@@ -8084,77 +8092,77 @@ msgstr "Предоставляет поддержку сканирования
msgid "The Supplier which acts as 'TME'"
msgstr "Поставщик, который представляет 'TME'"
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr "Установка плагинов отключена"
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "Плагин успешно установлен"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "Плагин установлен в {path}"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr "Плагин не найден в реестре"
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr "Плагин не является упакованным"
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr "Имя пакета плагина не найдено"
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr "Только пользователи с правами персонала могут управлять плагинами"
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr "Удаление плагинов отключено"
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr "Плагин нельзя удалить, так как он активен"
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr "Плагин нельзя удалить, так как он обязательный"
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr "Плагин нельзя удалить, так как он является образцом"
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr "Плагин нельзя удалить, так как он встроенный"
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr "Плагин не установлен"
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr "Установка плагина не найдена"
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr "Плагин успешно удалён"
@@ -8206,21 +8214,21 @@ msgstr "Пакетный плагин"
msgid "Plugin"
msgstr "Плагин"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "Автор не найден"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "Плагин '{p}' несовместим с текущей версией InvenTree {v}"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "Плагин требует как минимум версию {v}"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "Плагин требует не более версии {v}"
@@ -9218,7 +9226,7 @@ msgstr "Количество не соответствует серийным н
msgid "Cannot assign stock to structural location"
msgstr "Нельзя назначить запас в структурное местоположение"
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr "Шаблон теста не существует"
@@ -9238,7 +9246,7 @@ msgstr "Складская позиция содержит другие дета
msgid "Stock item has been assigned to a customer"
msgstr "Складская позиция была назначена покупателю"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "Складская позиция в производстве"
@@ -9262,71 +9270,71 @@ msgstr "Складские позиции должны ссылаться на
msgid "Stock status codes must match"
msgstr "Коды статуса запаса должны совпадать"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "Складской элемент нельзя переместить, так как он отсутствует на складе"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr "Отслеживание складского элемента"
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Заметки к записи"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr "Результат теста складского элемента"
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Для этого теста должно быть указано значение"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "Для этого теста требуется загрузить вложения"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr "Недопустимое значение для этого теста"
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Результат тестирования"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "Результат выполнения теста"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "Вложение с результатом теста"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "Заметки о тестировании"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr "Испытательное оборудование"
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr "Идентификатор испытательного оборудования, на котором выполнялось тестирование"
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr "Запущен"
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr "Время начала тестирования"
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr "Завершён"
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr "Время окончания тестирования"
@@ -9440,8 +9448,8 @@ msgstr "Складской элемент не предоставлен"
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "Количество не должно превышать доступный запас ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "Целевое место хранения"
@@ -9565,7 +9573,7 @@ msgstr "Выбранная компания не является покупат
msgid "Stock assignment notes"
msgstr "Записи о назначенных запасах"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "Необходимо предоставить список складских позиций"
@@ -9613,27 +9621,31 @@ msgstr "Складской элемент уже на складе"
msgid "Quantity must not be negative"
msgstr "Количество не должно быть отрицательным"
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "Заметки об изменении склада"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr "Объединить с существующим запасом"
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "Заметки об изменении склада"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr "Объединять возвращённые элементы с существующими складскими элементами, если возможно"
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr "Следующий серийный номер"
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr "Предыдущий серийный номер"
diff --git a/src/backend/InvenTree/locale/sk/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/sk/LC_MESSAGES/django.po
index cb4904a6a7..262b746f3f 100644
--- a/src/backend/InvenTree/locale/sk/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/sk/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Slovak\n"
"Language: sk_SK\n"
@@ -109,9 +109,9 @@ msgstr ""
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr ""
@@ -550,13 +550,13 @@ msgstr ""
msgid "Parent Build"
msgstr ""
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr ""
msgid "Allocated"
msgstr ""
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr ""
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr ""
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr ""
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr ""
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr ""
msgid "Unit definition"
msgstr ""
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr ""
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr ""
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr ""
@@ -2673,8 +2673,8 @@ msgstr ""
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr ""
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr ""
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr ""
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr ""
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr ""
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr ""
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr ""
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr ""
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr ""
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr ""
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr ""
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr ""
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr ""
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr ""
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr ""
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr ""
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr ""
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr ""
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr ""
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr ""
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr ""
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr ""
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr ""
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr ""
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr ""
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr ""
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr ""
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr ""
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr ""
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr ""
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr ""
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9262,71 +9270,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr ""
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr ""
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr ""
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr ""
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9565,7 +9573,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/sl/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/sl/LC_MESSAGES/django.po
index efbab5b512..f4d70ec09f 100644
--- a/src/backend/InvenTree/locale/sl/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/sl/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Slovenian\n"
"Language: sl_SI\n"
@@ -109,9 +109,9 @@ msgstr ""
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Zapiski"
@@ -550,13 +550,13 @@ msgstr ""
msgid "Parent Build"
msgstr "Nadrejena izgradnja"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr ""
msgid "Allocated"
msgstr "Dodeljeno"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Na voljo"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr ""
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Nalog izgradnje"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr ""
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr ""
msgid "Unit definition"
msgstr ""
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Priloga"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr ""
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr ""
@@ -2673,8 +2673,8 @@ msgstr ""
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr ""
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr ""
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr ""
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr ""
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr ""
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr ""
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr ""
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr ""
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr ""
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr ""
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr ""
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr ""
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr ""
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr ""
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr ""
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr ""
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr ""
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr ""
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr ""
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr ""
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr ""
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr ""
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr ""
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr ""
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr ""
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr ""
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr ""
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr ""
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr ""
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr ""
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr ""
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9262,71 +9270,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr ""
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr ""
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr ""
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr ""
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9565,7 +9573,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/sr/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/sr/LC_MESSAGES/django.po
index b51ac39e8d..b9fdcd14e6 100644
--- a/src/backend/InvenTree/locale/sr/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/sr/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Serbian (Latin)\n"
"Language: sr_CS\n"
@@ -109,9 +109,9 @@ msgstr "Neispravna decimalna vrednost"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Napomene"
@@ -550,13 +550,13 @@ msgstr "Status naloga"
msgid "Parent Build"
msgstr "Roditeljski proizvod"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "Uključi varijante"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "Neizmirena narudžbina"
msgid "Allocated"
msgstr "Alocirano"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Dostupno"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "Po narudžbini"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Nalog za izradu"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Lokacija"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr "Definicija"
msgid "Unit definition"
msgstr "Definicija jedinice"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Prilog"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr "Stanje logičkog ključa je jednako posebnom ključu u poslovnoj logici"
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Vrednost"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr "Podaci odgovora za skeniranje bar koda"
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Rezultat"
@@ -2673,8 +2673,8 @@ msgstr "Koliko često ažurirati devizne kurseve (podesi na nulu za onemogućti)
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "dani"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "Dozvoli da stavke sa zaliha koje nisu na zalihama budu premeštane između lokacija zaliha"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "Referentni šablon naloga za izradu"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Potreban šablon za generisanje referentnog polja naloga za izradu"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "Potreban odgovoran vlasnik"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "Odgovoran vlasnik mora biti dodeljen svakom nalogu"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr "Potreban aktivan deo"
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr "Spreči kreiranje naloga za izradu za neaktivne delove"
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr "Potreban zaključan deo"
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr "Spreči kreiranje nalogaza izradu za otključane delove"
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr "Potreban validan spisak materijala"
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr "Spreči kreiranje naloga za izradu pre validacije spiska materijala"
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr "Potrebno završavanje podređenih naloga"
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr "Spreči završavanje naloga za izradu pre završavanja svih podređenih naloga"
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "Blokiraj dok ne prođe test"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "Spreči završavanje naloga za izradu pre uspešnog završetka svih testova"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "Omogući naloge za vraćanje"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "Omogući funkcionalnost vraćana u korisničkom interfejsu"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "Referentni šablon naloga za vraćanje"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "Potreban šablon pri generisanju referentnog polja naloga za vraćanje"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "Izmeni završene naloge za vraćanje"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "Dozvoli izmenu naloga za vraćanje nakon što su završeni"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "Referentni šablon naloga za prodaju"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "Potreban šablon pri generisanju referentnog polja naloga za prodaju"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "Podrazumevana isporuka naloga za prodaju"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "Omogućava kreiranje podrazumevane isporuke sa nalozima za prodaju"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "Izmeni završene naloge za prodaju"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "Dozvoli izmenu naloga za prodaju nakon što su isporučeni ili završeni"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "Označi isporučene naloge kao završene"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "Nalozi za prodaju označeni kao isporučeni će automatski biti završeni, zaobilazeći status isporučen"
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "Referentni šablon naloga za kupovinu"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "Potreban šablon pri generisanju referentnog polja naloga za kupovinu"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "Izmeni završene naloge za kupovinu"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "Dozvoli izmenu naloga za kupovinu nakon što su isporučeni ili završeni"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Automatski završi naloge za kupovinu"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "Automatski označi naloge za kupovinu kao završene kada su primljene sve stavke porudžbine"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Omogući zaboravljenu lozinku"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Omogući funkcionalnost zaboravljene lozinke na stranicama za prijavljivanje"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Omogući registraciju"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Omogući registraciju korisnicima na stranicama za prijavljivanje"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "Omogući SSO"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "Omogući SSO na stranicama za prijavljivanje"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "Omogući SSO registraciju"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Omogući registraciju preko SSO za korisnike na stranicaa za prijavljivanje"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "Omogući SSO sinhronizaciju grupa"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "Omogući sinhronizaciju grupa aplikacije sa grupama IdP-a"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "SSO ključ grupe"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr "Nazivi grupa dobijaju atribute od IdP-a"
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr "Mapiranje SSO grupa"
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr "Mapiranje SSO grupa u lokalne grupe aplikacije. Ukoliko lokalna grupa ne postoji, biće kreirana."
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr "Ukloni grupe van SSO"
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr "Da li će grupe dodeljene korisnicima biti uklonjene ukoliko nisu podržane IdP-om. Onemogućavanje ovoga može dovesti do problema."
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "Email neophodan"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "Zahtevaj od korisnika da dostavi mejl prilikom registracije"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "Automatski popuni SSO korisnike"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Automatski popuni korisnikove podatke iz SSO naloga"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "Email dva puta"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "Pitaj korisnika dva puta za email prilikom registracije"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Lozinka dva puta"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "Pitaj korisnika dva puta za lozinku prilikom registracije"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Dozvoljeni domeni"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "Ograniči registraciju na određene domene (razdvojeni zapetom, počinju sa @)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Grupa pri registrovanju"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr "Grupa kojoj se novi korisnici dodeljuju pri registraciji. Ukoliko je SSO group sync omogućen, ova grupa će se dodavati ukoliko korisnik ne može da dobije grupu iz IdP-a."
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "Nametni MFA"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "Korisnici moraju koristiti multifaktorsku bezbednost"
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Proveri plugine pri pokretanju"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "Proveri da li su svi pluginovi instalirani pri pokretanju - omogućeni u kontejnerskim okruženjima"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "Proveri ažuriranja pluginova"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "Omogući periodično proveranje pluginova"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "Omogući URL integraciju"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "Omogući da pluginovi dodaju URL rute"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "Omogući integraciju u navigaciju"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "Omogući integraciju pluginova u navigaciju"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "Omogući integraciju aplikacija"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "Omogući pluginovima da dodaju aplikacije"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "Omogući integraciju planiranja"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Omogući da plugini izvršavaju planirane zadatke"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "Omogući integraciju događaja"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "Omogući da plugini odgovaraju na unutrašnje događaje"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "Omogući integraciju interfejsa"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "Omogući integraciju pluginova u korisnički interfejs"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "Ne uključuj eksterne lokacije"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "Period automatskog popisa"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "Prikaži puna imena korisnika"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Prikaži puna imena korisnika umesto korisničkih imena"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "Omogući podatke test stanica"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "Omogući prikupljanje podataka sa test stanica radi rezultata testova"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr "Ukupne dostupne zalihe za vreme popisa"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Datum"
@@ -8084,77 +8092,77 @@ msgstr "Pruža podršku za skeniranje TME bar kodova"
msgid "The Supplier which acts as 'TME'"
msgstr "Dobavljač koji se ponaša kao 'TME'"
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr "Instalacija plugina je onemogućena"
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "Plugin instaliran uspešno"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "Instaliran plugin na {path}"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr "Plugin nije pronađen u registru"
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr "Plugin nije paket plugin"
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr "Ime paketa plugina nije pronađeno"
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr "Samo osoblje može da administrira pluginove"
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr "Deinstaliranje plugina je onemogućeno"
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr "Plugin ne može biti deinstaliran jer je trenutno aktivan"
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr "Plugin nije instaliran"
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr "Instalacija plugina nije pronađena"
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr "Plugin uspešno deinstaliran"
@@ -8206,21 +8214,21 @@ msgstr "Paket plugin"
msgid "Plugin"
msgstr "Plugin"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "Nije pronađen autor"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "Plugin '{p}' nije kompatibilan sa trenutnom verzijom aplikacije {v}"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "Plugin zahteva najmanje verziju {v}"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "Plugin zahteva najviše verziju {v}"
@@ -9218,7 +9226,7 @@ msgstr "Količine se ne poklapaju sa serijskim brojevima"
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr "Test šablon ne postoji"
@@ -9238,7 +9246,7 @@ msgstr "Stavka sa zaliha sadrži druge stavke"
msgid "Stock item has been assigned to a customer"
msgstr "Stavka sa zaliha je dodeljena mušteriji"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "Stavka sa zaliha je trenutno u produkciji"
@@ -9262,71 +9270,71 @@ msgstr "Stavke sa zaliha se moraju odnositi na isti deo dobavljača"
msgid "Stock status codes must match"
msgstr "Statusne šifre zaliha moraju da se poklapaju"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "Stavka se ne može pomeriti jer nije na zalihama"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr "Praćenje stavke sa zaliha"
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Ulazne beleške"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr "Rezultat testa stavke sa zaliha"
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Vrednost mora biti dostavljena za ovaj test"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "Prilog mora biti dostavljen za ovaj test"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr "Nevažeća vrednost za ovaj test"
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Rezultat testa"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "Vrednost završetka testa"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "Prilog uz test rezultat"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "Beleške sa testa"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr "Stanica za testiranje"
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr "Identifikator stanice za testiranje gde je test izvršen"
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr "Započeto"
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr "Vreme početka testa"
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr "Završeno"
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr "Vreme završetka testa"
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "Količina ne sme da pređe dostupnu količinu zaliha ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "Odredišna lokacija zaliha"
@@ -9565,7 +9573,7 @@ msgstr "Izabrana kompanija nije mušterija"
msgid "Stock assignment notes"
msgstr "Beleške dodeljivanja zaliha"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "Lista stavki mora biti dostavljena"
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "Beleške transakcija zaliha"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "Beleške transakcija zaliha"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/sv/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/sv/LC_MESSAGES/django.po
index e9db8a0def..1e236595b2 100644
--- a/src/backend/InvenTree/locale/sv/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/sv/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Swedish\n"
"Language: sv_SE\n"
@@ -109,9 +109,9 @@ msgstr ""
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Anteckningar"
@@ -550,13 +550,13 @@ msgstr "Orderstatus"
msgid "Parent Build"
msgstr "Föregående tillverkning"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "Inkludera varianter"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr ""
msgid "Allocated"
msgstr "Allokerad"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "Konsumerad"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Tillgänglig"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr ""
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Byggorder"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Plats"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr "Definition"
msgid "Unit definition"
msgstr ""
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Bilaga"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Värde"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Resultat"
@@ -2673,8 +2673,8 @@ msgstr ""
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "dagar"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "Förhindra produktion från att slutföras tills alla nödvändiga tester är klara"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr ""
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr ""
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr ""
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Aktivera registrering"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr ""
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "Aktivera SSO"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr ""
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr ""
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr ""
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr ""
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr ""
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr ""
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr ""
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr ""
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr ""
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr ""
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Tillåtna domäner"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr ""
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr ""
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr ""
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr ""
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr ""
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr ""
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr ""
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr ""
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr ""
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr ""
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Datum"
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr ""
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr ""
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9262,71 +9270,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr ""
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr ""
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr ""
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Testresultat"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr "Startad"
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9565,7 +9573,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/th/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/th/LC_MESSAGES/django.po
index 1f3c7d3e04..c0179305a4 100644
--- a/src/backend/InvenTree/locale/th/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/th/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Thai\n"
"Language: th_TH\n"
@@ -109,9 +109,9 @@ msgstr ""
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "หมายเหตุ"
@@ -550,13 +550,13 @@ msgstr ""
msgid "Parent Build"
msgstr ""
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr ""
msgid "Allocated"
msgstr ""
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr ""
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr ""
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr ""
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "สถานที่"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr ""
msgid "Unit definition"
msgstr ""
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "ไฟล์แนบ"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr ""
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr ""
@@ -2673,8 +2673,8 @@ msgstr ""
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr ""
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr ""
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr ""
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr ""
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr ""
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr ""
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr ""
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr ""
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr ""
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr ""
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr ""
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr ""
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr ""
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr ""
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr ""
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr ""
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr ""
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr ""
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr ""
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr ""
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr ""
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr ""
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr ""
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr ""
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr ""
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr ""
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr ""
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr ""
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr ""
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr ""
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr ""
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9262,71 +9270,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr ""
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr ""
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr ""
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr ""
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9565,7 +9573,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/tr/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/tr/LC_MESSAGES/django.po
index 2be00ab01a..c83e87422a 100644
--- a/src/backend/InvenTree/locale/tr/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/tr/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Turkish\n"
"Language: tr_TR\n"
@@ -109,9 +109,9 @@ msgstr "Geçersiz ondalık değer"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Notlar"
@@ -550,13 +550,13 @@ msgstr "Sipariş Durumu"
msgid "Parent Build"
msgstr "Üst Yapım İşi"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "Varyantları Dahil Et"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "Sipariş Açık"
msgid "Allocated"
msgstr "Tahsis Edildi"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "Tüketildi"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Mevcut"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "Siparişte"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr "Üretim bulunamadı"
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Üretim Emri"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Konum"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr "Çıktı"
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr "Çıktı stok kalemi ID'sine göre filtrele. Takılmamış üretim kalemlerini bulmak için ‘null’ kullan."
@@ -1830,7 +1830,7 @@ msgstr "Tanımlama"
msgid "Unit definition"
msgstr "Birim tanımlaması"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Ek"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr "İş mantığında bu özel duruma eşit olan durum mantıksal anahtarı"
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Değer"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr "Barkod taramasından gelen yanıt verisi"
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Sonuç"
@@ -2673,8 +2673,8 @@ msgstr "Döviz kurlarını şu sıklıkla güncelle (etkisizleştirmek için sı
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "günler"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "Stokta olmayan kalemlerin stok konumları arasında aktarılmasına izin ver"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "Üretim Emri Referans Şablonu"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Üretim emri referans alanını üretmek için gerekli şablon"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "Sorumlu Sahip Gerektir"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "Her siparişe sorumlu bir yetkili atanmalıdır."
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr "Aktif Parça Gerektirir"
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr "Pasif parçalarla üretim emri oluşturmayı engelle"
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr "Kilitli Parça Gerekli"
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr "Kilidi açılmış parçalarla üretim emri oluşturmayı engelle"
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr "Geçerli BOM gereklidir."
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr "BOM henüz doğrulanmadan üretim emri oluşturmayı engelle"
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr "Kapalı Alt Siparişler Gerekli"
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr "Tüm alt emirler kapatılana kadar üretim emrini tamamlamayı engelle"
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr "Harici Üretim Emirleri"
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr "Harici üretim emri işlevselliğini etkinleştir"
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr "Harici Üretim Emirlerini Gerekli Kıl"
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr "Harici bir tedarikçiden montajlı parçalar sipariş ederken harici bir üretim emri gerekli kıl"
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "Testler Geçene Kadar Engelle"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "Tüm gerekli testler geçene kadar üretim çıktılarını tamamlamayı engelle"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "İade Siparişlerini Etkinleştir"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "Kullanıcı arayüzünde iade siparişi işlevselliğini etkinleştir"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "Kullanıcı arayüzünde iade siparişi işlevselliğini etkinleştirin."
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "İade Sipariş referans alanı oluşturmak için gerekli desen"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "Tamamlanan İade Siparişlerini Düzenle"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "Tamamlandıktan sonra iade siparişlerini düzenlemeye izin ver"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "Satış Siparişi Referans Şablonu"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "Satış Siparişi referans alanını üretmek için gerekli şablon"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "Satış Siparişi Varsayılan Gönderi"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "Satış siparişleriyle varsayılan gönderi oluşturmayı etkinleştir"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "Tamamlanmış Satış Siparişlerini Düzenle"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "Gönderilen veya tamamlanan satış siparişlerini düzenlemeye izin ver"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr "Kontrol Gerektiren Gönderi"
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr "Kalemler kontrol edilene dek gönderilerin tamamlanmasını engelle"
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "Gönderilen Siparişleri Tamamlandı Olarak İmle"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "Gönderildi olarak işaretli satış siparişleri \"gönderildi\" durumu atlanarak otomatik olarak tamamlanacaktır"
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr "Aktarım Emirlerini Etkinleştir"
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr "Kullanıcı arayüzünde aktarım emri işlevselliğini etkinleştir"
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr "Aktarım Emri Referans Deseni"
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr "Aktarım emri referans alanını üretmek için gereken desen"
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr "Eksik Ürün Testlerini Engelle"
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr "Gerekli ürün testleri eksik ise, stok kalemlerinin satış siparişlerine tahsis edilmesini engelle"
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "Satın Alma Siparişi Referans Şablonu"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "Satın Alma Siparişi referans alanını üretmek için gerekli şablon"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "Tamamlanan Satın Alma Siparişlerini Düzenle"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "Gönderildikten veya tamamlandıktan sonra satın alma siparişlerini düzenlemeye izin ver"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr "Para Birimini Dönüştür"
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr "Stok alınırken kalem değerini temel para birimine dönüştür"
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Satın Alma Siparişlerini Otomatik Tamamla"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "Tüm satırlar alındığında satın alma siparişini otomatikmen tamamlandı olarak işaretle"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Şifremi unuttum seçeneğini etkinleştir"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Oturum açma sayfasında şifremi unuttum özelliğini etkinleştir"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Kayıt olmayı etkinleştir"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Oturum açma sayfalarında kullanıcılar için kendini kaydetme özelliğini etkinleştir"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "SSO Etkinleştir"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "Oturum açma sayfalarında SSO etkinleştir"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "SSO ile kayıt olmayı etkinleştir"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Oturum açma sayfalarında kullanıcılar için SSO ile kendini kaydetmeyi etkinleştir"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "SSO grup eşitlemeyi etkinleştir"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "InvenTree gruplarını IdP tarafından sağlanan gruplar ile eşitlemeyi etkinleştir"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "SSO grup anahtarı"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr "IdP tarafından sağlanan talep özniteliğinin adı"
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr "SSO grup haritası"
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr "SSO gruplarından yerel InvenTree gruplarına bir eşleme. Yerel grup yoksa, oluşturulacaktır."
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr "SSO dışındaki grupları kaldır"
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr "IdP arka ucu tarafından olmayan, kullanıcıya atanmış grupların kaldırılıp kaldırılmayacağı. Bu ayarı etkisizleştirmek güvenlik sorunlarına neden olabilir"
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "E-posta Gerekir"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "Üyelik sırasında kullanıcının eposta sağlamasını gerektir"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "SSO kullanıcıları otomatik doldur"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Kullanıcı ayrıntılarını TOA hesabı verisinden otomatik olarak doldur"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "Postayı iki kez gir"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "Hesap oluştururken kullanıcıların postalarını iki kez girmelerini iste"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Şifreyi iki kez gir"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "Hesap oluştururken kullanıcıların şifrelerini iki kez girmesini iste"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Alanlara izin ver"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "Belirli alanlara hesap açmayı kısıtla (virgülle ayrılmış, @ ile başlayan)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Hesap oluştururken grup"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr "Yeni kullanıcıların kayıt sırasında atanacağı grup. Eğer TOA grup eşitlemesi etkinse, yalnızca ıdP'den hiçbir grup atanamazsa bu grup ayarlanır."
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "ÇFKD'yi Zorunlu Kıl"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "Kullanıcıların çok faktörlü kimlik doğrulamasını kullanması gerekmektedir."
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr "Bu ayarı etkinleştirmek, tüm kullanıcıların çok faktörlü kimlik doğrulamayı ayarlamasını gerektirecektir. Tüm oturumlar hemen kapatılacaktır."
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Başlangıçta eklentileri kontrol et"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "Başlangıçta tüm eklentilerin kurulmuş olduğunu kontrol et - konteyner ortamlarında etkinleştir"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "Eklenti güncellemelerini kontrol et"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "Kurulu eklentiler için periyodik güncelleme kontrolünü etkinleştir"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "URL entegrasyonunu etkinleştir"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "URL yönlendirmesi eklemek için eklentileri etkinleştir"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "Gezinti entegrasyonunu etkinleştir"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "Eklentilerin gezintiye entegre edilmesini etkinleştir"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "Uygulama entegrasyonunu etkinleştir"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "Uygulamalar eklemek için eklentileri etkinleştir"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "Zamanlama entegrasyonunu etkinleştir"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Zamanlanmış görevleri çalıştırmak için eklentileri etkinleştir"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "Olay entegrasyonunu etkinleştir"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "Eklentilerin olaylara yanıt verebilmesini etkinleştirin"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "Arayüz entegrasyonunu etkinleştir"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "Eklentilerin kullanıcı arayüzüne entegre olmasını etkinleştir"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr "Posta entegrasyonunu etkinleştir"
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr "Eklentilerin giden/gelen postaları işlemesini etkinleştir"
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr "Proje kodlarını etkinleştir"
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr "Projeleri takip etmek için proje kodlarını etkinleştir"
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr "Stok Sayımını Etkinleştir"
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr "Geçmiş stok seviyelerini ve değerini kaydetme işlevini etkinleştir"
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "Harici Konumları Hariç Tut"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr "Harici konumlardaki stok kalemlerini stok geçmişi hesaplamalarının dışında tut"
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "Otomatik Stok Sayımı Periyodu"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr "Otomatik stok geçmişi kaydı arasındaki gün sayısı"
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr "Eski Stok Geçmişi Girdilerini Sil"
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr "Belirtilen gün sayısından daha eski stok geçmişi girdilerini sil"
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr "Stok Geçmişi Silme Aralığı"
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr "Stok geçmişi girdileri belirtilen gün sayısı sonrasında silinecektir"
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr "Eski Stok Takip Kayıtlarını Sil"
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr "Belirtilen gün sayısından daha eski stok takip kayıtlarını sil"
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr "Stok Geçmişi Silme Aralığı"
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr "Stok takip kayıtları belirtilen gün sayısı sonrasında silinecektir"
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "Kullancıların tam isimlerini görüntüle"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Kullanıcı adı yerine kullanıcıların tam adlarını görüntüle"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr "Kullanıcı Profillerini Göster"
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr "Kullanıcıların Profillerini kendi profil sayfalarında göster"
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr "Haftanın başladığı gün"
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr "Takvimlerde görüntülemek için haftanın başlangıç günü"
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr "Pazar"
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr "Pazartesi"
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr "Salı"
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr "Çarşamba"
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr "Perşembe"
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr "Cuma"
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr "Cumartesi"
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr "Takvim Ufku"
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr "Takvim görünümlerinde görüntülenecek gelecek ayların sayısı"
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr "aylar"
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "Test İstasyon Verisini Etkinleştir"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "Test sonuçları için test istasyonundan veri toplamayı etkinleştir"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr "Makine Pingini Etkinleştir"
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr "Durumlarını kontrol etmek için kayıtlı makinelerin periyodik ping görevini etkinleştir"
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr "Sayım anındaki toplam mevcut stok"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Tarih"
@@ -8084,77 +8092,77 @@ msgstr "TME barkodları taraması için destek sağlar"
msgid "The Supplier which acts as 'TME'"
msgstr "'TME' rolünü üstlenen tedarikçi"
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr "Eklentileri yalnızca süper kullanıcı hesapları yönetebilir"
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr "Eklenti kurulumu devre dışı bırakıldı"
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr "Kurulum için bir paket adı veya URL belirtilmemiştir"
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr "Paket adı veya URL içinde geçersiz karakterler"
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "Eklenti kurulumu başarılı"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "Eklenti {path} yoluna kuruldu"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr "Eklenti kayıt defterinde bulunamadı"
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr "Eklenti paketlenmiş bir eklenti değildir"
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr "Eklenti paketi adı bulunamadı"
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr "Eklentileri yalnızca yetkili personel yönetebilir"
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr "Eklenti kaldırma devre dışı bırakıldı"
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr "Bu eklenti şu an aktif olduğundan kaldırılamaz"
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr "Eklenti zorunlu olduğu için kaldırılamaz"
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr "Eklenti örnek bir eklenti olduğu için kaldırılamaz"
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr "Eklenti yerleşik bir eklenti olduğu için kaldırılamaz"
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr "Eklenti kurulu değil"
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr "Eklenti kurulumu bulunamadı"
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr "Eklenti başarıyla kaldırıldı"
@@ -8206,21 +8214,21 @@ msgstr "Paket Eklenti"
msgid "Plugin"
msgstr "Eklenti"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "Yazar bulunamadı"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "'{p}' eklentisi, şu anki InvenTree sürümü {v} ile uyumlu değildir"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "Eklenti en az {v} sürümünü gerektirir"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "Eklenti en fazla {v} sürümünü gerektirir"
@@ -9218,7 +9226,7 @@ msgstr "Miktar seri numaları ile eşleşmiyor"
msgid "Cannot assign stock to structural location"
msgstr "Stok, yapısal bir konuma atanamaz"
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr "Test şablonu mevcut değil"
@@ -9238,7 +9246,7 @@ msgstr "Stok kalemi başka kalemleri de içermektedir"
msgid "Stock item has been assigned to a customer"
msgstr "Stok kalemi bir müşteriye atanmıştır"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "Stok kalemi şu anda üretim aşamasındadır"
@@ -9262,71 +9270,71 @@ msgstr "Stok kalemleri aynı tedarikçi parçasını ifade etmelidir"
msgid "Stock status codes must match"
msgstr "Stok durum kodları eşleşmelidir"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "Stok kalemi stokta olmadığı için taşınamaz"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr "Stok Kalemi Takibi"
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Giriş notları"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr "Stok Kalemi Test Sonucu"
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Bu test için değer sağlanmalıdır"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "Bu test için dosya eki yüklenmelidir"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr "Bu tet için geçersiz değer"
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Test sonucu"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "Test çıktı değeri"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "Test sonucu eki"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "Test notları"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr "Test istasyonu"
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr "Testin gerçekleştirildiği test istasyonunun tanımlayıcısı"
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr "Başladı"
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr "Test başlangıcı zaman damgası"
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr "Bitti"
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr "Test bitişi zaman damgası"
@@ -9440,8 +9448,8 @@ msgstr "Stok kalemi belirtilmedi"
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "Miktar, mevcut stok miktarını ({q}) aşmamalıdır"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "Hedef stok konumu"
@@ -9565,7 +9573,7 @@ msgstr "Seçili şirket bir müşteri değil"
msgid "Stock assignment notes"
msgstr "Stok tahsis notları"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "Bir stok kalemleri listesi girilmelidir"
@@ -9613,27 +9621,31 @@ msgstr "Stok kalemi zaten stokta"
msgid "Quantity must not be negative"
msgstr "Miktar negatif olamaz"
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "Stok aktarım notları"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr "Sayılan kalemler için stok konumunu belirle (isteğe bağlı)"
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr "Mevcut stokla birleştir"
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "Stok aktarım notları"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr "Sayılan kalemler için stok konumunu belirle (isteğe bağlı)"
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr "Mümkünse iade edilen ürünleri mevcut stoklarla birleştir"
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr "Sıradaki Seri Numarası"
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr "Önceki Seri Numarası"
diff --git a/src/backend/InvenTree/locale/uk/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/uk/LC_MESSAGES/django.po
index 9b1486de18..195114c9cf 100644
--- a/src/backend/InvenTree/locale/uk/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/uk/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Ukrainian\n"
"Language: uk_UA\n"
@@ -109,9 +109,9 @@ msgstr "Неправильне десяткове значення"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Нотатки"
@@ -550,13 +550,13 @@ msgstr ""
msgid "Parent Build"
msgstr ""
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr ""
msgid "Allocated"
msgstr ""
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr ""
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Доступно"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr ""
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr ""
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Місце"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr ""
msgid "Unit definition"
msgstr ""
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr ""
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr ""
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr ""
@@ -2673,8 +2673,8 @@ msgstr ""
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr ""
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr ""
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr ""
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr ""
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr ""
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr ""
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr ""
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr ""
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr ""
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr ""
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr ""
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr ""
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr ""
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr ""
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr ""
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr ""
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr ""
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr ""
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr ""
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr ""
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr ""
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr "Чи призначені групи користувачеві повинні бути видалені, якщо вони не є резервним сервером IdP. Відключення цього налаштування може спричинити проблеми безпеки"
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr ""
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr ""
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr ""
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr ""
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr ""
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr ""
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr ""
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr ""
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr ""
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr ""
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr ""
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr ""
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr ""
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr ""
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr ""
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr ""
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr ""
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr ""
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr ""
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr ""
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr ""
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr ""
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr ""
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr ""
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr ""
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr ""
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr ""
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr ""
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr ""
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr ""
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr ""
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Дата"
@@ -8084,77 +8092,77 @@ msgstr ""
msgid "The Supplier which acts as 'TME'"
msgstr ""
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr ""
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr ""
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr ""
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr ""
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr ""
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr ""
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr ""
@@ -9218,7 +9226,7 @@ msgstr ""
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr ""
msgid "Stock item has been assigned to a customer"
msgstr ""
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr ""
@@ -9262,71 +9270,71 @@ msgstr ""
msgid "Stock status codes must match"
msgstr ""
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr ""
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr ""
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr ""
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr ""
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr ""
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr ""
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr ""
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr ""
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr ""
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr ""
@@ -9565,7 +9573,7 @@ msgstr ""
msgid "Stock assignment notes"
msgstr ""
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr ""
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr ""
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr ""
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/vi/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/vi/LC_MESSAGES/django.po
index 236cb86277..9c70fca6d7 100644
--- a/src/backend/InvenTree/locale/vi/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/vi/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Vietnamese\n"
"Language: vi_VN\n"
@@ -109,9 +109,9 @@ msgstr ""
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "Ghi chú"
@@ -550,13 +550,13 @@ msgstr "Trạng thái đặt hàng"
msgid "Parent Build"
msgstr "Phiên bản cha"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr ""
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr ""
msgid "Allocated"
msgstr "Đã cấp phát"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "Đã dùng"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "Có sẵn"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "Bật đơn hàng"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr ""
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "Tạo đơn hàng"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "Địa điểm"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr ""
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr ""
@@ -1830,7 +1830,7 @@ msgstr "Định nghĩa"
msgid "Unit definition"
msgstr "Định nghĩa đơn vị"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "Đính kèm"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr ""
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "Giá trị"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr ""
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "Kết quả"
@@ -2673,8 +2673,8 @@ msgstr "Mức độ thường xuyên để cập nhật tỉ giá hối đoái (
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "ngày"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr ""
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "Mã tham chiếu đơn đặt bản dựng"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "Mẫu bắt buộc cho để trường tham chiếu đơn đặt bản dựng"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr ""
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr ""
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr ""
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr ""
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr ""
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr ""
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr ""
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr ""
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr ""
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr ""
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr ""
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr ""
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr ""
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr ""
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "Bật đơn hàng trả lại"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "Bật chức năng đơn hàng trả lại trong giao diện người dùng"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "Mẫu tham chiếu đơn hàng trả lại"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr ""
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "Sửa đơn hàng trả lại đã hoàn thành"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "Cho phép sửa đơn hàng trả lại sau khi đã hoàn thành rồi"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "Mẫu tham chiếu đơn đặt hàng"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "Mẫu bắt buộc để tạo trường tham chiếu đơn đặt hàng"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "Vận chuyển mặc định đơn đặt hàng"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "Cho phép tạo vận chuyển mặc định với đơn đặt hàng"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "Sửa đơn đặt hàng đã hoàn thành"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "Cho phép sửa đơn đặt hàng sau khi đã vận chuyển hoặc hoàn thành"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr ""
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr ""
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr ""
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr ""
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "Mẫu tham chiếu đơn đặt mua"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "Mẫu bắt buộc cho để trường tham chiếu đơn đặt mua"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "Sửa đơn đặt mua đã hoàn thành"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "Cho phép sửa đơn đặt mua sau khi đã vận chuyển hoặc hoàn thành"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr ""
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr ""
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "Tự động hoàn thành đơn đặt mua"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr ""
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "Bật quên mật khẩu"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "Bật chức năng quên mật khẩu trong trang đăng nhập"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "Bật đăng ký"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "Cho phép người dùng tự đăng ký tại trang đăng nhập"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "Bật SSO"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "Cho phép SSO tại trang đăng nhập"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "Bật đăng ký SSO"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "Cho phép người dùng tự đăng ký SSO tại trang đăng nhập"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr ""
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr ""
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr ""
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr ""
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr ""
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr ""
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr ""
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr ""
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "Yêu cầu email"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "Yêu cầu người dùng cung cấp email để đăng ký"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "Người dùng tự động điền SSO"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "Tự động điền thông tin chi tiết từ dữ liệu tài khoản SSO"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "Thư 2 lần"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "Khi đăng ký sẽ hỏi người dùng hai lần thư điện tử của họ"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "Mật khẩu 2 lần"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "Khi đăng ký sẽ hỏi người dùng hai lần mật khẩu của họ"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "Các tên miền được phép"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "Cấm đăng ký với 1 số tên miền cụ thể (dấu phẩy ngăn cách, bắt đầu với dấu @)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "Nhóm khi đăng ký"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr ""
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "Bắt buộc MFA"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "Người dùng phải sử dụng bảo mật đa nhân tố."
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr ""
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "Kiểm tra phần mở rộng khi khởi động"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "Kiểm tra toàn bộ phần mở rộng đã được cài đặt khi khởi dộng - bật trong môi trường ảo hóa"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "Kiểm tra cập nhật plugin"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr ""
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "Bật tích hợp URL"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "Bật phần mở rộng để thêm định tuyến URL"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "Bật tích hợp điều hướng"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "Bật phần mở rộng để tích hợp thanh định hướng"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "Bật tích hợp ứng dụng"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "Bật phần mở rộng để thêm ứng dụng"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "Cho phép tích hợp lập lịch"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "Bật phẩn mở rộng để chạy các tác vụ theo lịch"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "Bật tích hợp nguồn cấp sự kiện"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "Bật phần mở rộng để trả lời sự kiện bên trong"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr ""
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr ""
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr ""
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr ""
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr ""
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr ""
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr ""
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr ""
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "Ngoại trừ vị trí bên ngoài"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr ""
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "Giai đoạn kiểm kê tự động"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr ""
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr ""
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr ""
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr ""
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr ""
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr ""
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr ""
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "Hiển thị tên đầy đủ của người dùng"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "Hiển thị tên đầy đủ thay vì tên đăng nhập"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr ""
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr ""
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr ""
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr ""
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr ""
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr ""
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr "Tống số kho tại thời điểm kiểm kê"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "Ngày"
@@ -8084,77 +8092,77 @@ msgstr "Cung cấp khả năng quét mã vạch TME"
msgid "The Supplier which acts as 'TME'"
msgstr "Nhà cung cấp hoạt động như 'TME'"
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr ""
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr ""
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr ""
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr ""
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "Cài đặt phần mở rộng thành công"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "Cài đặt phần bổ sung đến {path}"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr ""
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr ""
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr ""
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr ""
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr ""
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr ""
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr ""
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr ""
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr ""
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr ""
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr ""
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr ""
@@ -8206,21 +8214,21 @@ msgstr ""
msgid "Plugin"
msgstr "Phần bổ sung"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "Không tìm thấy tác giả"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "Phần bổ sung '{p}' không tương thích với phiên bản InvenTree hiện tại {v}"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "Phần bổ sung yêu cầu ít nhất phiên bản {v}"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "Phần bổ sung yêu cầu tối đa phiên bản {v}"
@@ -9218,7 +9226,7 @@ msgstr "Số lượng không khớp với số sêri"
msgid "Cannot assign stock to structural location"
msgstr ""
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr ""
@@ -9238,7 +9246,7 @@ msgstr "Hàng trong kho chứa hàng hóa khác"
msgid "Stock item has been assigned to a customer"
msgstr "Hàng trong kho đã được gắn với một khách hàng"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "Hàng trong kho hiện đang sản xuất"
@@ -9262,71 +9270,71 @@ msgstr "Mặt hàng phải tham chiếu đến sản phẩm nhà cung cấp tư
msgid "Stock status codes must match"
msgstr "Mã trạng thái kho phải phù hợp"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "Không thể xóa mặt hàng không ở trong kho"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr ""
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "Ghi chú đầu vào"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr ""
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "Phải cung cấp giá trị cho kiểm thử này"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "Phải tải liên đính kèm cho kiểm thử này"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr ""
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "Kết quả kiểm thử"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "Giá trị đầu ra kiểm thử"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "Đính kèm kết quả kiểm thử"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "Ghi chú kiểm thử"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr ""
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr ""
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr ""
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr ""
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr ""
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr ""
@@ -9440,8 +9448,8 @@ msgstr ""
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "Số lượng phải không vượt quá số lượng trong kho đang có ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "Vị trí kho đích"
@@ -9565,7 +9573,7 @@ msgstr "Công ty đã chọn không phải là khách hàng"
msgid "Stock assignment notes"
msgstr "Ghi chú phân bổ kho"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "Phải cung cấp danh sách mặt hàng"
@@ -9613,27 +9621,31 @@ msgstr ""
msgid "Quantity must not be negative"
msgstr ""
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "Ghi chú giao dịch kho"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr ""
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "Ghi chú giao dịch kho"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr ""
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr ""
diff --git a/src/backend/InvenTree/locale/zh_Hans/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/zh_Hans/LC_MESSAGES/django.po
index baffe26bae..46a09a4c2b 100644
--- a/src/backend/InvenTree/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/zh_Hans/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
@@ -109,9 +109,9 @@ msgstr "无效的数值"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "备注"
@@ -550,13 +550,13 @@ msgstr "订单状态"
msgid "Parent Build"
msgstr "父级生产订单"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "包含变体"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "未结算订单"
msgid "Allocated"
msgstr "已分配"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "已消耗"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "可用数量"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "已订购"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr "未找到版本"
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "生产订单"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "库存位置"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr "产出"
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr "按产出库存项ID筛选,使用“null”查找未安装的生产项。"
@@ -1830,7 +1830,7 @@ msgstr "定义"
msgid "Unit definition"
msgstr "单位定义"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "附件"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr "等同于商业逻辑中自定义状态的状态逻辑键"
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "值"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr "扫描条形码的响应数据"
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "结果"
@@ -2673,8 +2673,8 @@ msgstr "检查更新的频率(设置为零以禁用)"
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "天"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "允许对当前库存量为零的物品执行库位间调拨操作"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "生产订单参考模式"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "生成生产订单参考字段所需的模式"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "要求负责人"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "必须为每个订单分配一个负责人"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr "需要活动零件"
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr "防止为非活动零件创建生产订单"
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr "需要锁定零件"
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr "防止为未锁定的零件创建生产订单"
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr "需要有效的物料清单"
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr "除非物料清单已验证,否则禁止创建生产订单"
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr "需要关闭子订单"
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr "在所有子订单关闭之前,阻止生产订单的完成"
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr "外部生产订单"
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr "启用外部生产订单功能"
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr "需要外部生产订单"
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr "从外部供应商订购组装好的零件时,需要外部生产订单"
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "阻止直到测试通过"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "在所有必要的测试通过之前,阻止产出完成"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "启用订单退货"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "在用户界面中启用订单退货功能"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "退货订单参考模式"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "生成退货订单参考字段所需的模式"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "编辑已完成的退货订单"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "允许编辑已完成的退货订单"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "销售订单参考模式"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "生成销售订单参考字段所需参照模式"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "销售订单默认配送方式"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "启用创建销售订单的默认配送功能"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "编辑已完成的销售订单"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "允许在订单配送或完成后编辑销售订单"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr "货件需核对"
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr "只有所有物品均经核对,才能确认发货完成"
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "标记该订单为已完成?"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "标记为已发货的销售订单将自动完成,绕过“已发货”状态"
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr "阻止未完成项目测试"
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr "如果所需的物料测试未完成,则阻止将库存物料分配给销售订单"
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "采购订单参考模式"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "生成采购订单参考字段所需的模式"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "编辑已完成的采购订单"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "允许在采购订单已配送或完成后编辑订单"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr "货币转换"
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr "收货时将物料价值折算为基准货币"
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "自动完成采购订单"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "当收到所有行项目时,自动将采购订单标记为完成"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "忘记启用密码"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "在登录页面上启用忘记密码功能"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "启用注册"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "在登录页面为用户启用自行注册功能"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "启用SSO登录"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "在登录页面启用单点登录(SSO)功能"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "启用SSO注册"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "允许用户通过登录页面的SSO系统注册账号"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "启用SSO组同步"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "启用后,将自动同步InvenTree用户组与身份提供商(IdP)提供的用户组"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "SSO组属性键"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr "身份提供商(IdP)返回的组信息声明属性名称"
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr "SSO组映射关系"
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr "将SSO用户组映射到本地InvenTree用户组的对应关系表。如果本地组不存在,系统会自动创建对应的用户组。"
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr "移除非SSO来源的用户组"
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr "当用户组未被身份提供商(IdP)支持时,是否移除该用户组。禁用此选项可能导致安全风险"
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "必须提供邮箱"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "用户注册时必须提供邮箱"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "自动填充SSO用户信息"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "自动从SSO账户数据中填充用户详细信息"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "发两次邮件"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "注册时询问用户他们的电子邮件两次"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "两次输入密码"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "当注册时请用户输入密码两次"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "域名白名单"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "限制注册到某些域名 (逗号分隔,以 @ 开头)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "注册默认分组"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr "新用户注册时被分配的默认用户组。 如果启用了SSO组同步功能,当无法从身份提供商(IdP)分配组时才会应用此分组。"
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "强制启用多因素安全认证"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "用户必须使用多因素安全认证。"
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr "启用此设置将要求所有用户设置多元素认证。所有会话将立即断开连接。"
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "启动时检查插件"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "启动时检查全部插件是否已安装 - 在容器环境中启用"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "检查插件更新"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "启用定期检查已安装插件的更新"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "启用统一资源定位符集成"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "启用插件以添加统一资源定位符路由"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "启用导航集成"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "启用插件以集成到导航中"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "启用应用集成"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "启用插件添加应用"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "启用调度集成"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "启用插件来运行预定任务"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "启用事件集成"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "启用插件响应内部事件"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "启用界面集成"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "启用插件集成到用户界面"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr "启用邮件集成"
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr "启用插件来处理发送/接收邮件"
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr "启用项目编码"
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr "启用项目编码来跟踪项目"
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr "启用盘点"
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr "启用历史库存水平及价值记录功能"
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "排除外部地点"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr "将外部库位的库存物料排除在盘点计算之外"
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "自动盘点周期"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr "自动库存盘点记录的间隔天数"
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr "删除旧的盘点记录条目"
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr "删除超过指定天数的库存盘点记录"
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr "库存盘点记录删除周期"
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr "库存盘点记录将在指定天数后自动删除"
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr "删除旧的库存跟踪记录"
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr "删除超过指定天数的库存跟踪记录"
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr "库存跟踪记录删除周期"
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr "库存跟踪记录将在指定天数后自动删除"
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "显示用户全名"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "显示用户全名而不是用户名"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr "显示用户配置"
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr "在用户个人资料页展示其档案信息"
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr "一周从……开始"
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr "星期几的起始日,用于在日历视图中显示"
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr "星期天"
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr "星期一"
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr "星期二"
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr "星期三"
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr "星期四"
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr "星期五"
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr "星期六"
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "启用测试站数据"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "启用测试站数据收集以获取测试结果"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr "启用设备状态检测"
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr "启用定期 Ping 检测,确认注册设备的运行状态"
@@ -6645,7 +6653,7 @@ msgid "Total available stock at time of stocktake"
msgstr "盘点时可用库存总额"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "日期"
@@ -8086,77 +8094,77 @@ msgstr "为扫描 TME 条形码提供支持"
msgid "The Supplier which acts as 'TME'"
msgstr "作为‘TME’的供应商"
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr "只有超级用户帐户可以管理插件"
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr "插件安装已禁用"
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr "没有为安装提供软件包名称或URL"
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr "包名或 URL 中有无效字符"
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "插件安装成功"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "插件安装到 {path}"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr "在插件仓库中找不到插件"
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr "插件不是一个打包的插件"
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr "找不到插件包名称"
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr "只有员工用户可以管理插件"
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr "插件卸载已禁用"
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr "插件无法卸载,因为它目前处于激活状态"
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr "该插件为系统必需组件,无法卸载"
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr "该插件为示例插件,无法卸载"
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr "该插件为系统内置组件,无法卸载"
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr "插件未安装"
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr "未找到插件安装记录"
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr "插件卸载成功"
@@ -8208,21 +8216,21 @@ msgstr "软件包插件"
msgid "Plugin"
msgstr "插件"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "未找到作者"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "插件 '{p}' 与当前 InvenTree 版本{v} 不兼容"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "插件所需最低版本 {v}"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "插件所需最高版本 {v}"
@@ -9220,7 +9228,7 @@ msgstr "数量不匹配序列号"
msgid "Cannot assign stock to structural location"
msgstr "无法将库存分配到结构位置"
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr "测试模板不存在"
@@ -9240,7 +9248,7 @@ msgstr "库存项包含其他项目"
msgid "Stock item has been assigned to a customer"
msgstr "库存项已分配给客户"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "库存项目前正在生产"
@@ -9264,71 +9272,71 @@ msgstr "库存项必须是同一供应商的零件"
msgid "Stock status codes must match"
msgstr "库存状态码必须匹配"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "库存项不能移动,因为它没有库存"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr "库存项跟踪"
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "条目注释"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr "库存项测试结果"
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "必须为此测试提供值"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "测试附件必须上传"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr "此测试的值无效"
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "测试结果"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "测试输出值"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "测验结果附件"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "测试备注"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr "测试站"
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr "进行测试的测试站的标识符"
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr "已开始"
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr "测试开始的时间戳"
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr "已完成"
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr "测试结束的时间戳"
@@ -9442,8 +9450,8 @@ msgstr "未提供库存项"
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "数量不得超过现有库存量 ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "目标库存位置"
@@ -9567,7 +9575,7 @@ msgstr "所选公司不是客户"
msgid "Stock assignment notes"
msgstr "库存分配说明"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "必须提供库存物品清单"
@@ -9615,27 +9623,31 @@ msgstr "库存项已有现货"
msgid "Quantity must not be negative"
msgstr "数量不得为负"
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "库存交易记录"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr "合并至现有库存"
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "库存交易记录"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr "若可行,将退回项目合并至现有库存项"
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr "下一个序列号"
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr "上一个序列号"
diff --git a/src/backend/InvenTree/locale/zh_Hant/LC_MESSAGES/django.po b/src/backend/InvenTree/locale/zh_Hant/LC_MESSAGES/django.po
index 4c4ceb6763..8368747042 100644
--- a/src/backend/InvenTree/locale/zh_Hant/LC_MESSAGES/django.po
+++ b/src/backend/InvenTree/locale/zh_Hant/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-06-24 00:46+0000\n"
-"PO-Revision-Date: 2026-06-24 00:49\n"
+"POT-Creation-Date: 2026-06-24 14:25+0000\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Chinese Traditional\n"
"Language: zh_TW\n"
@@ -109,9 +109,9 @@ msgstr "無效的十進位數值"
#: build/serializers.py:549 build/serializers.py:1744 company/models.py:824
#: order/models.py:2039
#: report/templates/report/inventree_build_order_report.html:172
-#: stock/models.py:3063 stock/models.py:3187 stock/serializers.py:749
+#: stock/models.py:3122 stock/models.py:3246 stock/serializers.py:749
#: stock/serializers.py:925 stock/serializers.py:1067 stock/serializers.py:1451
-#: stock/serializers.py:1540 stock/serializers.py:1739
+#: stock/serializers.py:1540 stock/serializers.py:1748
msgid "Notes"
msgstr "備註"
@@ -550,13 +550,13 @@ msgstr "訂單狀態"
msgid "Parent Build"
msgstr "上層生產工單"
-#: build/api.py:87 build/api.py:1024 order/api.py:564 order/api.py:789
+#: build/api.py:87 build/api.py:1042 order/api.py:564 order/api.py:789
#: order/api.py:1235 order/api.py:1546 order/api.py:1837 order/api.py:2027
#: stock/api.py:593
msgid "Include Variants"
msgstr "包含變體"
-#: build/api.py:103 build/api.py:477 build/api.py:1038 build/models.py:283
+#: build/api.py:103 build/api.py:477 build/api.py:1056 build/models.py:283
#: build/serializers.py:1169 build/serializers.py:1345
#: build/serializers.py:1438 company/models.py:1034 company/serializers.py:426
#: order/api.py:315 order/api.py:319 order/api.py:946 order/api.py:1248
@@ -692,52 +692,52 @@ msgstr "訂單未完成"
msgid "Allocated"
msgstr "已分配"
-#: build/api.py:501 build/models.py:1741 build/serializers.py:1398
+#: build/api.py:517 build/models.py:1741 build/serializers.py:1398
msgid "Consumed"
msgstr "已消耗"
-#: build/api.py:510 company/models.py:879 company/serializers.py:403
+#: build/api.py:526 company/models.py:879 company/serializers.py:403
#: templates/email/build_order_required_stock.html:19
#: templates/email/low_stock_notification.html:17
#: templates/email/part_event_notification.html:18
msgid "Available"
msgstr "可用數量"
-#: build/api.py:549 build/serializers.py:1483 company/serializers.py:400
+#: build/api.py:567 build/serializers.py:1483 company/serializers.py:400
#: order/serializers.py:1388 order/serializers.py:2741 part/serializers.py:900
#: part/serializers.py:1228 part/serializers.py:1811
msgid "On Order"
msgstr "已訂購"
-#: build/api.py:702
+#: build/api.py:720
msgid "Build not found"
msgstr "找不到生產記錄"
-#: build/api.py:1061 build/models.py:120 order/models.py:2249
+#: build/api.py:1079 build/models.py:120 order/models.py:2249
#: report/templates/report/inventree_build_order_report.html:105
#: stock/serializers.py:94 templates/email/build_order_completed.html:16
#: templates/email/overdue_build_order.html:15
msgid "Build Order"
msgstr "生產工單"
-#: build/api.py:1075 build/api.py:1079 build/serializers.py:374
+#: build/api.py:1093 build/api.py:1097 build/serializers.py:374
#: build/serializers.py:487 build/serializers.py:536 build/serializers.py:1219
#: build/serializers.py:1225 order/api.py:1295 order/api.py:1300
#: order/api.py:2079 order/api.py:2084 order/serializers.py:886
#: order/serializers.py:1026 order/serializers.py:2314 part/serializers.py:1387
#: stock/api.py:1028 stock/serializers.py:112 stock/serializers.py:622
#: stock/serializers.py:742 stock/serializers.py:920 stock/serializers.py:1533
-#: stock/serializers.py:1768 stock/serializers.py:1872
-#: stock/serializers.py:1921 templates/email/stale_stock_notification.html:18
+#: stock/serializers.py:1777 stock/serializers.py:1881
+#: stock/serializers.py:1972 templates/email/stale_stock_notification.html:18
#: users/models.py:545
msgid "Location"
msgstr "地點"
-#: build/api.py:1087 part/serializers.py:1412
+#: build/api.py:1105 part/serializers.py:1412
msgid "Output"
msgstr "產出"
-#: build/api.py:1089
+#: build/api.py:1107
msgid "Filter by output stock item ID. Use 'null' to find uninstalled build items."
msgstr "依產出庫存項目 ID 篩選。使用 'null' 尋找未安裝的生產項目。"
@@ -1830,7 +1830,7 @@ msgstr "定義"
msgid "Unit definition"
msgstr "單位定義"
-#: common/models.py:1954 common/models.py:2106 stock/models.py:3182
+#: common/models.py:1954 common/models.py:2106 stock/models.py:3241
#: stock/serializers.py:259
msgid "Attachment"
msgstr "附件"
@@ -1948,7 +1948,7 @@ msgid "State logical key that is equal to this custom state in business logic"
msgstr "等同於商業邏輯中自定義狀態的狀態邏輯鍵"
#: common/models.py:2297 common/models.py:2564 machine/serializers.py:27
-#: report/templates/report/inventree_test_report.html:104 stock/models.py:3174
+#: report/templates/report/inventree_test_report.html:104 stock/models.py:3233
msgid "Value"
msgstr "值"
@@ -2283,7 +2283,7 @@ msgid "Response data from the barcode scan"
msgstr "掃描條碼的響應數據"
#: common/models.py:3073 report/templates/report/inventree_test_report.html:103
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Result"
msgstr "結果"
@@ -2673,8 +2673,8 @@ msgstr "檢查更新的頻率(設置為零以禁用)"
#: common/setting/system.py:335 common/setting/system.py:344
#: common/setting/system.py:353 common/setting/system.py:600
#: common/setting/system.py:628 common/setting/system.py:753
-#: common/setting/system.py:1190 common/setting/system.py:1206
-#: common/setting/system.py:1223
+#: common/setting/system.py:1198 common/setting/system.py:1214
+#: common/setting/system.py:1231
msgid "days"
msgstr "天"
@@ -3277,538 +3277,546 @@ msgid "Allow stock items which are not in stock to be transferred between stock
msgstr "允許非庫存的庫存項目在庫存位置之間轉移"
#: common/setting/system.py:797
+msgid "Merge stock with existing stock on transfer by default"
+msgstr ""
+
+#: common/setting/system.py:799
+msgid "Default state for merge stock on transfer behaviour. (Can be changed per transfer if desired)"
+msgstr ""
+
+#: common/setting/system.py:805
msgid "Build Order Reference Pattern"
msgstr "生產訂單參考模式"
-#: common/setting/system.py:798
+#: common/setting/system.py:806
msgid "Required pattern for generating Build Order reference field"
msgstr "生成生產訂單參考字段所需的模式"
-#: common/setting/system.py:803 common/setting/system.py:871
-#: common/setting/system.py:891 common/setting/system.py:941
-#: common/setting/system.py:963
+#: common/setting/system.py:811 common/setting/system.py:879
+#: common/setting/system.py:899 common/setting/system.py:949
+#: common/setting/system.py:971
msgid "Require Responsible Owner"
msgstr "要求負責人"
-#: common/setting/system.py:804 common/setting/system.py:872
-#: common/setting/system.py:892 common/setting/system.py:942
-#: common/setting/system.py:964
+#: common/setting/system.py:812 common/setting/system.py:880
+#: common/setting/system.py:900 common/setting/system.py:950
+#: common/setting/system.py:972
msgid "A responsible owner must be assigned to each order"
msgstr "必須為每個訂單分配一個負責人"
-#: common/setting/system.py:809
+#: common/setting/system.py:817
msgid "Require Active Part"
msgstr "需要活動零件"
-#: common/setting/system.py:810
+#: common/setting/system.py:818
msgid "Prevent build order creation for inactive parts"
msgstr "防止為非活動零件創建生產訂單"
-#: common/setting/system.py:815
+#: common/setting/system.py:823
msgid "Require Locked Part"
msgstr "需要鎖定零件"
-#: common/setting/system.py:816
+#: common/setting/system.py:824
msgid "Prevent build order creation for unlocked parts"
msgstr "防止為未鎖定的零件創建生產訂單"
-#: common/setting/system.py:821
+#: common/setting/system.py:829
msgid "Require Valid BOM"
msgstr "需要有效的物料清單"
-#: common/setting/system.py:822
+#: common/setting/system.py:830
msgid "Prevent build order creation unless BOM has been validated"
msgstr "除非物料清單已驗證,否則禁止創建生產訂單"
-#: common/setting/system.py:827
+#: common/setting/system.py:835
msgid "Require Closed Child Orders"
msgstr "需要關閉子訂單"
-#: common/setting/system.py:829
+#: common/setting/system.py:837
msgid "Prevent build order completion until all child orders are closed"
msgstr "在所有子訂單關閉之前,阻止生產訂單的完成"
-#: common/setting/system.py:835
+#: common/setting/system.py:843
msgid "External Build Orders"
msgstr "外部生產工單"
-#: common/setting/system.py:836
+#: common/setting/system.py:844
msgid "Enable external build order functionality"
msgstr "啟用外部生產工單功能"
-#: common/setting/system.py:841
+#: common/setting/system.py:849
msgid "Require External Build Orders"
msgstr ""
-#: common/setting/system.py:843
+#: common/setting/system.py:851
msgid "Require an external build order when ordering assembled parts from an external supplier"
msgstr ""
-#: common/setting/system.py:849
+#: common/setting/system.py:857
msgid "Block Until Tests Pass"
msgstr "阻止直到測試通過"
-#: common/setting/system.py:851
+#: common/setting/system.py:859
msgid "Prevent build outputs from being completed until all required tests pass"
msgstr "在所有必要的測試通過之前,阻止產出完成"
-#: common/setting/system.py:857
+#: common/setting/system.py:865
msgid "Enable Return Orders"
msgstr "啓用訂單退貨"
-#: common/setting/system.py:858
+#: common/setting/system.py:866
msgid "Enable return order functionality in the user interface"
msgstr "在用户界面中啓用訂單退貨功能"
-#: common/setting/system.py:863
+#: common/setting/system.py:871
msgid "Return Order Reference Pattern"
msgstr "退貨訂單參考模式"
-#: common/setting/system.py:865
+#: common/setting/system.py:873
msgid "Required pattern for generating Return Order reference field"
msgstr "生成退貨訂單參考字段所需的模式"
-#: common/setting/system.py:877
+#: common/setting/system.py:885
msgid "Edit Completed Return Orders"
msgstr "編輯已完成的退貨訂單"
-#: common/setting/system.py:879
+#: common/setting/system.py:887
msgid "Allow editing of return orders after they have been completed"
msgstr "允許編輯已完成的退貨訂單"
-#: common/setting/system.py:885
+#: common/setting/system.py:893
msgid "Sales Order Reference Pattern"
msgstr "銷售訂單參考模式"
-#: common/setting/system.py:886
+#: common/setting/system.py:894
msgid "Required pattern for generating Sales Order reference field"
msgstr "生成銷售訂單參考字段所需參照模式"
-#: common/setting/system.py:897
+#: common/setting/system.py:905
msgid "Sales Order Default Shipment"
msgstr "銷售訂單默認配送方式"
-#: common/setting/system.py:898
+#: common/setting/system.py:906
msgid "Enable creation of default shipment with sales orders"
msgstr "啓用創建銷售訂單的默認配送功能"
-#: common/setting/system.py:903
+#: common/setting/system.py:911
msgid "Edit Completed Sales Orders"
msgstr "編輯已完成的銷售訂單"
-#: common/setting/system.py:905
+#: common/setting/system.py:913
msgid "Allow editing of sales orders after they have been shipped or completed"
msgstr "允許在訂單配送或完成後編輯銷售訂單"
-#: common/setting/system.py:911
+#: common/setting/system.py:919
msgid "Shipment Requires Checking"
msgstr "發貨需要檢查"
-#: common/setting/system.py:913
+#: common/setting/system.py:921
msgid "Prevent completion of shipments until items have been checked"
msgstr "在項目被檢查前,防止完成發貨"
-#: common/setting/system.py:919
+#: common/setting/system.py:927
msgid "Mark Shipped Orders as Complete"
msgstr "標記該訂單為已完成?"
-#: common/setting/system.py:921
+#: common/setting/system.py:929
msgid "Sales orders marked as shipped will automatically be completed, bypassing the \"shipped\" status"
msgstr "標記為已發貨的銷售訂單將自動完成,繞過“已發貨”狀態"
-#: common/setting/system.py:927
+#: common/setting/system.py:935
msgid "Enable Transfer Orders"
msgstr ""
-#: common/setting/system.py:928
+#: common/setting/system.py:936
msgid "Enable transfer order functionality in the user interface"
msgstr ""
-#: common/setting/system.py:933
+#: common/setting/system.py:941
msgid "Transfer Order Reference Pattern"
msgstr ""
-#: common/setting/system.py:935
+#: common/setting/system.py:943
msgid "Required pattern for generating Transfer Order reference field"
msgstr ""
-#: common/setting/system.py:947
+#: common/setting/system.py:955
msgid "Block Incomplete Item Tests"
msgstr ""
-#: common/setting/system.py:949
+#: common/setting/system.py:957
msgid "Prevent allocation of stock items to sales orders if required item tests are incomplete"
msgstr ""
-#: common/setting/system.py:955
+#: common/setting/system.py:963
msgid "Purchase Order Reference Pattern"
msgstr "採購訂單參考模式"
-#: common/setting/system.py:957
+#: common/setting/system.py:965
msgid "Required pattern for generating Purchase Order reference field"
msgstr "生成採購訂單參考字段所需的模式"
-#: common/setting/system.py:969
+#: common/setting/system.py:977
msgid "Edit Completed Purchase Orders"
msgstr "編輯已完成的採購訂單"
-#: common/setting/system.py:971
+#: common/setting/system.py:979
msgid "Allow editing of purchase orders after they have been shipped or completed"
msgstr "允許在採購訂單已配送或完成後編輯訂單"
-#: common/setting/system.py:977
+#: common/setting/system.py:985
msgid "Convert Currency"
msgstr "轉換幣別"
-#: common/setting/system.py:978
+#: common/setting/system.py:986
msgid "Convert item value to base currency when receiving stock"
msgstr "收貨時將項目價值換算為基準幣別"
-#: common/setting/system.py:983
+#: common/setting/system.py:991
msgid "Auto Complete Purchase Orders"
msgstr "自動完成採購訂單"
-#: common/setting/system.py:985
+#: common/setting/system.py:993
msgid "Automatically mark purchase orders as complete when all line items are received"
msgstr "當收到所有行項目時,自動將採購訂單標記為完成"
-#: common/setting/system.py:992
+#: common/setting/system.py:1000
msgid "Enable password forgot"
msgstr "忘記啓用密碼"
-#: common/setting/system.py:993
+#: common/setting/system.py:1001
msgid "Enable password forgot function on the login pages"
msgstr "在登錄頁面上啓用忘記密碼功能"
-#: common/setting/system.py:998
+#: common/setting/system.py:1006
msgid "Enable registration"
msgstr "啓用註冊"
-#: common/setting/system.py:999
+#: common/setting/system.py:1007
msgid "Enable self-registration for users on the login pages"
msgstr "在登錄頁面為用户啓用自行註冊功能"
-#: common/setting/system.py:1004
+#: common/setting/system.py:1012
msgid "Enable SSO"
msgstr "啓用單點登錄"
-#: common/setting/system.py:1005
+#: common/setting/system.py:1013
msgid "Enable SSO on the login pages"
msgstr "在登錄界面啓用單點登錄"
-#: common/setting/system.py:1010
+#: common/setting/system.py:1018
msgid "Enable SSO registration"
msgstr "啓用單點登錄註冊"
-#: common/setting/system.py:1012
+#: common/setting/system.py:1020
msgid "Enable self-registration via SSO for users on the login pages"
msgstr "允許登錄頁面上的用户通過 SSO 進行自我註冊"
-#: common/setting/system.py:1018
+#: common/setting/system.py:1026
msgid "Enable SSO group sync"
msgstr "啓用單點登錄羣組同步"
-#: common/setting/system.py:1020
+#: common/setting/system.py:1028
msgid "Enable synchronizing InvenTree groups with groups provided by the IdP"
msgstr "啓用庫存管理系統組和由身份提供者提供的組的同步功能"
-#: common/setting/system.py:1026
+#: common/setting/system.py:1034
msgid "SSO group key"
msgstr "單點登錄系統組密鑰"
-#: common/setting/system.py:1027
+#: common/setting/system.py:1035
msgid "The name of the groups claim attribute provided by the IdP"
msgstr "由身份提供者提供的組聲明屬性名稱"
-#: common/setting/system.py:1032
+#: common/setting/system.py:1040
msgid "SSO group map"
msgstr "單點登錄系統組地圖"
-#: common/setting/system.py:1034
+#: common/setting/system.py:1042
msgid "A mapping from SSO groups to local InvenTree groups. If the local group does not exist, it will be created."
msgstr "從單點登錄系統組組到本地庫存管理系統組的映射。如果本地組不存在,它將被創建。"
-#: common/setting/system.py:1040
+#: common/setting/system.py:1048
msgid "Remove groups outside of SSO"
msgstr "移除單點登錄系統以外的羣組"
-#: common/setting/system.py:1042
+#: common/setting/system.py:1050
msgid "Whether groups assigned to the user should be removed if they are not backend by the IdP. Disabling this setting might cause security issues"
msgstr "如果分配給用户的組不是身份提供者的後端,是否應該刪除它們。禁用此設置可能會造成安全問題"
-#: common/setting/system.py:1048
+#: common/setting/system.py:1056
msgid "Email required"
msgstr "需要郵箱地址"
-#: common/setting/system.py:1049
+#: common/setting/system.py:1057
msgid "Require user to supply mail on signup"
msgstr "要求用户在註冊時提供郵件"
-#: common/setting/system.py:1054
+#: common/setting/system.py:1062
msgid "Auto-fill SSO users"
msgstr "自動填充單點登錄系統用户"
-#: common/setting/system.py:1055
+#: common/setting/system.py:1063
msgid "Automatically fill out user-details from SSO account-data"
msgstr "自動使用單點登錄系統賬户的數據填寫用户詳細信息"
-#: common/setting/system.py:1060
+#: common/setting/system.py:1068
msgid "Mail twice"
msgstr "發兩次郵件"
-#: common/setting/system.py:1061
+#: common/setting/system.py:1069
msgid "On signup ask users twice for their mail"
msgstr "註冊時詢問用户他們的電子郵件兩次"
-#: common/setting/system.py:1066
+#: common/setting/system.py:1074
msgid "Password twice"
msgstr "兩次輸入密碼"
-#: common/setting/system.py:1067
+#: common/setting/system.py:1075
msgid "On signup ask users twice for their password"
msgstr "當註冊時請用户輸入密碼兩次"
-#: common/setting/system.py:1072
+#: common/setting/system.py:1080
msgid "Allowed domains"
msgstr "域名白名單"
-#: common/setting/system.py:1074
+#: common/setting/system.py:1082
msgid "Restrict signup to certain domains (comma-separated, starting with @)"
msgstr "限制註冊到某些域名 (逗號分隔,以 @ 開頭)"
-#: common/setting/system.py:1080
+#: common/setting/system.py:1088
msgid "Group on signup"
msgstr "註冊羣組"
-#: common/setting/system.py:1082
+#: common/setting/system.py:1090
msgid "Group to which new users are assigned on registration. If SSO group sync is enabled, this group is only set if no group can be assigned from the IdP."
msgstr "註冊時分配給新用户的組。 如果啓用了單點登錄系統羣組同步,此羣組僅在無法從 IdP 分配任何羣組的情況下才被設置。"
-#: common/setting/system.py:1088
+#: common/setting/system.py:1096
msgid "Enforce MFA"
msgstr "強制啓用多因素安全認證"
-#: common/setting/system.py:1089
+#: common/setting/system.py:1097
msgid "Users must use multifactor security."
msgstr "用户必須使用多因素安全認證。"
-#: common/setting/system.py:1094
+#: common/setting/system.py:1102
msgid "Enabling this setting will require all users to set up multifactor authentication. All sessions will be disconnected immediately."
msgstr "啟用此設定將要求所有使用者設定多因素驗證。所有工作階段將立即中斷連線。"
-#: common/setting/system.py:1099
+#: common/setting/system.py:1107
msgid "Check plugins on startup"
msgstr "啓動時檢查插件"
-#: common/setting/system.py:1101
+#: common/setting/system.py:1109
msgid "Check that all plugins are installed on startup - enable in container environments"
msgstr "啓動時檢查全部插件是否已安裝 - 在容器環境中啓用"
-#: common/setting/system.py:1108
+#: common/setting/system.py:1116
msgid "Check for plugin updates"
msgstr "檢查插件更新"
-#: common/setting/system.py:1109
+#: common/setting/system.py:1117
msgid "Enable periodic checks for updates to installed plugins"
msgstr "啓用定期檢查已安裝插件的更新"
-#: common/setting/system.py:1115
+#: common/setting/system.py:1123
msgid "Enable URL integration"
msgstr "啓用統一資源定位符集成"
-#: common/setting/system.py:1116
+#: common/setting/system.py:1124
msgid "Enable plugins to add URL routes"
msgstr "啓用插件以添加統一資源定位符路由"
-#: common/setting/system.py:1122
+#: common/setting/system.py:1130
msgid "Enable navigation integration"
msgstr "啓用導航集成"
-#: common/setting/system.py:1123
+#: common/setting/system.py:1131
msgid "Enable plugins to integrate into navigation"
msgstr "啓用插件以集成到導航中"
-#: common/setting/system.py:1129
+#: common/setting/system.py:1137
msgid "Enable app integration"
msgstr "啓用應用集成"
-#: common/setting/system.py:1130
+#: common/setting/system.py:1138
msgid "Enable plugins to add apps"
msgstr "啓用插件添加應用"
-#: common/setting/system.py:1136
+#: common/setting/system.py:1144
msgid "Enable schedule integration"
msgstr "啓用調度集成"
-#: common/setting/system.py:1137
+#: common/setting/system.py:1145
msgid "Enable plugins to run scheduled tasks"
msgstr "啓用插件來運行預定任務"
-#: common/setting/system.py:1143
+#: common/setting/system.py:1151
msgid "Enable event integration"
msgstr "啓用事件集成"
-#: common/setting/system.py:1144
+#: common/setting/system.py:1152
msgid "Enable plugins to respond to internal events"
msgstr "啓用插件響應內部事件"
-#: common/setting/system.py:1150
+#: common/setting/system.py:1158
msgid "Enable interface integration"
msgstr "啓用界面集成"
-#: common/setting/system.py:1151
+#: common/setting/system.py:1159
msgid "Enable plugins to integrate into the user interface"
msgstr "啓用插件集成到用户界面"
-#: common/setting/system.py:1157
+#: common/setting/system.py:1165
msgid "Enable mail integration"
msgstr "啟用郵件整合"
-#: common/setting/system.py:1158
+#: common/setting/system.py:1166
msgid "Enable plugins to process outgoing/incoming mails"
msgstr "允許模組處理寄出/接收郵件"
-#: common/setting/system.py:1164
+#: common/setting/system.py:1172
msgid "Enable project codes"
msgstr "啟用專案代碼"
-#: common/setting/system.py:1165
+#: common/setting/system.py:1173
msgid "Enable project codes for tracking projects"
msgstr "啟用專案代碼以追蹤專案"
-#: common/setting/system.py:1170
+#: common/setting/system.py:1178
msgid "Enable Stocktake"
msgstr "啟用盤點"
-#: common/setting/system.py:1172
+#: common/setting/system.py:1180
msgid "Enable functionality for recording historical stock levels and value"
msgstr "啟用記錄庫存數量及價值歷史的功能"
-#: common/setting/system.py:1178
+#: common/setting/system.py:1186
msgid "Exclude External Locations"
msgstr "排除外部地點"
-#: common/setting/system.py:1180
+#: common/setting/system.py:1188
msgid "Exclude stock items in external locations from stocktake calculations"
msgstr "從盤點計算中排除外部位置的庫存項目"
-#: common/setting/system.py:1186
+#: common/setting/system.py:1194
msgid "Automatic Stocktake Period"
msgstr "自動盤點週期"
-#: common/setting/system.py:1187
+#: common/setting/system.py:1195
msgid "Number of days between automatic stocktake recording"
msgstr "自動記錄盤點的天數間隔"
-#: common/setting/system.py:1193
+#: common/setting/system.py:1201
msgid "Delete Old Stocktake Entries"
msgstr "刪除舊的盤點項目"
-#: common/setting/system.py:1195
+#: common/setting/system.py:1203
msgid "Delete stocktake entries older than the specified number of days"
msgstr "刪除超過指定天數的盤點項目"
-#: common/setting/system.py:1201
+#: common/setting/system.py:1209
msgid "Stocktake Deletion Interval"
msgstr "盤點刪除間隔"
-#: common/setting/system.py:1203
+#: common/setting/system.py:1211
msgid "Stocktake entries will be deleted after specified number of days"
msgstr "盤點項目將在指定天數後刪除"
-#: common/setting/system.py:1210
+#: common/setting/system.py:1218
msgid "Delete Old Stock Tracking Entries"
msgstr "刪除舊庫存的追蹤紀錄"
-#: common/setting/system.py:1212
+#: common/setting/system.py:1220
msgid "Delete stock tracking entries older than the specified number of days"
msgstr "刪除超過指定天數的庫存追蹤項目"
-#: common/setting/system.py:1218
+#: common/setting/system.py:1226
msgid "Stock Tracking Deletion Interval"
msgstr "庫存追蹤刪除間隔"
-#: common/setting/system.py:1220
+#: common/setting/system.py:1228
msgid "Stock tracking entries will be deleted after specified number of days"
msgstr "庫存追蹤項目將在指定天數後刪除"
-#: common/setting/system.py:1227
+#: common/setting/system.py:1235
msgid "Display Users full names"
msgstr "顯示用户全名"
-#: common/setting/system.py:1228
+#: common/setting/system.py:1236
msgid "Display Users full names instead of usernames"
msgstr "顯示用户全名而不是用户名"
-#: common/setting/system.py:1233
+#: common/setting/system.py:1241
msgid "Display User Profiles"
msgstr "顯示使用者個人檔案"
-#: common/setting/system.py:1234
+#: common/setting/system.py:1242
msgid "Display Users Profiles on their profile page"
msgstr "在個人頁面顯示使用者檔案資訊"
-#: common/setting/system.py:1239
+#: common/setting/system.py:1247
msgid "Week Starts On"
msgstr ""
-#: common/setting/system.py:1240
+#: common/setting/system.py:1248
msgid "Starting day of the week, for display in calendar views"
msgstr ""
-#: common/setting/system.py:1243
+#: common/setting/system.py:1251
msgid "Sunday"
msgstr ""
-#: common/setting/system.py:1244
+#: common/setting/system.py:1252
msgid "Monday"
msgstr ""
-#: common/setting/system.py:1245
+#: common/setting/system.py:1253
msgid "Tuesday"
msgstr ""
-#: common/setting/system.py:1246
+#: common/setting/system.py:1254
msgid "Wednesday"
msgstr ""
-#: common/setting/system.py:1247
+#: common/setting/system.py:1255
msgid "Thursday"
msgstr ""
-#: common/setting/system.py:1248
+#: common/setting/system.py:1256
msgid "Friday"
msgstr ""
-#: common/setting/system.py:1249
+#: common/setting/system.py:1257
msgid "Saturday"
msgstr ""
-#: common/setting/system.py:1253
+#: common/setting/system.py:1261
msgid "Calendar Horizon"
msgstr ""
-#: common/setting/system.py:1255
+#: common/setting/system.py:1263
msgid "Number of months into the future to display in calendar views"
msgstr ""
-#: common/setting/system.py:1259
+#: common/setting/system.py:1267
msgid "months"
msgstr ""
-#: common/setting/system.py:1262
+#: common/setting/system.py:1270
msgid "Enable Test Station Data"
msgstr "啓用測試站數據"
-#: common/setting/system.py:1263
+#: common/setting/system.py:1271
msgid "Enable test station data collection for test results"
msgstr "啓用測試站數據收集以獲取測試結果"
-#: common/setting/system.py:1268
+#: common/setting/system.py:1276
msgid "Enable Machine Ping"
msgstr "啟用設備 Ping"
-#: common/setting/system.py:1270
+#: common/setting/system.py:1278
msgid "Enable periodic ping task of registered machines to check their status"
msgstr "啟用對已註冊機器的定期 ping 任務以檢查其狀態"
@@ -6643,7 +6651,7 @@ msgid "Total available stock at time of stocktake"
msgstr "盤點時可用庫存總額"
#: part/models.py:3548 report/templates/report/inventree_test_report.html:106
-#: stock/models.py:3214
+#: stock/models.py:3273
msgid "Date"
msgstr "日期"
@@ -8084,77 +8092,77 @@ msgstr "為掃描 TME 條形碼提供支持"
msgid "The Supplier which acts as 'TME'"
msgstr "作為‘TME’的供應商"
-#: plugin/installer.py:240 plugin/installer.py:344 plugin/serializers.py:169
+#: plugin/installer.py:239 plugin/installer.py:343 plugin/serializers.py:169
#: plugin/serializers.py:275
msgid "Only superuser accounts can administer plugins"
msgstr "只有超級使用者帳號可以管理外掛程式"
-#: plugin/installer.py:243
+#: plugin/installer.py:242
msgid "Plugin installation is disabled"
msgstr "插件安裝已禁用"
-#: plugin/installer.py:273
+#: plugin/installer.py:272
msgid "No package name or URL provided for installation"
msgstr "未提供要安裝的套件名稱或 URL"
-#: plugin/installer.py:277
+#: plugin/installer.py:276
msgid "Invalid characters in package name or URL"
msgstr "套件名稱或 URL 中包含無效字元"
-#: plugin/installer.py:287
+#: plugin/installer.py:286
msgid "Installed plugin successfully"
msgstr "插件安裝成功"
-#: plugin/installer.py:292
+#: plugin/installer.py:291
#, python-brace-format
msgid "Installed plugin into {path}"
msgstr "插件安裝到 {path}"
-#: plugin/installer.py:318
+#: plugin/installer.py:317
msgid "Plugin was not found in registry"
msgstr "在插件倉庫中找不到插件"
-#: plugin/installer.py:321
+#: plugin/installer.py:320
msgid "Plugin is not a packaged plugin"
msgstr "插件不是一個打包的插件"
-#: plugin/installer.py:324
+#: plugin/installer.py:323
msgid "Plugin package name not found"
msgstr "找不到插件包名稱"
-#: plugin/installer.py:327
+#: plugin/installer.py:326
msgid "Only staff users can administer plugins"
msgstr "只有員工用户可以管理插件"
-#: plugin/installer.py:347
+#: plugin/installer.py:346
msgid "Plugin uninstalling is disabled"
msgstr "插件卸載已禁用"
-#: plugin/installer.py:351
+#: plugin/installer.py:350
msgid "Plugin cannot be uninstalled as it is currently active"
msgstr "插件無法卸載,因為它目前處於激活狀態"
-#: plugin/installer.py:357
+#: plugin/installer.py:356
msgid "Plugin cannot be uninstalled as it is mandatory"
msgstr "不可解除安裝此模組(屬於強制)"
-#: plugin/installer.py:362
+#: plugin/installer.py:361
msgid "Plugin cannot be uninstalled as it is a sample plugin"
msgstr "不可解除安裝此模組(範例模組)"
-#: plugin/installer.py:367
+#: plugin/installer.py:366
msgid "Plugin cannot be uninstalled as it is a built-in plugin"
msgstr "不可解除安裝此模組(內建模組)"
-#: plugin/installer.py:371
+#: plugin/installer.py:370
msgid "Plugin is not installed"
msgstr "模組尚未安裝"
-#: plugin/installer.py:389
+#: plugin/installer.py:388
msgid "Plugin installation not found"
msgstr "找不到模組安裝紀錄"
-#: plugin/installer.py:405
+#: plugin/installer.py:404
msgid "Uninstalled plugin successfully"
msgstr "插件卸載成功"
@@ -8206,21 +8214,21 @@ msgstr "軟件包插件"
msgid "Plugin"
msgstr "插件"
-#: plugin/plugin.py:388
+#: plugin/plugin.py:389
msgid "No author found"
msgstr "未找到作者"
-#: plugin/registry.py:786
+#: plugin/registry.py:780
#, python-brace-format
msgid "Plugin '{p}' is not compatible with the current InvenTree version {v}"
msgstr "插件 '{p}' 與當前 InvenTree 版本{v} 不兼容"
-#: plugin/registry.py:789
+#: plugin/registry.py:783
#, python-brace-format
msgid "Plugin requires at least version {v}"
msgstr "插件所需最低版本 {v}"
-#: plugin/registry.py:791
+#: plugin/registry.py:785
#, python-brace-format
msgid "Plugin requires at most version {v}"
msgstr "插件所需最高版本 {v}"
@@ -9218,7 +9226,7 @@ msgstr "數量不匹配序列號"
msgid "Cannot assign stock to structural location"
msgstr "無法將庫存分配到結構位置"
-#: stock/models.py:2141 stock/models.py:3132
+#: stock/models.py:2141 stock/models.py:3191
msgid "Test template does not exist"
msgstr "測試模板不存在"
@@ -9238,7 +9246,7 @@ msgstr "庫存項包含其他項目"
msgid "Stock item has been assigned to a customer"
msgstr "庫存項已分配給客户"
-#: stock/models.py:2172 stock/models.py:2358
+#: stock/models.py:2172 stock/models.py:2404
msgid "Stock item is currently in production"
msgstr "庫存項目前正在生產"
@@ -9262,71 +9270,71 @@ msgstr "庫存項必須是同一供應商的零件"
msgid "Stock status codes must match"
msgstr "庫存狀態碼必須匹配"
-#: stock/models.py:2503
+#: stock/models.py:2558
msgid "StockItem cannot be moved as it is not in stock"
msgstr "庫存項不能移動,因為它沒有庫存"
-#: stock/models.py:3014
+#: stock/models.py:3073
msgid "Stock Item Tracking"
msgstr "庫存項跟蹤"
-#: stock/models.py:3064
+#: stock/models.py:3123
msgid "Entry notes"
msgstr "條目註釋"
-#: stock/models.py:3104
+#: stock/models.py:3163
msgid "Stock Item Test Result"
msgstr "庫存項測試結果"
-#: stock/models.py:3135
+#: stock/models.py:3194
msgid "Value must be provided for this test"
msgstr "必須為此測試提供值"
-#: stock/models.py:3139
+#: stock/models.py:3198
msgid "Attachment must be uploaded for this test"
msgstr "測試附件必須上傳"
-#: stock/models.py:3144
+#: stock/models.py:3203
msgid "Invalid value for this test"
msgstr "此測試的值無效"
-#: stock/models.py:3168
+#: stock/models.py:3227
msgid "Test result"
msgstr "測試結果"
-#: stock/models.py:3175
+#: stock/models.py:3234
msgid "Test output value"
msgstr "測試輸出值"
-#: stock/models.py:3183 stock/serializers.py:260
+#: stock/models.py:3242 stock/serializers.py:260
msgid "Test result attachment"
msgstr "測驗結果附件"
-#: stock/models.py:3187
+#: stock/models.py:3246
msgid "Test notes"
msgstr "測試備註"
-#: stock/models.py:3195
+#: stock/models.py:3254
msgid "Test station"
msgstr "測試站"
-#: stock/models.py:3196
+#: stock/models.py:3255
msgid "The identifier of the test station where the test was performed"
msgstr "進行測試的測試站的標識符"
-#: stock/models.py:3202
+#: stock/models.py:3261
msgid "Started"
msgstr "已開始"
-#: stock/models.py:3203
+#: stock/models.py:3262
msgid "The timestamp of the test start"
msgstr "測試開始的時間戳"
-#: stock/models.py:3209
+#: stock/models.py:3268
msgid "Finished"
msgstr "已完成"
-#: stock/models.py:3210
+#: stock/models.py:3269
msgid "The timestamp of the test finish"
msgstr "測試結束的時間戳"
@@ -9440,8 +9448,8 @@ msgstr "未提供庫存項"
msgid "Quantity must not exceed available stock quantity ({q})"
msgstr "數量不得超過現有庫存量 ({q})"
-#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1873
-#: stock/serializers.py:1922
+#: stock/serializers.py:743 stock/serializers.py:1534 stock/serializers.py:1882
+#: stock/serializers.py:1973
msgid "Destination stock location"
msgstr "目標庫存位置"
@@ -9565,7 +9573,7 @@ msgstr "所選公司不是客户"
msgid "Stock assignment notes"
msgstr "庫存分配説明"
-#: stock/serializers.py:1462 stock/serializers.py:1750
+#: stock/serializers.py:1462 stock/serializers.py:1759
msgid "A list of stock items must be provided"
msgstr "必須提供庫存物品清單"
@@ -9613,27 +9621,31 @@ msgstr "庫存項已在庫"
msgid "Quantity must not be negative"
msgstr "數量不可為負"
-#: stock/serializers.py:1740
-msgid "Stock transaction notes"
-msgstr "庫存交易記錄"
-
-#: stock/serializers.py:1769
-msgid "Set stock location for counted items (optional)"
-msgstr ""
-
-#: stock/serializers.py:1928
+#: stock/serializers.py:1728 stock/serializers.py:1979
msgid "Merge into existing stock"
msgstr "合併至現有庫存"
-#: stock/serializers.py:1929
+#: stock/serializers.py:1730
+msgid "Merge this item into existing stock at the destination if possible"
+msgstr ""
+
+#: stock/serializers.py:1749
+msgid "Stock transaction notes"
+msgstr "庫存交易記錄"
+
+#: stock/serializers.py:1778
+msgid "Set stock location for counted items (optional)"
+msgstr ""
+
+#: stock/serializers.py:1980
msgid "Merge returned items into existing stock items if possible"
msgstr "可行時將退回項目併入現有庫存"
-#: stock/serializers.py:1972
+#: stock/serializers.py:2023
msgid "Next Serial Number"
msgstr "下一個序列號"
-#: stock/serializers.py:1978
+#: stock/serializers.py:2029
msgid "Previous Serial Number"
msgstr "上一個序列號"
diff --git a/src/backend/InvenTree/plugin/broken/broken_file.py b/src/backend/InvenTree/plugin/broken/broken_file.py
index f56932e876..bf97149aef 100644
--- a/src/backend/InvenTree/plugin/broken/broken_file.py
+++ b/src/backend/InvenTree/plugin/broken/broken_file.py
@@ -7,4 +7,4 @@ class BrokenFileIntegrationPlugin(InvenTreePlugin):
"""An very broken plugin."""
-aaa = bb # noqa: F821
+aaa = bb # noqa: F821 # ty:ignore[unresolved-reference]
diff --git a/src/backend/InvenTree/stock/models.py b/src/backend/InvenTree/stock/models.py
index c7c4f653fe..290377ff0b 100644
--- a/src/backend/InvenTree/stock/models.py
+++ b/src/backend/InvenTree/stock/models.py
@@ -2206,6 +2206,35 @@ class StockItem(
return True
+ def find_merge_target(self, location):
+ """Find an existing stock item at location that can absorb this item."""
+ if location is None:
+ return None
+
+ candidates = list(
+ StockItem.objects
+ .filter(part=self.part, location=location)
+ .exclude(pk=self.pk)
+ .order_by('pk')
+ )
+
+ if not candidates:
+ return None
+
+ if self.batch:
+ batch_matches = [c for c in candidates if c.batch == self.batch]
+ search_order = batch_matches + [
+ c for c in candidates if c not in batch_matches
+ ]
+ else:
+ search_order = candidates
+
+ for target in search_order:
+ if target.can_merge(other=self, raise_error=False):
+ return target
+
+ return None
+
@transaction.atomic
def merge_stock_items(self, other_items, raise_error=False, **kwargs):
"""Merge another stock item into this one; the two become one!
@@ -2227,7 +2256,7 @@ class StockItem(
user = kwargs.get('user')
location = kwargs.get('location', self.location)
- notes = kwargs.get('notes')
+ notes = kwargs.get('notes') or ''
parent_id = self.parent.pk if self.parent else None
@@ -2245,9 +2274,12 @@ class StockItem(
)
return
+ merged_quantity = Decimal(0)
+
for other in other_items:
tree_ids.add(other.tree_id)
+ merged_quantity += other.quantity
self.quantity += other.quantity
if other.purchase_price:
@@ -2271,15 +2303,25 @@ class StockItem(
other.delete()
+ transfer_deltas = kwargs.pop('transfer_deltas', None)
+
+ tracking_deltas = {
+ 'quantity': float(self.quantity),
+ 'added': float(merged_quantity),
+ }
+
+ if location:
+ tracking_deltas['location'] = location.pk
+
+ if transfer_deltas:
+ tracking_deltas = {**transfer_deltas, **tracking_deltas}
+
self.add_tracking_entry(
StockHistoryCode.MERGED_STOCK_ITEMS,
user,
quantity=self.quantity,
notes=notes,
- deltas={
- 'location': location.pk if location else None,
- 'quantity': self.quantity,
- },
+ deltas=tracking_deltas,
)
# Update the location of the item
@@ -2340,6 +2382,8 @@ class StockItem(
status: If provided, override the status (default = existing status)
packaging: If provided, override the packaging (default = existing packaging)
allow_production: If True, allow splitting of stock which is in production (default = False)
+ record_tracking: If False, skip tracking entries (for merge-on-transfer)
+ split_transfer_deltas: Optional dict to receive split tracking deltas
Returns:
The new StockItem object
@@ -2352,6 +2396,8 @@ class StockItem(
"""
# Run initial checks to test if the stock item can actually be "split"
allow_production = kwargs.get('allow_production', False)
+ record_tracking = kwargs.pop('record_tracking', True)
+ split_transfer_deltas = kwargs.pop('split_transfer_deltas', None)
# Cannot split a stock item which is in production
if self.is_building and not allow_production:
@@ -2424,15 +2470,23 @@ class StockItem(
new_stock.save(add_note=False)
- # Add a stock tracking entry for the newly created item
- new_stock.add_tracking_entry(
- StockHistoryCode.SPLIT_FROM_PARENT,
- user,
- quantity=quantity,
- notes=notes,
- location=location,
- deltas=deltas,
- )
+ if split_transfer_deltas is not None:
+ split_transfer_deltas.clear()
+ split_transfer_deltas.update(deltas)
+
+ if location:
+ split_transfer_deltas['location'] = location.pk
+
+ if record_tracking:
+ # Add a stock tracking entry for the newly created item
+ new_stock.add_tracking_entry(
+ StockHistoryCode.SPLIT_FROM_PARENT,
+ user,
+ quantity=quantity,
+ notes=notes,
+ location=location,
+ deltas=deltas,
+ )
# Copy the test results of this part to the new one
new_stock.copyTestResultsFrom(self)
@@ -2445,6 +2499,7 @@ class StockItem(
notes=notes,
location=location,
stockitem=new_stock,
+ record_tracking=record_tracking,
)
# Rebuild the tree for this parent item
@@ -2754,7 +2809,10 @@ class StockItem(
code: The stock history code to use
notes: Optional notes for the stock removal
status: Optionally adjust the stock status
+ record_tracking: If False, skip creating a tracking entry
"""
+ record_tracking = kwargs.pop('record_tracking', True)
+
# Cannot remove items from a serialized part
if self.serialized:
return False
@@ -2804,9 +2862,10 @@ class StockItem(
self.save(add_note=False)
- self.add_tracking_entry(
- code, user, notes=kwargs.get('notes', ''), deltas=deltas
- )
+ if record_tracking:
+ self.add_tracking_entry(
+ code, user, notes=kwargs.get('notes', ''), deltas=deltas
+ )
return True
diff --git a/src/backend/InvenTree/stock/serializers.py b/src/backend/InvenTree/stock/serializers.py
index 90b1770e62..64be85b563 100644
--- a/src/backend/InvenTree/stock/serializers.py
+++ b/src/backend/InvenTree/stock/serializers.py
@@ -1648,7 +1648,7 @@ class StockAdjustmentItemSerializer(serializers.Serializer):
class Meta:
"""Metaclass options."""
- fields = ['pk', 'quantity', 'batch', 'status', 'packaging']
+ fields = ['pk', 'quantity', 'batch', 'status', 'packaging', 'merge']
def __init__(self, *args, **kwargs):
"""Initialize the serializer."""
@@ -1722,6 +1722,15 @@ class StockAdjustmentItemSerializer(serializers.Serializer):
help_text=_('Packaging this stock item is stored in'),
)
+ merge = serializers.BooleanField(
+ default=False,
+ required=False,
+ label=_('Merge into existing stock'),
+ help_text=_(
+ 'Merge this item into existing stock at the destination if possible'
+ ),
+ )
+
class StockAdjustmentSerializer(serializers.Serializer):
"""Base class for managing stock adjustment actions via the API."""
@@ -1888,6 +1897,7 @@ class StockTransferSerializer(StockAdjustmentSerializer):
# Required fields
stock_item = item['pk']
quantity = item['quantity']
+ merge = item.get('merge', False)
# Optional fields
kwargs = {}
@@ -1896,6 +1906,47 @@ class StockTransferSerializer(StockAdjustmentSerializer):
if field_value := item.get(field_name, None):
kwargs[field_name] = field_value
+ if merge:
+ target = stock_item.find_merge_target(location)
+
+ if target:
+ merge_kwargs = {
+ 'location': location,
+ 'notes': notes,
+ 'user': request.user,
+ **kwargs,
+ }
+
+ if quantity < stock_item.quantity:
+ transfer_deltas = {}
+
+ piece = stock_item.splitStock(
+ quantity,
+ location,
+ request.user,
+ notes=notes,
+ allow_production=True,
+ record_tracking=False,
+ split_transfer_deltas=transfer_deltas,
+ **kwargs,
+ )
+ merge_kwargs['transfer_deltas'] = transfer_deltas
+ target.merge_stock_items([piece], **merge_kwargs)
+ else:
+ transfer_deltas = {'stockitem': stock_item.pk}
+
+ if location:
+ transfer_deltas['location'] = location.pk
+
+ for field_name in StockItem.optional_transfer_fields():
+ if field_name in kwargs:
+ transfer_deltas[field_name] = kwargs[field_name]
+
+ merge_kwargs['transfer_deltas'] = transfer_deltas
+ target.merge_stock_items([stock_item], **merge_kwargs)
+
+ continue
+
stock_item.move(
location, notes, request.user, quantity=quantity, **kwargs
)
diff --git a/src/backend/InvenTree/stock/test_api.py b/src/backend/InvenTree/stock/test_api.py
index 4299cfa83c..fdc0ebce54 100644
--- a/src/backend/InvenTree/stock/test_api.py
+++ b/src/backend/InvenTree/stock/test_api.py
@@ -2412,6 +2412,178 @@ class StocktakeTest(StockAPITestCase):
self.assertIn('does not exist', str(response.data['location']))
+class StockTransferMergeTest(StockAPITestCase):
+ """Tests for optional merge-on-transfer behavior."""
+
+ def setUp(self):
+ """Set up stock items for merge transfer tests."""
+ super().setUp()
+
+ self.part = Part.objects.get(pk=1)
+ self.dest = StockLocation.objects.get(pk=2)
+ self.source_loc = StockLocation.objects.get(pk=5)
+ self.url = reverse('api-stock-transfer')
+
+ # Remove fixture stock at the destination so merge targets are deterministic
+ StockItem.objects.filter(part=self.part, location=self.dest).delete()
+
+ def test_transfer_without_merge_creates_separate_lot(self):
+ """Transfer without merge leaves multiple stock rows at destination."""
+ existing = StockItem.objects.create(
+ part=self.part, location=self.dest, quantity=100
+ )
+ incoming = StockItem.objects.create(
+ part=self.part, location=self.source_loc, quantity=50
+ )
+
+ self.post(
+ self.url,
+ {
+ 'items': [{'pk': incoming.pk, 'quantity': 50, 'merge': False}],
+ 'location': self.dest.pk,
+ },
+ expected_code=201,
+ )
+
+ self.assertEqual(
+ StockItem.objects.filter(part=self.part, location=self.dest).count(), 2
+ )
+
+ existing.refresh_from_db()
+ self.assertEqual(existing.quantity, 100)
+
+ def test_transfer_with_merge_combines_lots(self):
+ """Transfer with merge combines into an existing compatible lot."""
+ existing = StockItem.objects.create(
+ part=self.part, location=self.dest, quantity=100
+ )
+ incoming = StockItem.objects.create(
+ part=self.part, location=self.source_loc, quantity=50
+ )
+
+ self.post(
+ self.url,
+ {
+ 'items': [{'pk': incoming.pk, 'quantity': 50, 'merge': True}],
+ 'location': self.dest.pk,
+ },
+ expected_code=201,
+ )
+
+ self.assertEqual(
+ StockItem.objects.filter(part=self.part, location=self.dest).count(), 1
+ )
+
+ existing.refresh_from_db()
+ self.assertEqual(existing.quantity, 150)
+ self.assertFalse(StockItem.objects.filter(pk=incoming.pk).exists())
+
+ def test_transfer_mixed_merge_per_item(self):
+ """Each transfer line can merge or move independently."""
+ existing = StockItem.objects.create(
+ part=self.part, location=self.dest, quantity=100
+ )
+ merge_incoming = StockItem.objects.create(
+ part=self.part, location=self.source_loc, quantity=30
+ )
+ separate_incoming = StockItem.objects.create(
+ part=self.part, location=self.source_loc, quantity=20
+ )
+
+ self.post(
+ self.url,
+ {
+ 'items': [
+ {'pk': merge_incoming.pk, 'quantity': 30, 'merge': True},
+ {'pk': separate_incoming.pk, 'quantity': 20, 'merge': False},
+ ],
+ 'location': self.dest.pk,
+ },
+ expected_code=201,
+ )
+
+ self.assertEqual(
+ StockItem.objects.filter(part=self.part, location=self.dest).count(), 2
+ )
+
+ existing.refresh_from_db()
+ self.assertEqual(existing.quantity, 130)
+ self.assertFalse(StockItem.objects.filter(pk=merge_incoming.pk).exists())
+ self.assertTrue(StockItem.objects.filter(pk=separate_incoming.pk).exists())
+
+ def test_transfer_merge_does_not_copy_source_tracking(self):
+ """Transfer merge keeps destination history and adds a single merge entry."""
+ existing = StockItem.objects.create(
+ part=self.part, location=self.dest, quantity=100
+ )
+ incoming = StockItem.objects.create(
+ part=self.part, location=self.source_loc, quantity=50
+ )
+
+ incoming.add_tracking_entry(
+ StockHistoryCode.STOCK_UPDATE, self.user, notes='Source tracking entry'
+ )
+
+ incoming_pk = incoming.pk
+ tracking_count = existing.tracking_info.count()
+
+ self.post(
+ self.url,
+ {
+ 'items': [{'pk': incoming.pk, 'quantity': 50, 'merge': True}],
+ 'location': self.dest.pk,
+ },
+ expected_code=201,
+ )
+
+ existing.refresh_from_db()
+
+ self.assertFalse(
+ existing.tracking_info.filter(notes='Source tracking entry').exists()
+ )
+ self.assertEqual(existing.tracking_info.count(), tracking_count + 1)
+ merge_entry = existing.tracking_info.filter(
+ tracking_type=StockHistoryCode.MERGED_STOCK_ITEMS
+ ).first()
+ self.assertIsNotNone(merge_entry)
+ self.assertEqual(merge_entry.deltas['added'], 50.0)
+ self.assertEqual(merge_entry.deltas['quantity'], 150.0)
+ self.assertEqual(merge_entry.deltas['stockitem'], incoming_pk)
+ self.assertEqual(merge_entry.deltas['location'], self.dest.pk)
+
+ def test_transfer_merge_partial_reuses_split_transfer_deltas(self):
+ """Partial merge reuses split transfer deltas on the merge tracking entry."""
+ existing = StockItem.objects.create(
+ part=self.part, location=self.dest, quantity=100
+ )
+ incoming = StockItem.objects.create(
+ part=self.part, location=self.source_loc, quantity=100
+ )
+
+ self.post(
+ self.url,
+ {
+ 'items': [{'pk': incoming.pk, 'quantity': 30, 'merge': True}],
+ 'location': self.dest.pk,
+ },
+ expected_code=201,
+ )
+
+ incoming.refresh_from_db()
+ self.assertEqual(incoming.quantity, 70)
+
+ merge_entry = existing.tracking_info.filter(
+ tracking_type=StockHistoryCode.MERGED_STOCK_ITEMS
+ ).first()
+ self.assertEqual(merge_entry.deltas['stockitem'], incoming.pk)
+ self.assertEqual(merge_entry.deltas['location'], self.dest.pk)
+ self.assertFalse(
+ incoming.tracking_info.filter(
+ tracking_type=StockHistoryCode.SPLIT_CHILD_ITEM
+ ).exists()
+ )
+
+
class StockItemDeletionTest(StockAPITestCase):
"""Tests for stock item deletion via the API."""
diff --git a/src/backend/InvenTree/stock/tests.py b/src/backend/InvenTree/stock/tests.py
index 9495432366..999fc030b0 100644
--- a/src/backend/InvenTree/stock/tests.py
+++ b/src/backend/InvenTree/stock/tests.py
@@ -729,6 +729,13 @@ class StockTest(StockTestBase):
self.assertEqual(s1.quantity, 60)
self.assertIsNone(s1.purchase_price)
+ merge_entry = s1.tracking_info.filter(
+ tracking_type=StockHistoryCode.MERGED_STOCK_ITEMS
+ ).first()
+ self.assertIsNotNone(merge_entry)
+ self.assertEqual(merge_entry.deltas['added'], 50.0)
+ self.assertEqual(merge_entry.deltas['quantity'], 60.0)
+
part.stock_items.all().delete()
# Create some stock items with pricing information
diff --git a/src/backend/requirements-3.14.txt b/src/backend/requirements-3.14.txt
index 55035af0c8..ecedc0c601 100644
--- a/src/backend/requirements-3.14.txt
+++ b/src/backend/requirements-3.14.txt
@@ -101,16 +101,16 @@ blessed==1.44.0 \
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
-boto3==1.43.34 \
- --hash=sha256:42595057324606928c6e2432b3093978e4d722e0d432bce942f2a385702c0a43 \
- --hash=sha256:444207c6c883d4df3ea3b2c36df43ad492b86e0b889eebd2fc1d5ea8db0a8a1a
+boto3==1.43.36 \
+ --hash=sha256:42942dde254673abcbc9e6e60017c88341a4f49d99d24e1f2e290fb38138c26f \
+ --hash=sha256:587d7ee92a12e440ad12b0e7f11f3358f0c4d65b19f64726efc94aaf194aff28
# via
# -c src/backend/requirements.txt
# django-anymail
# django-storages
-botocore==1.43.34 \
- --hash=sha256:238a0269f33c5914b9343900b44767e783b3e8b6dcb6e065eac8b4495601c5df \
- --hash=sha256:ccc973cf30c6445b30afe5760f6dc949a80f1f862cb23d9c45747f2c814ece77
+botocore==1.43.36 \
+ --hash=sha256:3c65fdc39ed01d8dfde1e961b34038aed03c459f8ddf80717a12ac006475e49d \
+ --hash=sha256:4cae47d1b2d426316b85a0087d9e69e048f13bc003b5177d74639fe9dfd28205
# via
# -c src/backend/requirements.txt
# boto3
@@ -961,9 +961,9 @@ gunicorn==26.0.0 \
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
-icalendar==7.1.3 \
- --hash=sha256:690f30aa50a76cbf854db5ad52654705db9c5cd0e1b152222f5d4b7854b60667 \
- --hash=sha256:eb03a0e215f30db689a72c49f18f998aabf17522eb0858a293c393510850727c
+icalendar==7.2.0 \
+ --hash=sha256:32dacc396101825b82f9f1bbdf691c02be613130d5ab7a457e553fcd20959fdd \
+ --hash=sha256:77922b6be57dfcc2e94f93063d2fd7e948ada9b5bdf7b08bebbc684b1b66c7c4
# via
# -c src/backend/requirements.txt
# django-ical
@@ -1023,9 +1023,9 @@ jsonschema-specifications==2025.9.1 \
# via
# -c src/backend/requirements.txt
# jsonschema
-jwcrypto==1.5.7 \
- --hash=sha256:70204d7cca406eda8c82352e3c41ba2d946610dafd19e54403f0a1f4f18633c6 \
- --hash=sha256:729463fefe28b6de5cf1ebfda3e94f1a1b41d2799148ef98a01cb9678ebe2bb0
+jwcrypto==1.5.8 \
+ --hash=sha256:85aeb475f808d56bbc2f2ed1f6f73e6a317c4011a4321505f02f0aed695a3742 \
+ --hash=sha256:c3d7114b6f6e65b52f6b7da817eb8cb8423e1da31e1ef13508447c81ecbdcc34
# via
# -c src/backend/requirements.txt
# django-oauth-toolkit
@@ -1267,34 +1267,34 @@ markupsafe==3.0.3 \
# via
# -c src/backend/requirements.txt
# jinja2
-nh3==0.3.5 \
- --hash=sha256:0a09f51806fd51b4fedbf9ea2b61fef388f19aef0d62fe51199d41648be14588 \
- --hash=sha256:207c01801d3e9bb8ec08f08689346bdd30ce15b8bf60013a925d08b5388962a4 \
- --hash=sha256:23a312224875f72cd16bde417f49071451877e29ef646a60e50fcb69407cc18a \
- --hash=sha256:2c069570b06aa848457713ad7af4a9905691291548c4466a9ad78ee95808382b \
- --hash=sha256:38748140bf76383ab7ce2dce0ad4cb663855d8fbc9098f7f3483673d09616a17 \
- --hash=sha256:387abd011e81959d5a35151a11350a0795c6edeb53ebfa02d2e882dc01299263 \
- --hash=sha256:3bb854485c9b33e5bb143ff3e49e577073bc6bc320f0ff8fc316dd89c0d3c101 \
- --hash=sha256:45855e14ff056064fec77133bfcf7cd691838168e5e17bbef075394954dc9dc8 \
- --hash=sha256:45e6a65dc88a300a2e3502cb9c8e6d1d6b831d6fba7470643333609c6aab1f30 \
- --hash=sha256:488928988caad25ba14b1eb5bc74e25e21f3b5e40341d956f3ce4a8bc19460dc \
- --hash=sha256:48f45e3e914be93a596431aa143dedf1582557bf41a58153c296048d6e3798c9 \
- --hash=sha256:50d401ab2d8e86d59e2126e3ab2a2f45840c405842b626d9a51624b3a33b6878 \
- --hash=sha256:52d877980d7ca01dc3baf3936bf844828bc6f332962227a684ed79c18cce14c3 \
- --hash=sha256:559e4c73b689e9a7aa97ac9760b1bc488038d7c1a575aa4ab5a0e19ee9630c0f \
- --hash=sha256:6ea58cc44d274c643b83547ca9654a0b1a817609b160601356f76a2b744c49ad \
- --hash=sha256:72c5bdedec27fa33de6a5326346ea8aa3fe54f6ac294d54c4b204fb66a9f1e79 \
- --hash=sha256:84bdeb082544fbcb77a12c034dd77d7da0556fdc0727b787eb6214b958c15e29 \
- --hash=sha256:8f85285700a18e9f3fc5bff41fe573fa84f81542ef13b48a89f9fecca0474d3b \
- --hash=sha256:acfd354e61accbe4c74f8017c6e397a776916dfe47c48643cf7fd84ade826f93 \
- --hash=sha256:c357f1d042c67f135a5e6babb2b0e3b9d9224ff4a3543240f597767b01384ffd \
- --hash=sha256:c3aae321f67ae66cff2a627115f106a377d4475d10b0e13d97959a13486b9a88 \
- --hash=sha256:c88605d8d468f7fc1b31e06129bc91d6c96f6c621776c9b504a0da9beac9df5f \
- --hash=sha256:de8e8621853b6470fe928c684ee0d3f39ea8086cebafe4c416486488dea7b68d \
- --hash=sha256:e49c9b564e6bcb03ecd2f057213df9a0de15a95812ac9db9600b590db23d3ae9 \
- --hash=sha256:ea232933394d1d58bf7c4bb348dc4660eae6604e1ae81cd2ba6d9ed80d390f3b \
- --hash=sha256:eeedc90ed8c42c327e8e10e621ccfa314fc6cce35d5929f4297ff1cdb89667c4 \
- --hash=sha256:fe3a787dc76b50de6bee54ef242f26c41dfe47654428e3e94f0fae5bb6dd2cc1
+nh3==0.3.6 \
+ --hash=sha256:082675ff87b9385ec430ffe6d5847ba7456cc39b73720cd4add472f9f4cffd56 \
+ --hash=sha256:2411e8c3cee81a1ddd62c2a5d50585c28aa5566d373ad1db92536b95ddb24ef2 \
+ --hash=sha256:25c733bee928530556b1db0ea46c52cf5aa686146e38e60a6fc7cb801ef91cec \
+ --hash=sha256:2f90d9a0cfdbee218994fdaaeeb5a0fde62d08f35e4eef0378ec1e2200172fd0 \
+ --hash=sha256:34d2b0d934156b87ee114f599a3ba9b8b9e17b5d79652ba3a13fa50903de965e \
+ --hash=sha256:36d06341bd501240d320f5942481ed5e6846136b666e1ba4faf802b78ebc875f \
+ --hash=sha256:43bc1ed3fa0716295fabee29ba42b2667e4a51d140b0a68e092170a765474fa6 \
+ --hash=sha256:44673b27010051ab5a5e438a86ec31bbda61d4a77d7e900af6b7be3037c1abae \
+ --hash=sha256:455469a29951edc92bc48b47ac2281c3f2609e6c4f6a047056449f8c2c23facf \
+ --hash=sha256:4713502748f564fee0633b37b3403783ce0a3af3a3d148ad91025a5bdadb7bc6 \
+ --hash=sha256:5276ef17bdba9ad8040575c74072008b13aae429436e9d0429e718bb5f90f4da \
+ --hash=sha256:597a8e843bea00b2eb5520658dc24a9bb032e7fc9e7c2c0c4cd29420220c9796 \
+ --hash=sha256:69bbb92865a693d909db3a700d3c01537533844d0948c1e9323561ce06ecda41 \
+ --hash=sha256:69f365963f63a1e9bff53bdbb3c542c7c2efed3e163c9d5d83a772a2ac468c21 \
+ --hash=sha256:82ca5bf427ad1b216b65ede1a2e2d87dc49bec417ceba0f297213107d3cd9d78 \
+ --hash=sha256:889932a97fb4abb6f95fef1914c0d269ebfb60011e67121c1163059b9449dbb4 \
+ --hash=sha256:905f877dc66dd7aea4a76e54bcb26acb5ff8216f720c0017ccf63e0e6035698e \
+ --hash=sha256:a43ebd7543555c3ac1bc353023d0794e75cb76f6f18f19c32e95441496c0cc25 \
+ --hash=sha256:d14bf7982e7a77c0c775634c29c07ce08b38a046df73e1c1f139b3e82f18a38e \
+ --hash=sha256:e196fa70c2ff2eb4de7d3df3108f8f358c1d69dff20d45b11f20a5aa227ffb6d \
+ --hash=sha256:e1b160831c9cdb06a6c79c2f9cdb11386602938f9af260d1c457a85add4f6f69 \
+ --hash=sha256:e6b7beece07525dc6e6b0fc2f104442de2ba328360ad00e50cbe2e1fd620447d \
+ --hash=sha256:edb2b4a1a27523e6cc7c417f8d21ce3d005243548b93e56b762b66b0c7f589f9 \
+ --hash=sha256:f2f14b7ae1fca99c4a66c981aac3974e7fbc1ca30a12673d223ae1df76680917 \
+ --hash=sha256:f338ac7d594c067679f1e99b4f5ec3906842979560f9d8f15d6bdfa39a353b10 \
+ --hash=sha256:f3736c9dd3d1856f80cd031715b84ca75cda2bbb1ac802c3da26bfce590838d7 \
+ --hash=sha256:f5ed5fe84aee7f39db95c214a7421bf0499fbf500fec6d86a4e29bfc37971438
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
@@ -1311,9 +1311,9 @@ openpyxl==3.1.5 \
# via
# -c src/backend/requirements.txt
# tablib
-opentelemetry-api==1.42.1 \
- --hash=sha256:51a69edacadbc03a8950ace1c4c21099cacc538820ac2c9e36277e78cebba714 \
- --hash=sha256:56c63bea9f77b62856be8c47600474acad853b2924b99b1687c4cb6297166716
+opentelemetry-api==1.43.0 \
+ --hash=sha256:107d0d03857ea8fc7c5fcbbbd83f800c281f0d560553d61c1d675fccfd1761c1 \
+ --hash=sha256:20acf45e9b21851926835292e4045d290acade1edd2ff3de86d2f069687ba1fd
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
@@ -1331,34 +1331,34 @@ opentelemetry-api==1.42.1 \
# opentelemetry-instrumentation-wsgi
# opentelemetry-sdk
# opentelemetry-semantic-conventions
-opentelemetry-exporter-otlp==1.42.1 \
- --hash=sha256:2d9ebaed714377a67d224d46795ddcc11d2c877fa5de35fda70b6f3b010729a9 \
- --hash=sha256:aedd54545bb0587cd45210abdc8be545af9c01413f3307786e276df1e3c83bee
+opentelemetry-exporter-otlp==1.43.0 \
+ --hash=sha256:65aded6c50ee7dd2b9948c9d0e59ddb4ed4eea6e8532fba95cbe6a4a64a566ba \
+ --hash=sha256:70f3fe740a64596d4157588a2ee7e4fd37d2acc0c0f522a2882b8c29316cd0f0
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
-opentelemetry-exporter-otlp-proto-common==1.42.1 \
- --hash=sha256:04f1f01fb597c4249dfcd7f8b861c902c2102369d376d9d346ff38de4469a2ee \
- --hash=sha256:f48d395ab815b444da118868977e9798ea354c25737d5cf39578ae894011c140
+opentelemetry-exporter-otlp-proto-common==1.43.0 \
+ --hash=sha256:123c3f9cc87218562490c63b36f497bf3a722faf174a515d1443f31ababa6264 \
+ --hash=sha256:c4e32ba6d6b13bdb2b8f6764c4fd28d00192826561aa04f6d14eedfce7ac076f
# via
# -c src/backend/requirements.txt
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
-opentelemetry-exporter-otlp-proto-grpc==1.42.1 \
- --hash=sha256:0ae1177e2038b18a929b3098215243631ef91136cba26b7e2b12790ceb7e87cc \
- --hash=sha256:975c4461f167dd8ed8857d68d3b6b25f3d272eab896f6a9470d0f5b90e2faf15
+opentelemetry-exporter-otlp-proto-grpc==1.43.0 \
+ --hash=sha256:1b3e0627daa9bc21884d4a13946807c255eb558bfe5bdd543dffb6f4c9faee0d \
+ --hash=sha256:6a10d1feacffffda19acacbf277b736094b1e2f4dbb98c90ccb2c6e1962e2ec6
# via
# -c src/backend/requirements.txt
# opentelemetry-exporter-otlp
-opentelemetry-exporter-otlp-proto-http==1.42.1 \
- --hash=sha256:00a16da1b312a1d6c7233d600d557c91df71125af73020f3b9a7765bd699d59d \
- --hash=sha256:bf142a21035d7571ac3a09cb2e5639f49886f243972883cfe777ed3bf02b734d
+opentelemetry-exporter-otlp-proto-http==1.43.0 \
+ --hash=sha256:647f603aa8efdbdb4dbff842e0729d0406a6fff26b295a72d3d60e7d963b2610 \
+ --hash=sha256:fa8a42bb7d00ee5391f4c0b04d8e6a46c03caa437903296ab73a81dc11ba118f
# via
# -c src/backend/requirements.txt
# opentelemetry-exporter-otlp
-opentelemetry-instrumentation==0.63b1 \
- --hash=sha256:32368d6ae52c8de20aa790a6ad86b10a76f09956092337ae37d675773990e541 \
- --hash=sha256:f1986716d52cc316ea5f60189098726a9071d8ecc0eee96c9ed110be08bade9c
+opentelemetry-instrumentation==0.64b0 \
+ --hash=sha256:133ab7ffca796557aec059bf6be3190a34b6dea987f25be3d9409e230cbdad8b \
+ --hash=sha256:b47d528dead6271d7743114417eb67fc915bd9258111c48dbf9a4951d2efa88d
# via
# -c src/backend/requirements.txt
# opentelemetry-instrumentation-dbapi
@@ -1370,82 +1370,82 @@ opentelemetry-instrumentation==0.63b1 \
# opentelemetry-instrumentation-sqlite3
# opentelemetry-instrumentation-system-metrics
# opentelemetry-instrumentation-wsgi
-opentelemetry-instrumentation-dbapi==0.63b1 \
- --hash=sha256:1bc842ddcacb7ec3622ef306ffdb3c584bf97df79d381e03604ea6eb23c63781 \
- --hash=sha256:406978ed56bcfc5fd246fd918e6b36d0f5de26fa396c78cf63326a7b530597c8
+opentelemetry-instrumentation-dbapi==0.64b0 \
+ --hash=sha256:1caa96d438bf37f71dd778c9f1e03ba1f50b8ab54aeef68b2a630c93c05cddc6 \
+ --hash=sha256:8e3a1528fc9753a04190a7e7bf0180c5abd059f3aa68ec3857edb363c9847c44
# via
# -c src/backend/requirements.txt
# opentelemetry-instrumentation-psycopg
# opentelemetry-instrumentation-pymysql
# opentelemetry-instrumentation-sqlite3
-opentelemetry-instrumentation-django==0.63b1 \
- --hash=sha256:909ea4afbb18f16eb811d7ac330ed0f6fda7765191d49bccb8cca38c4fbc005f \
- --hash=sha256:f2071d2f92e4779c5a14dd452b0dfe426343599e6efa9d888304fb639a9f3101
+opentelemetry-instrumentation-django==0.64b0 \
+ --hash=sha256:3d2673b4f77156b15b1b119c8849b50e3644cfc325f7a24c03602596de2dbba4 \
+ --hash=sha256:c1f628e53c22aa8f9cc9cbe6e61e781940da6eda5f910d26720ef8ac73e25afe
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
-opentelemetry-instrumentation-psycopg==0.63b1 \
- --hash=sha256:4d74ec2dda8e54ead9bd71f134af984792f77e1d8809591ae53edadddd4c8fc0 \
- --hash=sha256:86819f4cccea21a47920807826495797b7261cc1893c8e855415e76fb7b8e2e8
+opentelemetry-instrumentation-psycopg==0.64b0 \
+ --hash=sha256:a9835b8749db71a9c1e075ae81c084b1f370130341ceff6a231095f89f48a0c6 \
+ --hash=sha256:e9f41fad425183392d97068dbe2ce6e938514520312cfd7bf409242bd800c013
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
-opentelemetry-instrumentation-pymysql==0.63b1 \
- --hash=sha256:2cf6a24e136b5b0c3f6e59675fc44b42ad2b97474b075a82859f9868a9252648 \
- --hash=sha256:6b54b83c86ac6c2e8dae642bbee4894e2283ceb5da23d571f1abb7060f7b62f4
+opentelemetry-instrumentation-pymysql==0.64b0 \
+ --hash=sha256:f5ab8399f7d8952b1622f9938d56604b51f51e7882f5058d7fd4fa3509c458f4 \
+ --hash=sha256:fc0da8eb158e0fb525f18e5be3bfa25dc0bc1d9e195c5fe31fbf919b55bd1a64
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
-opentelemetry-instrumentation-redis==0.63b1 \
- --hash=sha256:28d235159df43cc2bc8779af5c602afad1e08603fff75ac8ca34dd1bf30a9cb9 \
- --hash=sha256:f0e51c4006f68e340abbf28a7995feff004de78649697cbdf3bac0072cacd082
+opentelemetry-instrumentation-redis==0.64b0 \
+ --hash=sha256:5458a541986f665b9d7e641421fa5d0c286f1813b452faab6f84503823719d52 \
+ --hash=sha256:c37e194c1e8ff59944d5c2f18014ee18f244a103958b1f2482099525ae9099f9
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
-opentelemetry-instrumentation-requests==0.63b1 \
- --hash=sha256:513fcaa3d93debbdb359c00ce1a137a34a89ee908c51ac43beb7e8c18ac2b3cd \
- --hash=sha256:935c980a11e33bfd7ed969c741e4bd7c84077045651469f10e163534368d87f7
+opentelemetry-instrumentation-requests==0.64b0 \
+ --hash=sha256:8213a20b6578c41aa05cc5b48419aea75e1584924a4904dfcf36524597e7cc96 \
+ --hash=sha256:dcad4324ad97d785a5a3b9500acf3af3965b4c1d1b95776fa5e275b173d9541c
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
-opentelemetry-instrumentation-sqlite3==0.63b1 \
- --hash=sha256:3d61afda8358dc32135fabd27e5934bd25ea0eed68d64c34508f24ba8d723efc \
- --hash=sha256:cc11c68cccde061dc8bcc5f80fe00bb0105a0fbb11b390859a23ca91ccd4e3b6
+opentelemetry-instrumentation-sqlite3==0.64b0 \
+ --hash=sha256:2d46810db20543a209c6568c8d1220859563bc4135cd6d00461ef70e446a0297 \
+ --hash=sha256:fc73cd28b7c77ddbec1d688113abe944805e9f085ff724729a8b7a4888efc3e7
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
-opentelemetry-instrumentation-system-metrics==0.63b1 \
- --hash=sha256:995051f47876d79461aed8b7aa205d4584d90794ef864342cc748929c389bb42 \
- --hash=sha256:d6d4d7a1a854be4165143cf6420ee5894188762eb367d7bf9da5be4a83a4b632
+opentelemetry-instrumentation-system-metrics==0.64b0 \
+ --hash=sha256:38bc9c4ed4fccea2a68b1a43d57764649d1c3096927dc7244c5e7f173899044b \
+ --hash=sha256:ec8280693cdf6ea9020384c3fe884eea64a43ae78f1e2f6edc20951c871aac7e
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
-opentelemetry-instrumentation-wsgi==0.63b1 \
- --hash=sha256:03d61c4678ce82402e7f37b6a3dbd84cb97b85b3cb416a78c2e74c7c6d9451fa \
- --hash=sha256:86779715262227d3436bdfb16aabd1c524b0f236725a69e8754ceda76c6d79dc
+opentelemetry-instrumentation-wsgi==0.64b0 \
+ --hash=sha256:1cce6ea28d1800c154e6ccdf52f05bae2f05c5e28ee44f0dddb17ada26208986 \
+ --hash=sha256:5a3b0174f39072c0abb749be4ae7e469c7585e87cdfaf63665657b1a7058c105
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
# opentelemetry-instrumentation-django
-opentelemetry-proto==1.42.1 \
- --hash=sha256:c6a51e6b4f05ae63565f3a113217f3d2bfaec68f78c02d7a6c85f9010d1cfca6 \
- --hash=sha256:dedb74cba2886c59c7789b227a7a670613025a07489040050aedff6e5c0fb43c
+opentelemetry-proto==1.43.0 \
+ --hash=sha256:224778df17e1f3fafeaaa21d874236ca5f6ffc2f86e0899298ec7351aac27924 \
+ --hash=sha256:c58f1f7ef84bc7dc2834016c0c37fe0081dde7ca9f6339be1970fbf9cdaaa90d
# via
# -c src/backend/requirements.txt
# opentelemetry-exporter-otlp-proto-common
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
-opentelemetry-sdk==1.42.1 \
- --hash=sha256:083cd4bbfaa5aa7b5a9e552430d9951219967cfb27aa61feb13a77aba1fc839d \
- --hash=sha256:8c834e8f8c9ba4171d4ec843d0cb8a67e4c7394d3f9e9297e582cbd9456ddbf7
+opentelemetry-sdk==1.43.0 \
+ --hash=sha256:d1323a547c1ce69d6a069a17a44b7da82bb8b332051ecb074041f87642c86823 \
+ --hash=sha256:d8187c81c162df9913e4003dd6485f7390d9a24fc17026ec7387b8b8218b08e9
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
-opentelemetry-semantic-conventions==0.63b1 \
- --hash=sha256:3daf963611334b365e98a57438183eb012d3bfb40b2d931a9af613476b8701a9 \
- --hash=sha256:dfe5ef4dee82586b746f522b818ceb298d00b3d59f660042bd79404bff8d0682
+opentelemetry-semantic-conventions==0.64b0 \
+ --hash=sha256:72f76fb2d1582d9d033dd1fcd84532e961e6ff3d90d24ba6fabc72975a83864c \
+ --hash=sha256:ea77e85e354b8f604ddbe5f3d9135216f982fa4d77e5859ac30f6d8a50505aa6
# via
# -c src/backend/requirements.txt
# opentelemetry-instrumentation
@@ -1456,9 +1456,9 @@ opentelemetry-semantic-conventions==0.63b1 \
# opentelemetry-instrumentation-system-metrics
# opentelemetry-instrumentation-wsgi
# opentelemetry-sdk
-opentelemetry-util-http==0.63b1 \
- --hash=sha256:6284194028c59cd439f8acfe388145069a6127f11dc077e1344a2094adacc3f8 \
- --hash=sha256:ba1268f00922ee522dba2ae38458060f99486e7385a8056985901ca9685adfff
+opentelemetry-util-http==0.64b0 \
+ --hash=sha256:8a86a220dbfc56d736f47f1e5c4e7932a21fcf69052312e1bcf166444dc79322 \
+ --hash=sha256:c1e5350d25507c1afcd6076cf9ac062485a0a4f79cd9971366996fd3056bacdb
# via
# -c src/backend/requirements.txt
# opentelemetry-instrumentation-django
@@ -1607,23 +1607,21 @@ ppf-datamatrix==0.2 \
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
-prettytable==3.17.0 \
- --hash=sha256:59f2590776527f3c9e8cf9fe7b66dd215837cca96a9c39567414cbc632e8ddb0 \
- --hash=sha256:aad69b294ddbe3e1f95ef8886a060ed1666a0b83018bbf56295f6f226c43d287
+prettytable==3.18.0 \
+ --hash=sha256:439217116152244369caf3d9f1caf2f9fe29b03bd79e88d2928c8e718c95d680 \
+ --hash=sha256:b3346e0e6f79180833aebaac088ae926340586cf6d7d991b9eb125b65f72313a
# via
# -c src/backend/requirements.txt
# pip-licenses
-protobuf==6.33.6 \
- --hash=sha256:0cd27b587afca21b7cfa59a74dcbd48a50f0a6400cfb59391340ad729d91d326 \
- --hash=sha256:77179e006c476e69bf8e8ce866640091ec42e1beb80b213c3900006ecfba6901 \
- --hash=sha256:7d29d9b65f8afef196f8334e80d6bc1d5d4adedb449971fefd3723824e6e77d3 \
- --hash=sha256:9720e6961b251bde64edfdab7d500725a2af5280f3f4c87e57c0208376aa8c3a \
- --hash=sha256:a6768d25248312c297558af96a9f9c929e8c4cee0659cb07e780731095f38135 \
- --hash=sha256:bd56799fb262994b2c2faa1799693c95cc2e22c62f56fb43af311cae45d26f0e \
- --hash=sha256:c96c37eec15086b79762ed265d59ab204dabc53056e3443e702d2681f4b39ce3 \
- --hash=sha256:e2afbae9b8e1825e3529f88d514754e094278bb95eadc0e199751cdd9a2e82a2 \
- --hash=sha256:e9db7e292e0ab79dd108d7f1a94fe31601ce1ee3f7b79e0692043423020b0593 \
- --hash=sha256:f443a394af5ed23672bc6c486be138628fbe5c651ccbc536873d7da23d1868cf
+protobuf==7.35.1 \
+ --hash=sha256:11d6b0ec246892d85215b0a13ca6e0233cf5284b68f0ac02646427f4ff88a799 \
+ --hash=sha256:230a75ddfc2de4806e56696ce9640c1cdfdb6543b7cfce98d42a4c0a0e7bdb87 \
+ --hash=sha256:24f857477359a85c0c235261b8ba905fd51b2562f4a64ca1df5473f29850cbf6 \
+ --hash=sha256:353652e4efd0bca5b5fc2656abf8307ef351f0cf938c9eba09f0e09c20a25c30 \
+ --hash=sha256:4bc97768d8fe4ad6743c8a19403e314511ed9f6d13205b687e52421c023ac1b9 \
+ --hash=sha256:74758715c53d7158fb76caf4f0cfdacc5329a4b1bb994f865d6cf302d413a1c4 \
+ --hash=sha256:b73f9489a4b8b1c9cb1f8ed951c736392592edb24b9d6819f36d2e10b171d5b4 \
+ --hash=sha256:ce115a26fe0c39a2c29973d914d327e516a6455464489fe3cd1e51a1b354f81a
# via
# -c src/backend/requirements.txt
# googleapis-common-protos
@@ -1707,9 +1705,9 @@ pynacl==1.6.2 \
# via
# -c src/backend/requirements.txt
# paramiko
-pypdf==6.13.3 \
- --hash=sha256:c6e3f86afb625791510b02ad5480e94b63970bb957df75d44657c282ecc52224 \
- --hash=sha256:f3cb822769725f1bac658c406cfc9460399043f3750c2d3e4650e0a85eacabd7
+pypdf==6.14.2 \
+ --hash=sha256:3f07891af76dc002657e04993ab9b4de81de29f9013b9761d0b7968bff12e946 \
+ --hash=sha256:7873f502fe4385e79539b21d872392dc0c4e3714327c15881cbc7fbfd1f95b25
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
@@ -1937,9 +1935,9 @@ rapidfuzz==3.14.5 \
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
-redis==8.0.0 \
- --hash=sha256:a00c5355432051ac14e593b8b197fc76c887ee12d55a0984f69328a1115fdc49 \
- --hash=sha256:c938c18338585009f0bc310f4c7e4e4b4d37639356c4ac072cedf3af570c8dc7
+redis==8.0.1 \
+ --hash=sha256:47daa35a058c23468d6437f17a8c76882cb316b838ef763036af99b96cedd743 \
+ --hash=sha256:afc5a7a2f5a084f5b1880dec548dd45be17db7e43c82a30d84f952aefb05cfb0
# via
# -c src/backend/requirements.txt
# django-redis
@@ -2229,97 +2227,97 @@ whitenoise==6.12.0 \
# via
# -c src/backend/requirements.txt
# -r src/backend/requirements.in
-wrapt==2.2.1 \
- --hash=sha256:036dfb40128819a751c6f451c6b9c10172c49e4c401aebcdb8ecf2aec1683598 \
- --hash=sha256:03df9ebed4c73ab93fa8c07e3d41d818dfca1852b15731a3de59457b27814624 \
- --hash=sha256:05d5cb74d1b232ec8cfa130a8f900708699ff2491d97b8f85a4cdc5996294b85 \
- --hash=sha256:07be671fa8875971222b0ba9059ed8b4dc738631122feba17c93aa36b4213e9a \
- --hash=sha256:09ac16c081bebfd15d8e4dfa5bdc805990bbd52249ecff22530da7a129d6120b \
- --hash=sha256:0d9ff006f420b2ec8296aa56ade43ea7da3e997e85769f0aafc5e0661aacb710 \
- --hash=sha256:0f68f478004475d97906686e702ddbddeaf717c0b68ad2794384308f2dc713ae \
- --hash=sha256:17de18fc12cea55b8a9587314cb830573e37fb33b247a7515696350863714188 \
- --hash=sha256:1ae574d65c9fa8e86f64f6a7c2668f9fcd507b183e0e577619f504b883cb0a6c \
- --hash=sha256:1c9934ea5d92957e3cd0adbc0845539dccfd62710ebe16195a8c66c53954db36 \
- --hash=sha256:1d676ee388bc42a04d56dd7deb5605244dac2e35cc2fadbb43c9fa25bbd93508 \
- --hash=sha256:1ffa9cfd4bdb581539951b14ae661ff20ed0c3599b3e911a131ee0ec5ac11337 \
- --hash=sha256:2076d2335085eb09b9547e7688656fa8f5cf0183eab589d33499cd353489d797 \
- --hash=sha256:211f595f8e7faae5c5930fcc64708f2ba36849e0ba0fd653a843de9fa8d7db77 \
- --hash=sha256:24c52546acf2ab82412f2ab6fc5948a7fe958d3b4f070202e8dcdd865489eaf9 \
- --hash=sha256:2d83966dc7f4f45e8b97b5933685ac2e6e67fc0e19246ea314bceb9a8970c956 \
- --hash=sha256:2de9e20769fe9c1f6dcdc893c6a89287c5ccf8537c90b5de78aed8017697aad5 \
- --hash=sha256:2e08688ab16525897da6589d56d0aebaf417bbe91c2d8e3b96203b1efa596e85 \
- --hash=sha256:2f8c90c8afde51969487be4e1343ae049b268854877d415c2510baf833775052 \
- --hash=sha256:368eac1e20fd0bb03dd3cc42bf9887154c3861b60989389ccb5fac032617d215 \
- --hash=sha256:3aafea2975caef8ca49400640dde02cc7426e798f24870ed01f490bc3cffd32f \
- --hash=sha256:3e2f02472a1cbbf3884b365714a810b5947134a95ad6952b554cb8cce9d492b0 \
- --hash=sha256:3ffad790d9d11d8ecf9f17c4bb671a5b4089e4d8b575c46c5129597f41f836b0 \
- --hash=sha256:401229e9d63ca09f9b8891ecf83798d26c11bbb445d11ed9f1836b6d4585b38a \
- --hash=sha256:436addbc4bb4fc0a88c702577f51195d7d73683a7f3e0e5b253d8404d7847243 \
- --hash=sha256:44255c84bc57554fed822e83e70036b51afa9edb56fc7ca56c54410ece7898c9 \
- --hash=sha256:50972a1d974ea07725a7f6b1cec5f8759008afd030a0024843ebe7d52de47f2b \
- --hash=sha256:5590d63f5243251641cf543009b4c9314a79d0598fdb8a8e4cfc918494536c53 \
- --hash=sha256:585916e210db57b23543342c2f298e42331b617fd0c934caf5c64df44de8640e \
- --hash=sha256:5f1845c2a8cc1180ccccfa45785dd06f562730d19ef75be180334254012b6283 \
- --hash=sha256:5fa9bf3b9e66336589d03f42abce2da1055ad5c69b0c2b764852a8471c9b9114 \
- --hash=sha256:61a0013344674d2b648bc6e6fe9828dd4fc1d3b4eb7523809792f8cb952e2f16 \
- --hash=sha256:61acce4257a9883669703c525447c5b4c392edf0f987ae77ec32668440158f0e \
- --hash=sha256:628f5220c7a904d5fc78f7075c8d7871433eb6d035c94728a22fdf85f193d2a8 \
- --hash=sha256:64b7deeda4b70408e382328d8bbe52a256fe9bc63ae3db86d804608367e5422c \
- --hash=sha256:6744f504375775d7609c82c8d3d94af1c9a6f05586984536905908ba905277b9 \
- --hash=sha256:67a97e5b6c457f0cd3cfc19ebb2d84463e60c3ece754cc831e4281a3ca29bb18 \
- --hash=sha256:69f2e9244542cb34dd59c7f073445b9e54ad9f3fce8d93606c368a1b499fc413 \
- --hash=sha256:6ce32763ac31ce94fe9aada947e479b1975012bff166da409b4b9e4e376cf7e5 \
- --hash=sha256:6f56a647e4eaf5f0ca40330fb070f566bdf9f7b0db89a1af20d71c28dcd7a0ab \
- --hash=sha256:727ab4244622cd6ad2390f322642090c877d2e83a608d2653a7643ae5368d926 \
- --hash=sha256:74d6a0c31472fe5d814917266b9f46495d7c61ed890af08b468acea92fb89a8d \
- --hash=sha256:78b0aa6bfb7be8deed0ab23e7aa028cc5210c29bc2d32a04d52b50e517a7307e \
- --hash=sha256:7975bc88ab4b0f72ef2a2d5ae9d77d87efb5ef95e8f8046242fa9afdaaf2030b \
- --hash=sha256:7a4fdb9326aab4a5a477a1640e5ad786a8495901009d7e7b038371edd23a9d2b \
- --hash=sha256:844c858fc3bb7eacc0ba8efa904935d16aac6a4470948ad1e7e55c9f5a2a665f \
- --hash=sha256:87bacdaf225117a342a20d9c03438d701c02112f6e3f351ce9b7f32354f14797 \
- --hash=sha256:8a983a603a18c8708f024f7f6991b2e66159219abbf894634c5056243c55f3cd \
- --hash=sha256:8d1b4d0e0c2119587a31f5c029abd547e0c81d93b89d394566fe1588659eb579 \
- --hash=sha256:9011395be8db1827d106c6449b4bb6dd17e331ff6ec521f227e4588f1c78e46f \
- --hash=sha256:93fc2bf40cd7f4a0256010dce073d44eeb4a351b9bca94d0477ce2b6e62532b3 \
- --hash=sha256:95821352042722cd9f1108874579a47989d0a7e12a37d87d2fc4af20fd99ab8a \
- --hash=sha256:9907a4402ab6db12b7077a0ea5d7a4d028ecb22c8eee2b53527080d347cd1562 \
- --hash=sha256:9a04c28c10ba7fd12842b109d2edb0678872a2fe65277ca4ff06a0d61edee245 \
- --hash=sha256:9a5934eaea872e17936b5f45501eba5ab0bce9a74122e172b663d7c28c459c4a \
- --hash=sha256:9b984d1eb252145d6302c1dbd5e87fc6d404d45531447c84eadec04bf1fcb027 \
- --hash=sha256:9c210a6994b21aa9b29e81c8d11560e8fdab54c117e9cff37870d0a27bde1343 \
- --hash=sha256:9d8f204c8e3a8bf9ece17e0a83d137fd807440977f8a5e762d59306795011440 \
- --hash=sha256:a8f7176b83664af44567e9cc06e0d3827823fcc1a5e52307ebb8ac3aa95860b9 \
- --hash=sha256:a9dec1aca52dddde7df94818310fa2fe79739c8f385b2014c4cb1035f5508199 \
- --hash=sha256:ab5be648d5a0b86b7438864f8df3c705a65cef35a2fd3e5561e3e203167e0f27 \
- --hash=sha256:abd621552ede77c4c69be7fac44ba911225b0c812b6ba604e5964cf98085b474 \
- --hash=sha256:ac2745950b2bff80219c15ebf2fa9d8427eba7e249739f97e55c9d169e47e9e1 \
- --hash=sha256:aed9658797d0b45d6c49adcfc6b41f66e6f2d0c6de3ec79e16cf4b1855df240f \
- --hash=sha256:b6c0febfe38f22df2eb565c0ce8a092bb80411e56861ca382c443da83105423f \
- --hash=sha256:b9cf53ba90717db2e292401de290776c498d4bbfb0d4a559ca2895db8b9dcb5c \
- --hash=sha256:ba519b2d765df9871a25879e6f7fa78948ea59a2a31f9c1a257e34b651994afc \
- --hash=sha256:c318a64b53d97b841d7b5e637517e50a27be64bc695128422953d4b21710954e \
- --hash=sha256:c3723ff8eb8721f4daac98bc0256f15158e05316d5e52648ce9cebee434fbdd5 \
- --hash=sha256:c754dafdf5aaf0b401b644a90a30046929a0dd1a536e0ff0ec959a59155d9c7f \
- --hash=sha256:c803a3d331796255af51ba2c79ed0ac8275865b516c09e61f248d1e7aff31ce9 \
- --hash=sha256:c8cc5094b08abeae52da9c73c8a32003623be691a5193df2f4e3eac3d557c394 \
- --hash=sha256:cf3638274ab9d9b724c9baa0b4c04e132cd6faefb78b4dd3dd1a02a4bdaad41e \
- --hash=sha256:d047f6498c973874ba08ac3f97c69a2c4b2211c8de6f4c205f75cb1c9522596e \
- --hash=sha256:d2beb1c7cab10603aecdc42f8edd6ff013f9a32e4543474e38e6b77ce9975aeb \
- --hash=sha256:d7f513d3185e6fec82d0c3518f2e6365d8b4e49f5f45f29640d5162d56a23b54 \
- --hash=sha256:dd57607acc85678925940bd5df0385ff8332083a32fa8d7a43f8767f4997263c \
- --hash=sha256:e0cb7e4dd71f4c32e5e84843cd3c4cd65dda034314004bbe1d7f99af2426ab80 \
- --hash=sha256:e3677c7146ce694874941ba82b57092cc4875445aadf29d72807351023105143 \
- --hash=sha256:e395f7bc31851ef9b612050368cb446e9bc14cd7454b025018980349caf25ae5 \
- --hash=sha256:e422b2d647a65d6b080cad5accd09055d3809bdff00c76fba8dca00ca935572a \
- --hash=sha256:ed55af48b3eb28f43228ca2306788892bcb629eb2b5c4876e2a3659872c2f17a \
- --hash=sha256:ed928d0fda15fc0adc8d13305c8b3c0f2fba5b0669950c9e6d019d9162a3b3e8 \
- --hash=sha256:f4e1a92032a39cd5e3c647ca57dbf33b6a1938fd975623175793f9dbb63236de \
- --hash=sha256:f53ac9f3ef573326d009ed809beff4efcac6451931c2b8132586da4b9e53ff31 \
- --hash=sha256:f5b9daf6b629fce418e0cc3dd0436eac045188fa35deadb7a7f3941d5b8203f9 \
- --hash=sha256:f6518b94edb9150452e9aba08027d4cc293433753ec1fbefb4629a21cbc74181 \
- --hash=sha256:f70db64e8266d7c45d3b735f2e08eeb434b5e03da9a479ae42b2e2e486a21a00 \
- --hash=sha256:fafb4e739e43544d12cb4abd1605fd4683b6ca6a9ad682b7fd8f4d21973eafa8 \
- --hash=sha256:fd0135d34387f5fd087d9be368ea77ea89cf2451dc1cd1c622d35021bcb3ab50
+wrapt==2.2.2 \
+ --hash=sha256:0065a3b657cec06813b4241d2462ccec287f6863103d7445b725fb3a889736f9 \
+ --hash=sha256:055e6fcfaa28e58c6a8c247d48b92be9d56f818b7068aa4f22b15b3343a09931 \
+ --hash=sha256:0788e321027c999bf221b667bd4a54aaefd1a36283749a860ac3eb77daed0302 \
+ --hash=sha256:07fdcb012821859168641acf68afad61ef9783cf37100af85f152550e9677194 \
+ --hash=sha256:09f811d43f6f33ec7515f0be76b159569f4057ab54d3e079c3204dddb90afa2a \
+ --hash=sha256:0abfd648dac9ac9c5b3aa9b523d27f1789046640b58dcd5652a720ddb325e1fc \
+ --hash=sha256:0ad520e6daa9bbf136f14de735474dbec7dcc0891f718e1d274ce8dc92e645af \
+ --hash=sha256:0e64826f920c42d9d9f87e8cc09ffae66c51ede12d59061a5a426deb9aa71745 \
+ --hash=sha256:0e7070c7472582e31af3dfc2622b2381a0df7435110a9388ed8db5ffbce67efb \
+ --hash=sha256:10adb01371408c6de504a6658b9886480f1a4919a83752748a387a504a21df79 \
+ --hash=sha256:11d95fc2fbad3163596c39d440e6f21ca9fccece74b56e30a37ac2fca786a07c \
+ --hash=sha256:173e5bb5ca350a6e0abab60b7ec7cdd7992a814cb14b4de670a28f067f105663 \
+ --hash=sha256:1fc7691f070220215cccb2a20836b9adbaecb8ff22ad47abe63de5f110994fac \
+ --hash=sha256:209112cafd963710a05d199aae431d79a28bc76eb8e6d1bbbb8ad24340722cae \
+ --hash=sha256:2252f77663651b89255895f58cc6ac08fcb206d4371813e5af61bb62d4f7689c \
+ --hash=sha256:25904acb9475f46c24fe0423dbc8fda8cc5fbc282ab3dc6e72e919748c53f4e9 \
+ --hash=sha256:26fc73a1b15e0946d2942b9a4426d162b51676338327dc067ccd8d2d76385f94 \
+ --hash=sha256:2cb07f414fab25dbe6b5c7398e1491423a5c81a6209533639969a6c928d474a4 \
+ --hash=sha256:2cd7181ab1c31192ff5219269830744b5a62020b3a6d433588c4f1c95b8f8bff \
+ --hash=sha256:2e096c9d39a59b35b63c9aacfbbbec2088ff51ff1fc31051acc60a07f42f273a \
+ --hash=sha256:305d4c247d61c4115794a169141823c62f719525ddb90b23aa332741c77d2c28 \
+ --hash=sha256:30f7424af5c5c345b7f26490e097f74a2ef45b3d08b664dc33571aee3bd3b56c \
+ --hash=sha256:3179a4db066b53d40562e368b12895440c8f0953b6543b89d6acc41c0273996e \
+ --hash=sha256:3442eee2a5798f9b451f1b2cd7518ce8b7e28a2a364696c414460a0e295c012a \
+ --hash=sha256:385cb1866f20479e83299af585375bfa0a4b0c6c9907a981483ea782ea8ae406 \
+ --hash=sha256:3a4eb7964ff4643d333c84f880bcf554652b2a1050aebc54ae696327f61acfaf \
+ --hash=sha256:3b686cfc008776a3952d6213cb296ed7f45d782a8453936406faa89eac0835ab \
+ --hash=sha256:3c4095803491f6ef72128914c28ec05bbad9758433bb35f6715a3e9c8e46fb2d \
+ --hash=sha256:3dc3dcfc2da95d501905f10dc11a0dc622e91d8cdd8bbfcb63ca54afd131e556 \
+ --hash=sha256:4250b43d1a129d947e083c4dc6baf333c9bb34edd26f912d5b0457841fc858ab \
+ --hash=sha256:4402f57c5f0d0579599858ffbdd9bf4e3f0972f51096f2bd6cc7dab6b76ee49e \
+ --hash=sha256:45c2f2768e790c9f8db90f239ef23a2af8e7570f25a35619ef902df4a738447f \
+ --hash=sha256:4b481fb0c40d9fd90a5809911208da700987d373a20a4709dc9e3944af7a6bec \
+ --hash=sha256:4bccea5cdecffa9dd70e343741f0e41e0a16619313d04b72f78bb525162ebcd0 \
+ --hash=sha256:518b0c5e323511ec56a38894802ddd5e1222626484e68efe63f201854ad788e5 \
+ --hash=sha256:5499236ad1dc116012e2a5dd943f3f31af12fce452128e2bbcbd55a7d3d4d14c \
+ --hash=sha256:55b9a899e6fff5444f229d30aa6e9ac92d2216d9d60f33c771b5d76a760d5f8e \
+ --hash=sha256:58f9f8d637c9a6e245c6ef5b109b67ec187d2faed23d1405656b51d96e0a5b56 \
+ --hash=sha256:5bad217350f19ce99ca5b5e71d406765ea86fe541628426772b657375ee1c048 \
+ --hash=sha256:5d0a142f7af07caeb5e5da87493162a7b8efa19ba919e550a746f7446e13fb30 \
+ --hash=sha256:62415fd095bc590b842b6d092f2b5d9ccbaeb7e0b28535c03dcea2718b48636b \
+ --hash=sha256:656593bb3f5529f03d27af4136c4d7b11990e470bcbc6fefa5ef218695bece55 \
+ --hash=sha256:6c99012a22f735a85eed7c4b86a3e99c30fdd57d9e115b2b45f796264b58d0bf \
+ --hash=sha256:6d1a6050405bf334be33bf66296f113563622972a34900ae6fa60fd283a1a900 \
+ --hash=sha256:6e7e45b43d3c774d244fe7264378f5a3f0f383bc55a54a9866434e524540110f \
+ --hash=sha256:6fe35fd51b74867d8b80174c277bd6bbf6a73e443f908129dc531c4b688a20d5 \
+ --hash=sha256:7d2f6573561fa05002e5ee71529f4ab0a7dffed3e45b51013fe6298fe2723c02 \
+ --hash=sha256:814f1bf3e0a7035f67a1db0cdaf5e2bbcaa4d7092db96673cfa467adeaab8591 \
+ --hash=sha256:8374eb6b1a58809211e84ff835a182bb17ab2807a5bfef23204c8cff38178a00 \
+ --hash=sha256:8417fd3c674d3c8023d080292d29301531a12daf8bd938dd419710dd2f464f2b \
+ --hash=sha256:8636809939152be6ae20a6cef0fed9fe60f411b47847d0426a826884b469e971 \
+ --hash=sha256:8ffbeaea6771a6eba6e6eeb09767864995726bc8240bb54baf88a9bb1db34d5c \
+ --hash=sha256:94b00b00f806eb3ef2abe9049ed45994a81ee9284884d96e6b8314927c6cea3d \
+ --hash=sha256:955f1d6e72a352e478de8d8b503abe301c5e139a141b62eb0923bd694995025f \
+ --hash=sha256:9e8b648270c613720a202d9a45ebabc33261b22c3a839b115ac5bce8c0bb0d69 \
+ --hash=sha256:9ee098171b07edba66ab69a9bf0251d3cbef654107e800feb24c0c6f30592728 \
+ --hash=sha256:a28287413351cb198b8c5ddd045c56fac1d195808642cd264d1ab50426146650 \
+ --hash=sha256:a2d78c363f97d8bd718ee40432c66395685e9e98528ccaa423c3355d1715a26d \
+ --hash=sha256:a41e758d80dc0ab8c210f641ac892009d356cf1f955d97db544c8dd317b4d14c \
+ --hash=sha256:a795d3c06e5fbf9ea2f13196180b77aeab1b4685917256ee0d014cc163d90063 \
+ --hash=sha256:aa14b01804bce36c6d63d7b6a4f55df390f29f8648cc13a1f40b166f4d54680d \
+ --hash=sha256:abf033b7e4542357659cd83ed6cd5033c43aaa1887044045ceb571528837f72f \
+ --hash=sha256:abf8c20a2d72ee69e16328b3c91342c446e723bfe48bfcc4dded3b9722ac027f \
+ --hash=sha256:b84cd4058001c9727b0e9980b7a9e66325b5ca748b1b578e822cade1bc6b304f \
+ --hash=sha256:b89d8d73c82db2bb7e6090b3afd7973f980d24e905cc34394eab60b884b3bf67 \
+ --hash=sha256:bbf00ee0cb55ec24e2b0995a71942b85b21a066db8f3f46e1dbfdb9433ffba81 \
+ --hash=sha256:c20279cd1a29800815d7b2d6338b60a6c6e78263f9d6e62e0eda251ba9cae2d0 \
+ --hash=sha256:c38510a21d5b9cf3e84c460d909e9f2a098667439fd42841bb081cab45835d68 \
+ --hash=sha256:c427c9d06d859848a69f0d928fe28b5c33a941b2265d10a0e1f15cd244f1ee33 \
+ --hash=sha256:c5d7825491bfa2d08b97e9557768987952c7b9ae687d06c3320b40a37ccb7f20 \
+ --hash=sha256:c6c64c5d02578bc4c4bca4f0aef1504de933c1d5b4ac2710b9131111459506c8 \
+ --hash=sha256:cd385a48b055bdc3630ab30e0c7fd8514a36904ec23f9cee7a65d887334a3cea \
+ --hash=sha256:d01d8e0afc55823245a3b97a79c7c77464e31ea7a7b629a4bf26f9441dc1f18e \
+ --hash=sha256:d09db0f7e8357060d3c38fc22a018aba683a796bf184360fd1a58f6fc180dc77 \
+ --hash=sha256:d619e1eed9bd4f6ed9f24cd61971aa086fa86505289628d464bcf8a2c2e3f328 \
+ --hash=sha256:d8a15813215f33fa83667bfc978b300e35669ea8bb424e970a1426bcb7bc6cca \
+ --hash=sha256:dcaa5e1451bd8751d7bd1568dfa3321c78092a52a7ecb5d1a0f18a5791e1fd00 \
+ --hash=sha256:dfb00cb7bb22099e2f64b7340fb96113639aa7260c0972af3797ace2297b936c \
+ --hash=sha256:e542b7c5af91e2123a8aabf19894319d5ec4268d2a9ffd2f239386133fc47746 \
+ --hash=sha256:e5a5290e4bf2f332fc29ce72ffb9a2fff678aaac047e2e9f5f7165cd7792e099 \
+ --hash=sha256:e6fb7e94e8fe3e4c3067bb1653a91cce7c5e83acc119fdd41501b1bf74654617 \
+ --hash=sha256:e7f10ee0bd53673bfd52b67cbce83336fe6cad90d2377b03baf66491d2bbfb91 \
+ --hash=sha256:ec8f83949028366531383603139403cac7a826e4011955813cdd640017845ce5 \
+ --hash=sha256:ef2cce266b5b0b07e19fa82e59673b81142b7a3607c8ed1254113d048ed668da \
+ --hash=sha256:f1a2ff355ece6a111ca7a20dc86df6659c9205d3fcee674ca34f2a2854fd4e73 \
+ --hash=sha256:f32fe639c39561ccc187bcae17e9271be0eb45f1c2952510d2f29b33ab577347 \
+ --hash=sha256:f4bfd8d1eb438153eff8b8cfe87f032ba65731e1ce06138b5090f745a33f6f95 \
+ --hash=sha256:f90038ab58fafb584801ca62d72384d7d5225d93c76f7b773c22fae545bd8066 \
+ --hash=sha256:fa81c5b5fe8cd6c41e3a798533b81288279e5fdbde2128f21071922764281c99 \
+ --hash=sha256:fb18fc51e813df0d9c98049e3bf2298a5495a648602040e21fa3c7329371159e
# via
# -c src/backend/requirements.txt
# opentelemetry-instrumentation
@@ -2395,7 +2393,6 @@ xmlsec==1.3.17 \
--hash=sha256:f3fac9ae679f66585925cc00c5f6839ae36c1d03157619571dee18acc05b9c01
# via
# -c src/backend/requirements.txt
- # -r src/backend/requirements.in
# python3-saml
zopfli==0.4.3 \
--hash=sha256:0087c9a6f0c8a052be0f6d1a9bb71b6caffdd3e10201d6d6166e28d482cebe6d \
diff --git a/src/backend/requirements-dev-3.14.txt b/src/backend/requirements-dev-3.14.txt
index f711289cc9..e238f1978e 100644
--- a/src/backend/requirements-dev-3.14.txt
+++ b/src/backend/requirements-dev-3.14.txt
@@ -248,119 +248,104 @@ charset-normalizer==3.4.7 \
# -c src/backend/requirements.txt
# pdfminer-six
# requests
-click==8.4.1 \
- --hash=sha256:482be17c6991b8c19c5429a1e995d9b0efdbb63172824c41f99965dc0ade8ec2 \
- --hash=sha256:918b5633eddf6b41c32d4f454bf0de810065c74e3f7dbf8ee5452f8be88d3e96
+click==8.4.2 \
+ --hash=sha256:9a6cea6e60b17ebe0a44c5cc636d94f09bd66142c1cd7d8b4cd731c4917a15f6 \
+ --hash=sha256:e6f9f66136c816745b9d65817da91d61d957fb16e02e4dcd0552553c5a197b76
# via
# -c src/backend/requirements-dev.txt
# pip-tools
-coverage[toml]==7.14.1 \
- --hash=sha256:0177614a0370f227888b4e436a7c55686d6a9f90eb1ade2b624ba685a1686e86 \
- --hash=sha256:01b7733daad0237daa01ef80fe2dfceffc911e6a17fa7b55d14aa8214eaaaecd \
- --hash=sha256:03a6f93c1ec3b7f2e77b5dbcc5573a2c21f12529a5c6bbe0f16f72303cc2fa4d \
- --hash=sha256:042c46ded7c288aeb07cf14a28b6c1e10b78fcba40171c3fa1e939377eeef0b5 \
- --hash=sha256:06144cd511cf2624873a035c5069cf297144f6e77a73ee3d7a55b605ec5efb42 \
- --hash=sha256:07c6290b1697b862c0478eab545eec949a0d0e4d6d03497f446d706da3b4f2de \
- --hash=sha256:10274a1fbeb8ec5d72966e17bb198a3104257aca4ac09d98667c5f8aca8c8548 \
- --hash=sha256:1101a5ebb083aecb625ebb6209d4105b58f647b093cb2dc8122d7b33f743cfe1 \
- --hash=sha256:114c95ef29302423b87d159075805f4ab973254a2638a5d7d046c94887cc87d7 \
- --hash=sha256:1238cb94638e610e972c60dac68e813f868dc7d6e982535270558443058d9d59 \
- --hash=sha256:12c42ec1e14f553c4f817e989365982e646e27211f10a0f717855b94a79c8906 \
- --hash=sha256:145986fe66647eb489f18d9a997567a3fd358584c4b5a808769113abc07466af \
- --hash=sha256:17a5a241e5997621a956a7f402a7433ef4221e5152809b785bec79e2323799f1 \
- --hash=sha256:1896f5e19ff3f0431c7ce2172adc54890fd97f86b59ced8ca1649145d9ffe35d \
- --hash=sha256:196a13319ad88d6d8ef5ab489ec4f44ddde2143c0c7d5b27786f6c3ffd56a7e1 \
- --hash=sha256:221c70f316241a78e77e607c227cefc8808d4e08f28d99c04f35694690e940be \
- --hash=sha256:2222be86d0b54f5dd5a38f45f17f315f737245e857bf0bdedc70734f84a13c02 \
- --hash=sha256:2224f89ffd0c5605ccce1ed7a584da162bc7c55f601ab1c946bc9de31a486b42 \
- --hash=sha256:23bf7fa51ac02e07fc7c96849b82946da47ae862dc8f86d183b2a4864fc38129 \
- --hash=sha256:2d69af5dea2de76fc485a83032a630523f985198b7e25be901ec60181587b01e \
- --hash=sha256:30c08f7d90415aa98b3c990385dea2939b0da55f38515e5b369b83655f8523be \
- --hash=sha256:357d4e32935c36588aaba057d734fa32428c360c9fc2e4442afbf1b646beee6e \
- --hash=sha256:35ab22d91de736e8966b980dc355cbcdd2c6dbbcfe275f9a2991bc8a91b3df65 \
- --hash=sha256:370c5afae3fa0658e11694a32b24c2778f6bc2d17718121f94ee185e69f26b54 \
- --hash=sha256:3758dd0a7f1fa57365ef2e781df0f0731d38b6e3772259d13dae4bd8a958d4b1 \
- --hash=sha256:39b21e212c55af06fa375e3dbf90a8a8e38792f3a910c580066d23563830ddd5 \
- --hash=sha256:3a56abc20a472baf0304c455721bc601477440d28ecfde8a03dde79ede07e0df \
- --hash=sha256:3c18ebc343e15be53049b3a2dce38fe82d58f37e20ab9094b3a39c0aa4f6bb47 \
- --hash=sha256:3d452fd08b5c72c5167c93e6867b5c08500bd40f2a21e1e854a500550b6cc36f \
- --hash=sha256:3e3680291c4a1d0dadfa84a2c459576a4af5133abb617905714339a0c73138cf \
- --hash=sha256:442cc9c952b2df400cda54bb04ab87330cf2cd08a8692cbbea36773531eb6f37 \
- --hash=sha256:46f714d2fb8ae2f4f29f23ada7f1e79b759fff5a70f94a1dac23af204c3ec9e4 \
- --hash=sha256:478b5bcd63c2e1357c5c7e16c070690df7b07f676b1c114d7b93e533c664309f \
- --hash=sha256:48b283b1dd6372e8de2a7a9a4c4d5dc06f4d4fd209b876f3c88a7a205a0c8f84 \
- --hash=sha256:4a28fd227808366b196a75476dced2eb35b351d6766ba9c858dc93319e87f4f1 \
- --hash=sha256:4ea1c034f95c9b056e856b794630b17f9fa3d57e4800ff1e503d3be0f9c9078c \
- --hash=sha256:51bd64741cc6fa065abd300ede1afe5a5291ece9c31da8b24884deda48bcc3f8 \
- --hash=sha256:54acdb6674a4661768d7bf7db32dfb9f46ab1d764f8aba6df75ce1a6a088724e \
- --hash=sha256:59baf88468dbc8d63b1887afd92bda52e40bb1561696e5819670601403810cec \
- --hash=sha256:5a1c5215be81035e629d5bc756650634d0bf31991038db7a0eccb90f025ce16d \
- --hash=sha256:5b0c99ba93a07d56f6df340bb79be53202a082b2fdb81bfe6190b741a3470d54 \
- --hash=sha256:5ea0c297e27133853b4d8a3eb799bff5a2dbd9f2f41537a240d337ac9b4df890 \
- --hash=sha256:5f0cfc27c539f07cf5c0a4cfe211d0b6cae039f8f40526dbaa71944e64b50a7b \
- --hash=sha256:6223a72fd0e4c7156353ec0f08a5f93623e1d3034d0e2683b9bb8ea674131b1d \
- --hash=sha256:62a9f70b52e0b5a95cfef4a5c5641b06983cadc5e538a3feeb5c00211f523ac2 \
- --hash=sha256:62fd185ef9df3c33d1c8178c5af105f762afbad96038de9a4ae100aa6297ca33 \
- --hash=sha256:6a3cb83d1552c0cd1b4906655b6a33fd4a8473229633a901c6b73bf86914dee9 \
- --hash=sha256:6adc5a36984624a70bf11d7184e20fa0a49aa7c47ffab43804106a1a695ea22e \
- --hash=sha256:6b6b0853b895fe0e98cbfc580d1ec3393d9302b4b1e96a77b3f5c91fdab899e6 \
- --hash=sha256:6ff665fb023a77386fe11685190cee1f60a7d635994a30d9b0a061533d470fce \
- --hash=sha256:7279d2110a28cebc738b6459ecda2771735a4c18465fbbd36b3288fe5ed92247 \
- --hash=sha256:76a085d7005236a767e3426148b2c407e53ad61695c562f8a81da2d373324901 \
- --hash=sha256:7771b601718fdde84832c3a434ca9bbf4ae9adbc49d84198b4110700c3c77c36 \
- --hash=sha256:79058c47dae6788504b5effb319961bcd72d7240551464b91d474bc0ed186d69 \
- --hash=sha256:7af486dabe8954d03b087f0021540897afe084f04e16ff5579e08cc46f871416 \
- --hash=sha256:7f02d09f70776579b926d889a4c9c235070a1f47c40458aeaca563fae5acfdb5 \
- --hash=sha256:8011224a62280e50dab346960c03cf47aca1a1e09e608c0fb33fd6e0cc8e9500 \
- --hash=sha256:8270544c361ed405a27a060dbc9ed2c124b084d96dfdc2d9a2510482aef981ad \
- --hash=sha256:84ac9499e48700399a5dd0ea7085b5091961fec52c68d66b4ec0d3cf7f4441b1 \
- --hash=sha256:84b535f00655ecafe1d929d1fb00ed5d6fa3051ea643ab2c161a3887b86f294b \
- --hash=sha256:851b9e1e4e8a4608e77c79714b2e77c0970d2ed7202a05e92ae407817481887b \
- --hash=sha256:85e85586565842f6932abebd4c18bcb1074223dc0b3576e7d173ca710622813a \
- --hash=sha256:87ebdf787d4888e3f3f2d523eadc6e18c6d18c6d0eb173801a189641627fb37e \
- --hash=sha256:8a3ce026d73290f42f08dafecbd82c193a74df280461fbf97300fec51fd133ee \
- --hash=sha256:9132cd363a68a4c3daa7c8704a654b1e39d3360f6f5b8ddd470608a945236c07 \
- --hash=sha256:99cd41ff91afd94896fea3bc002706b6ae4ce95727d06e4a0f39c0a8d8bd8b1a \
- --hash=sha256:9eeb3fcbc13ba40dfbdb22d01d196a28e9cef9ed4c29b60061a1e0e823a9929d \
- --hash=sha256:a06c76364a9360e33d6d23769aefdf7f66f38e2ffb60ceb1baaa4989d83b695c \
- --hash=sha256:a07891c3f4805442b31b71e84ba3cf29ed1aa9a428284e06deeb4b23e5b46343 \
- --hash=sha256:a24a81f9715ee42ef59a316cc11611c98fe23920f7c81861315c9f3ff4a230f4 \
- --hash=sha256:a252f21c27e38347e60111a3266b03827422a7d5525951aceee313aa68bab1d2 \
- --hash=sha256:a311d8e1da24be5c1ccf85cbfb06315dbaa1703d5a1eab3f6432c72b837917c8 \
- --hash=sha256:a5274669f37f2343635a347b91a60777621341ab3378e9c6ac9335eee704bddf \
- --hash=sha256:aa5e304a873fabddc11e484e9b6b738bd38bd7bed17b09aa84eecf5332e8b8bb \
- --hash=sha256:ab4af6352741a604c431c6072fce5bee33bf0f20dc7a56618d6bf6bb89e9810c \
- --hash=sha256:b553d04b5e778a8e56d57eb134aff42a92718ecba45e79c4764ecfa40efd92ff \
- --hash=sha256:b84800013769a78ccb9ef4659402e26d06867e337b61ec365f77ad008adea80e \
- --hash=sha256:b84ffdf877644e7096aa936991efeed873f7f3df57b9cd001312b7668ab08550 \
- --hash=sha256:bcaa50684dcaadfa599ac48f81103c756d791cfd85c97203d2217c593d48b860 \
- --hash=sha256:be9f2c802dcfce3f71298303aa5dad0dce440a76c52f2f60dacd8656dab78793 \
- --hash=sha256:c643734307300234fafa36bf2a040a7235f8f177ea1fd6ec1423aea6fb7b929f \
- --hash=sha256:c79cead5b5bc584d9c71451cb984d0e3a84e0c0937379c8efcbf27c8d661b851 \
- --hash=sha256:c7e057326434e441306226fbeb5d1aaf14a2637efe97ba668306635835f32ad7 \
- --hash=sha256:c912c259304cfb5ee584481cfb7ce1ff932b4d61e6c9140b8f19cb7b5ed82332 \
- --hash=sha256:ce66d8e46da2bb5ee313a745cbd2e391d319176c1f7a9451bfcd3a2fb920859b \
- --hash=sha256:ced2f09ef276fd58611a1ef502164ad266d2b75174e5a40cabbdb4033f9f6cf2 \
- --hash=sha256:cfe5a5fec635799ef33428f1e5e61bafa45a92a96190ba731561ba558ccc214d \
- --hash=sha256:d13e6725992e2d2fd7d81d4f5241952d13740121dfd501da09201be39b2c003a \
- --hash=sha256:d34d75f892b3ab73ba11cab5442cce7b3e168fd64162b16f0e1e0d09c508edef \
- --hash=sha256:d5b89cdfb2ee051b71e8c3c70bd81a9eff81100f736a269136fe1a68efe00474 \
- --hash=sha256:d5ed429d0b8edaac649e889b4ffcedb6c80b06629a3f93050e3dddfb99235bee \
- --hash=sha256:da028256b04ec30e5e0114b6f76172938c313991f0a2d3d894271315cf5d5e43 \
- --hash=sha256:dcbf65f1f66a26cdd88c35cf68fb4729c5d1cd2e88added72420541dfb212034 \
- --hash=sha256:dd34767fa19848d35659ffc0a75314f58c7af3f1cd87ec521e8292a1238398a3 \
- --hash=sha256:ddf799247318f34dbcd2efa8c95a8d0642674e926bb1774cf9b63dfd2a389d1c \
- --hash=sha256:de286598cc65d2b489411174b1faec2f5a7775fb3201fd925db2a76b4030f37d \
- --hash=sha256:e471bc5769ff073b058cfadb0d736b56ce067c8560eabeb0da88462df98c23e7 \
- --hash=sha256:e854312c4103f2ad4c0dc023b69b77ebfd2c89db5f86c4c94dc2353f9a92167e \
- --hash=sha256:ea8cd6ca0ee9f616aaef3afc6882e32c2cbf18b00d96313ffd76af650574034d \
- --hash=sha256:f2302660e32562a532b442480121aef8aa61a5bdb20b30bf0adab29f10a5a4b4 \
- --hash=sha256:f497a1ea81d4cd7c10ddcaa685135b9aabd291af3d55775a9ddf3cb7a364cdd9 \
- --hash=sha256:f4ddbe407477f04c45115d1a4e5bc480f753553b534d338d4c3358b1cdd0ea52 \
- --hash=sha256:f747dc8edcfe740130f28f32f3995e955494285717e86ee25af51db2219df08a \
- --hash=sha256:fad54e871165f6ec2f536063ac74c3104508a12963e64072ba44bd822de52b0c \
- --hash=sha256:fc459e5d73be2d6332fcfe8dbf3d8994671fe33c700f4565988ecfa511547253 \
- --hash=sha256:fd86572566fb40189a8260446158235159bc7a82dfbc87a3b39cf4fb57fcec1c
+coverage[toml]==7.14.3 \
+ --hash=sha256:0096fd7559178f0cc9cf088f2dbd2a02ef85bacaa69732c633517286b4494610 \
+ --hash=sha256:02c41de2a88011b893050fc9830267d927a50a215f7ad5ec17349db7090ccf26 \
+ --hash=sha256:0423d64c013057a06e70f070f073cec4b0cbc7d2b27f3c7007292f2ff1d52965 \
+ --hash=sha256:0ee68f5c34812780f3a7063382c0a9fcbb99985b7ddcdcaa626e4f3fb2e0783a \
+ --hash=sha256:11a7ec9f97ab950f4c5af62229befc7faf208fdbc0116d3902d7e306cf2c5abd \
+ --hash=sha256:1551b4caac3e3ec9f2bfcec6bf3776e01c0edbdd2e240431a50ca1a1aac72c27 \
+ --hash=sha256:16b206e521feb8b7133a45754643dead0538489cf8b783b90cf5f4e3299625fd \
+ --hash=sha256:1a7563a443f3d53fdeb040ec8c9f7466aed7ca3dc5891aa09d3ca3625fa4387f \
+ --hash=sha256:1bb93c2aa61d2a5b38f1526546d95cf4132cb681e541a337bf8dfd092be816e5 \
+ --hash=sha256:1e3b91f9c4740aeb571ecf82e5e8d8e4ab62d34fcb5a5d4e5baa38c6f7d2857c \
+ --hash=sha256:2415902f385a23dcc4ccd26e0ba803249a169af6a930c003a4c715eeb9a5444e \
+ --hash=sha256:27d07a46500ba23515b838dbcf52512026af04090755cf6cc64166d88c9b9a1a \
+ --hash=sha256:2bfc4dd0a912329eccc7484a7d0b2a38032b38c40663b1e1ac595f10c457954b \
+ --hash=sha256:2e41fd3aab806770008279a93879b0924b16247e09ab537c043d08bbca53b4ab \
+ --hash=sha256:338b19131ab1a6b767b462bfcbaa692e7ae22f24463e39d49b02a83410ff6b37 \
+ --hash=sha256:360bec1f58e7243e3405d3bdf7a1a8115aa9b448d54dc7cd6f7b7e0e9406b62e \
+ --hash=sha256:39e1dbbb6ff2c338e0196a482558a792a1de3aa64261196f5cdb3da016ad9cda \
+ --hash=sha256:3c68df8e61f1e09633fefc7538297145623957a048534368c9d212782aa5e845 \
+ --hash=sha256:3d74ff26299c4879ce3a4d826f9d3d4d556fd285fde7bbce3c0ef5a8ab1cec24 \
+ --hash=sha256:3e5b550a128419373c2f6cec28a244207013ef15f5cbcff6a5ca09d1dfaaf027 \
+ --hash=sha256:41de778bd41780586e2b04912079c73089ab5d839624e28db3bdb26de638da92 \
+ --hash=sha256:47968988b367990ae4ab17523790c38cd125e02c6bfd379b6022be2d40bdc38c \
+ --hash=sha256:4b60ca6d8af70473491a15a343cbabab2e8f9ea66a4376e81c7aa24876a6f977 \
+ --hash=sha256:4d310baf69a4fbe8a098ce727e4808a34866ac718a6f759ae659cbd3221358bc \
+ --hash=sha256:526ce9721116af23b1065089f0b75046fe521e7772ab94b641cd66b7a0421889 \
+ --hash=sha256:583d50d59142f8549470bd6390471d0fe8b8c8d69d6a0f28ac71e05380cef640 \
+ --hash=sha256:5952f8c1bda2a5347154450379316e6dfa4d934d62ca35f6784451e6f55074fb \
+ --hash=sha256:5d788e5fd55347eef06ca0732c77d04a264de67e8ff24631270cdff3767a60cf \
+ --hash=sha256:605ab2b566a22bd94834529d66d295c364aba84afd3e5498285c7a524017b1fc \
+ --hash=sha256:611e62cb9386096d81b63e0a05330750268617231e7bd598e1fe77482a2c58a5 \
+ --hash=sha256:6197e5a00183c11a8ce7c6abd18be1a9189fd8399084ffc95196f4f0db4f2137 \
+ --hash=sha256:621e13c6108234d7960aaf5762ab5c3c00f33c30c15af06dcbff0c73bf112727 \
+ --hash=sha256:62c7f79db2851c95ef020e5d28b97afde3daf9f7febcd35b53e05638f729063f \
+ --hash=sha256:64b2055bb6e0dc945af35cdeceb3633e6ed9273475ef3af85592410fd6803803 \
+ --hash=sha256:68520c90babfa2d560eca6d497921ed3a4f469623bd709733124491b2aa8ef3f \
+ --hash=sha256:69918344541ed9c8368566c2adc03c0e33d4550d7faa87d1b35e49b6a3286ea9 \
+ --hash=sha256:6a3693b4153394d265f44fb855fdc80e72403024d4d6f91c4871b334d028e4e0 \
+ --hash=sha256:74fdd718d88fe144f4579b8747873a07ec3f04cb837d5faec5a25d9e22fa31a8 \
+ --hash=sha256:7b27c822a8161afbe48e99f1adfb098d270ae7e0f7d7b0555ce110529bdb69cc \
+ --hash=sha256:7dfe427045520d6abca33687dfef767b4f635015893a1816c5decb12eb72ce18 \
+ --hash=sha256:7ea52fc08f007bcc494d4bb3df3851e95843d881860ba38fe2c64dc100db5e7d \
+ --hash=sha256:830c1fca669c572dec37ce9c838224ee45aac5be0f6961edf871e82e49d6537c \
+ --hash=sha256:8427f370ca67db4c975d2a26acfc0e5783ca0b52444dbc50278ace0f35445949 \
+ --hash=sha256:878832eaac515b62decfa76965aed558775f86bf1fc8cca76993c0c84ae31aed \
+ --hash=sha256:8ac012839ff7e396030f1e94e10553a431d14e4de2ab65cb3acb72bbd5628ca2 \
+ --hash=sha256:8cec0ad652ec57790970d817490105bd917d783c2f7b38d6b58a0ca312e1a336 \
+ --hash=sha256:8cf0f2509acb4619e2471a1951089054dd58ebea7a912066d2ea56dd4c24ca4a \
+ --hash=sha256:90f7608aeb5d9b60b523b9fb2a4ee1973867cc4865a3f26fe6c7577073b70205 \
+ --hash=sha256:92c22e19ce64ca3f2ad751f16f14df1468b4c231bd6af97185063a9c292a0cb3 \
+ --hash=sha256:96150a9cf3468ea20f0bc5d0e21b3df8972c31480ef90fa7614b773cc6429665 \
+ --hash=sha256:98a0859b0e98e43e1178a9402e19c8127766b14f7109a374d976e5a62c0e5c73 \
+ --hash=sha256:9973ef2463f8e6cfb61a6324126bb3e17d67a85f22f58d856e583ea2e3ca6501 \
+ --hash=sha256:9a3f142070eb7b82fc4085a55d887396f9c4e21250bccebe2ba22502c45b9647 \
+ --hash=sha256:9be4e7d4c5ca0427889f8f9d614bd630c2be741b1de7699bca3b2b6c0e41003e \
+ --hash=sha256:a090cbf9521e78ffdb2fcf448b72902afe9f5923ff6a12d5c0d0120200348af9 \
+ --hash=sha256:a2335ea5fed26af2e831094964fa3f8fae60b45f7e37fcc2d3b615b2add3ad87 \
+ --hash=sha256:a3c2134809e80fac091bfed18a6991b5a5eb5df5ae32b17ac4f4f99864b73dd7 \
+ --hash=sha256:a571bd889cd36c5922ce8e42e059f9d37d02301531d11374afa4c87a578625d5 \
+ --hash=sha256:a574912f3bde4b0619f6e97d01aa590b70998859244793769eb3a6df78ee56d3 \
+ --hash=sha256:a64caee2193563601dbaaa55fe2dcf597debef04a2f8f1fa8a07aa4bb7ac7a1e \
+ --hash=sha256:ac082660de8f429ba0ea363595abb838998570b9a7546777c60f413ab902bbde \
+ --hash=sha256:b3d77f7f196abdef7e01415de1bce09f216189e83e58159cfeef2b92d0464994 \
+ --hash=sha256:b3ff255799f5a1676c71c1c32ec01fd043aa09d57b3d95764b24992757184784 \
+ --hash=sha256:b488bd4b23397db62e7a9459129d01ff06a846582a732efd24834b24a6ada498 \
+ --hash=sha256:b75ee850fc2d7c831e883220c445b035f2224de2ba6103f1e56dbd237ab913f7 \
+ --hash=sha256:b7f300ac92cd4b570724c8ffbbd0c130fee298d2447f41d5a3abf58976fae1de \
+ --hash=sha256:beaab199b9e5ceaf5a225e16a9d4df136f2a1eae0a5c20de1e277c8a5225f388 \
+ --hash=sha256:c02efd507227bde9969cab0db8f48890eb3b5dcad6afac57a4792df4133543ce \
+ --hash=sha256:c66f9f9d4f1e9712eb9b1de5310f881d4e2188cfcba5065e1a8490f38687f2c4 \
+ --hash=sha256:c90a7cdd5e380e1ce02f19792e2ac2fbfbf177e35a27e69fd3e873b30d895c0c \
+ --hash=sha256:c946099774a7699de03cbd0ff0a64e21aed4525eed9d959adde4afe6d15758ef \
+ --hash=sha256:cc96aa922e21d4bc5d5ed3c915cef27dfcbc13686f47d5e378d647fbfba655a2 \
+ --hash=sha256:d20a15c622194234161535459affa8f7905830391c9ccfa060d495dbfe3a1c7f \
+ --hash=sha256:d48400185564042287dc487c1f016a3397f18ab4f4c5d5ec36edc218f7ffa35b \
+ --hash=sha256:d8e88f335544a47e22ae2e45b344772925ec65166555c958720d5ed971880891 \
+ --hash=sha256:dc9b4e35e7c3920e925ba7f14886fd5fbe481232754624e832ddba66c7535635 \
+ --hash=sha256:de76caefc8deabb0dd1678b6a980be97d14c8d87e213ac194dbf8b09e96d63fb \
+ --hash=sha256:e0bb8a6bc7015efdf8a928753b25da1b9ca2d6f24ef04d2ee0688e486f32aae7 \
+ --hash=sha256:e343fb086c9cd780b38622fea7c369acd64c1a0724312149b5d769c387a2b1f5 \
+ --hash=sha256:e4ed44705ca4bead6fc977a8b741f2145608289b33c8a9b42a95d0f15aedbf4d \
+ --hash=sha256:e574801e1d643561594aa021206c46d80b257e9853087090ba97bed8b0a509d3 \
+ --hash=sha256:e6230e688c7c3e65cedd41a774eb4ec221adc6bfee13768231015b702d5e4150 \
+ --hash=sha256:ea3169c7116eb6cdf7608c6c7da9ecfcb3da40688e3a510fac2d1d2bafd6dc35 \
+ --hash=sha256:eadea7aba74e40adee867a8c0eec17b820b061d308a4b014f7a0e118c2b0aa61 \
+ --hash=sha256:ed68faa5e85de2f3e400bc3f122e5c82735a58c8bb24b9f63a2215954ba17b2d \
+ --hash=sha256:f0a47095963cfe054e0df178daca95aec21e680d6076da807c3add28dfe920f7 \
+ --hash=sha256:f502e948e03e866538048bba081c075caaa62e5bda6ea5b7432e45f587eb462a \
+ --hash=sha256:f82b6bb7d75a2613e85d07cefa3a8c973d0544a8993337f6e2728e4a1e94c305 \
+ --hash=sha256:fa9e5c6857a7e80fa22ace5cf3550ae392bbfc322f1d8dd2d2d5a8be38cec027 \
+ --hash=sha256:fb7e18afb6e903c1a92401a2f0501ac277dca527bb9ca6fe1f691a8a0026a0e8 \
+ --hash=sha256:fbb8c3a98e779013786ae01d229662aeacbc77100efbd3f2f245219ace5af700
# via
# -c src/backend/requirements-dev.txt
# -r src/backend/requirements-dev.in
@@ -446,15 +431,15 @@ django-slowtests==1.1.1 \
# via
# -c src/backend/requirements-dev.txt
# -r src/backend/requirements-dev.in
-django-stubs==6.0.5 \
- --hash=sha256:7742b8e60afc68a8545158e2bdb103376d5a092f7902c17f370920a9c08eb957 \
- --hash=sha256:9fb9eede9b2fc47b36c3dc4a93652eb959dff45466ec4a580e4a22782192d746
+django-stubs==6.0.6 \
+ --hash=sha256:c488fea05a9eac40ddbdc69887f63a5c0922cb13df285291ee99c9bbc89bc4f1 \
+ --hash=sha256:dfc01e052e33c7f8f0c30c3ff8eda0903ee29ac710d1e46d9effd773744a69b0
# via
# -c src/backend/requirements-dev.txt
# -r src/backend/requirements-dev.in
-django-stubs-ext==6.0.5 \
- --hash=sha256:1cc325e991303849bce70e19748981b225ef08b37256f263e113caf97cd3bcc0 \
- --hash=sha256:a9932c8233d6dd4e34ae0b192026379c1a9be8f0b7c27aa1fa09ae215169773e
+django-stubs-ext==6.0.6 \
+ --hash=sha256:5470c970f61a3ccf5aae7633feef1a097f944f417b955da200c9ac26ecd9134b \
+ --hash=sha256:e6f09884e48d7c5b250a373dfa22aa3e83bb91b8babbd8d05187f6b92247f232
# via
# -c src/backend/requirements-dev.txt
# django-stubs
@@ -669,25 +654,25 @@ sqlparse==0.5.5 \
# -c src/backend/requirements.txt
# django
# django-silk
-ty==0.0.51 \
- --hash=sha256:08adbe53fb8bc9e7f00e89bf1d3c875a02cda76d83f109d2e6ab1ff35a7bfa8c \
- --hash=sha256:25a5b31e6f23fd5dc63ad29087ded09932409e4154e2fe07bbaed015035990bb \
- --hash=sha256:2faed19a8f1505370de071c008df52a994fc03a204f3267c3a33a32ca26f854f \
- --hash=sha256:429a997394dac73870d71b87cc90efc54da3efaf319e72ca18aeef35a78aef90 \
- --hash=sha256:49a21237f6fd1de56beaff0a3e85fe022a09a3401e67e3abec41ce838a5d4d2e \
- --hash=sha256:608d417cd1eaf79bcbd713d9830d5e3db9d57ec225c3af3e4ac9a9ff66b45d70 \
- --hash=sha256:61b4b6a003c3ebe53a63a1125c9b6542aa01bc1b6c9a235d01ee328d000d61a9 \
- --hash=sha256:62ced5e380284f12b2dc4802a3e4ed3dac39913fc6719afde7978814a4c7f169 \
- --hash=sha256:62d94f06e8c317e89b6884f2bde443040e596b88c7c79bd944c84c105b06257a \
- --hash=sha256:79d1877e93460f936bc10ed1a31525702b7ce51075763ccba993be17f0b9e905 \
- --hash=sha256:947986bd82d324b3a5c58ce03f1dad160cdf36443d3e8f64b3484b861ba9bc64 \
- --hash=sha256:abd92913bc90d1705ef9391ff8c6822b61e2e827fa295eb30bf0dfabcf815645 \
- --hash=sha256:b90172d46365bb9d51a7011cbb5c60cc4f514f42c86635df6c092b717f85e1ac \
- --hash=sha256:bc7459348a253247bbfb2669a021e614281b86bbea24c36112b8a6e1a2499a16 \
- --hash=sha256:c1bd1355aee86af01e4e21b0bc16fc460fb05905761f0d8b8d70841de0feade8 \
- --hash=sha256:cc233a6235fb23e2a44b14731a10043e37ba2f30f2c361cf49ad3633c5b9da9c \
- --hash=sha256:dc5e93695ab5dcbf1eef663aee60ec23a413547cc9cb06adcb0d842e9166bd0f \
- --hash=sha256:f8f52952cff665bc52a36147e610c10f5699d30007d7a14ab7f345cff93476ff
+ty==0.0.54 \
+ --hash=sha256:01ab9eb8c0802d35ae73fa08e4e037963250ee5ee6aa7ed8c8b994e5495db5ef \
+ --hash=sha256:0365ea133d6b028952c22e6412a00da9739bc3b538df3c0a61972bf64d8558f1 \
+ --hash=sha256:0de0cf48918609a3996cc2a4e18e8028fc4d2446bb82df822e9737f53bb9afee \
+ --hash=sha256:2259e1a1f744a5f20f079dcc4061c1464001c75f255aaca7316e422f8f5e5e09 \
+ --hash=sha256:57c7c6c1fcd2aa29cd40117142c0d45a2b0e6c42817ef58ea8dcb5f59d6ea802 \
+ --hash=sha256:5a0a764e2261f9292adf14bbc91b9d7ef7ee7c00b8f3d9f2563f19ae3605109b \
+ --hash=sha256:651e90094d41c4add3d616e0f2c1c881c6700a2ae3ac191c023c665050ff2cdc \
+ --hash=sha256:6a0ce5af9eefe636888377d8ab8ea817239ed96de64fede62c4e5331ae16db5c \
+ --hash=sha256:6e43124e6ac4cb9702d99facb28c6b2f2574c8a4b8f59eae2632eef4962e3439 \
+ --hash=sha256:7e876c9b5130afc6b6e46035a2eecca9b563b78249030296e1089922428d5415 \
+ --hash=sha256:8674617617399d4fdd568b3e3a8f87a913df525c80691d732b0744b571b341c8 \
+ --hash=sha256:994ede70fc1b6f0efc29d0f1fc0d819630bed1d2610eac2e9dabb2840f3f3bf9 \
+ --hash=sha256:ad329d1942e23ee428948e673b2a50249f27e164220075b0a2ef8169029c8423 \
+ --hash=sha256:b1d048df26abb433acc5b3bcef214167c7dc9e3341f8f200a3c59702516a0ed0 \
+ --hash=sha256:b6b3cfe174f27744413c898b2488ca52ea76070637095de131698e506b455055 \
+ --hash=sha256:dc179be5a070c5dc7785a5e108eece2ab216978a91f91e11661308749a6c28ee \
+ --hash=sha256:e949f7bbfa80a9fa00968924028aa673a505faa234b0b9d1241b7d34373eae14 \
+ --hash=sha256:f478476f3222807b4d92f15c5298a8c242f2ed17c724da75f4a8c6b522b4f29a
# via
# -c src/backend/requirements-dev.txt
# -r src/backend/requirements-dev.in
diff --git a/src/backend/requirements-dev.txt b/src/backend/requirements-dev.txt
index de265fdb59..3b24ac287b 100644
--- a/src/backend/requirements-dev.txt
+++ b/src/backend/requirements-dev.txt
@@ -238,117 +238,102 @@ charset-normalizer==3.4.7 \
# -c src/backend/requirements.txt
# pdfminer-six
# requests
-click==8.4.1 \
- --hash=sha256:482be17c6991b8c19c5429a1e995d9b0efdbb63172824c41f99965dc0ade8ec2 \
- --hash=sha256:918b5633eddf6b41c32d4f454bf0de810065c74e3f7dbf8ee5452f8be88d3e96
+click==8.4.2 \
+ --hash=sha256:9a6cea6e60b17ebe0a44c5cc636d94f09bd66142c1cd7d8b4cd731c4917a15f6 \
+ --hash=sha256:e6f9f66136c816745b9d65817da91d61d957fb16e02e4dcd0552553c5a197b76
# via pip-tools
-coverage[toml]==7.14.1 \
- --hash=sha256:0177614a0370f227888b4e436a7c55686d6a9f90eb1ade2b624ba685a1686e86 \
- --hash=sha256:01b7733daad0237daa01ef80fe2dfceffc911e6a17fa7b55d14aa8214eaaaecd \
- --hash=sha256:03a6f93c1ec3b7f2e77b5dbcc5573a2c21f12529a5c6bbe0f16f72303cc2fa4d \
- --hash=sha256:042c46ded7c288aeb07cf14a28b6c1e10b78fcba40171c3fa1e939377eeef0b5 \
- --hash=sha256:06144cd511cf2624873a035c5069cf297144f6e77a73ee3d7a55b605ec5efb42 \
- --hash=sha256:07c6290b1697b862c0478eab545eec949a0d0e4d6d03497f446d706da3b4f2de \
- --hash=sha256:10274a1fbeb8ec5d72966e17bb198a3104257aca4ac09d98667c5f8aca8c8548 \
- --hash=sha256:1101a5ebb083aecb625ebb6209d4105b58f647b093cb2dc8122d7b33f743cfe1 \
- --hash=sha256:114c95ef29302423b87d159075805f4ab973254a2638a5d7d046c94887cc87d7 \
- --hash=sha256:1238cb94638e610e972c60dac68e813f868dc7d6e982535270558443058d9d59 \
- --hash=sha256:12c42ec1e14f553c4f817e989365982e646e27211f10a0f717855b94a79c8906 \
- --hash=sha256:145986fe66647eb489f18d9a997567a3fd358584c4b5a808769113abc07466af \
- --hash=sha256:17a5a241e5997621a956a7f402a7433ef4221e5152809b785bec79e2323799f1 \
- --hash=sha256:1896f5e19ff3f0431c7ce2172adc54890fd97f86b59ced8ca1649145d9ffe35d \
- --hash=sha256:196a13319ad88d6d8ef5ab489ec4f44ddde2143c0c7d5b27786f6c3ffd56a7e1 \
- --hash=sha256:221c70f316241a78e77e607c227cefc8808d4e08f28d99c04f35694690e940be \
- --hash=sha256:2222be86d0b54f5dd5a38f45f17f315f737245e857bf0bdedc70734f84a13c02 \
- --hash=sha256:2224f89ffd0c5605ccce1ed7a584da162bc7c55f601ab1c946bc9de31a486b42 \
- --hash=sha256:23bf7fa51ac02e07fc7c96849b82946da47ae862dc8f86d183b2a4864fc38129 \
- --hash=sha256:2d69af5dea2de76fc485a83032a630523f985198b7e25be901ec60181587b01e \
- --hash=sha256:30c08f7d90415aa98b3c990385dea2939b0da55f38515e5b369b83655f8523be \
- --hash=sha256:357d4e32935c36588aaba057d734fa32428c360c9fc2e4442afbf1b646beee6e \
- --hash=sha256:35ab22d91de736e8966b980dc355cbcdd2c6dbbcfe275f9a2991bc8a91b3df65 \
- --hash=sha256:370c5afae3fa0658e11694a32b24c2778f6bc2d17718121f94ee185e69f26b54 \
- --hash=sha256:3758dd0a7f1fa57365ef2e781df0f0731d38b6e3772259d13dae4bd8a958d4b1 \
- --hash=sha256:39b21e212c55af06fa375e3dbf90a8a8e38792f3a910c580066d23563830ddd5 \
- --hash=sha256:3a56abc20a472baf0304c455721bc601477440d28ecfde8a03dde79ede07e0df \
- --hash=sha256:3c18ebc343e15be53049b3a2dce38fe82d58f37e20ab9094b3a39c0aa4f6bb47 \
- --hash=sha256:3d452fd08b5c72c5167c93e6867b5c08500bd40f2a21e1e854a500550b6cc36f \
- --hash=sha256:3e3680291c4a1d0dadfa84a2c459576a4af5133abb617905714339a0c73138cf \
- --hash=sha256:442cc9c952b2df400cda54bb04ab87330cf2cd08a8692cbbea36773531eb6f37 \
- --hash=sha256:46f714d2fb8ae2f4f29f23ada7f1e79b759fff5a70f94a1dac23af204c3ec9e4 \
- --hash=sha256:478b5bcd63c2e1357c5c7e16c070690df7b07f676b1c114d7b93e533c664309f \
- --hash=sha256:48b283b1dd6372e8de2a7a9a4c4d5dc06f4d4fd209b876f3c88a7a205a0c8f84 \
- --hash=sha256:4a28fd227808366b196a75476dced2eb35b351d6766ba9c858dc93319e87f4f1 \
- --hash=sha256:4ea1c034f95c9b056e856b794630b17f9fa3d57e4800ff1e503d3be0f9c9078c \
- --hash=sha256:51bd64741cc6fa065abd300ede1afe5a5291ece9c31da8b24884deda48bcc3f8 \
- --hash=sha256:54acdb6674a4661768d7bf7db32dfb9f46ab1d764f8aba6df75ce1a6a088724e \
- --hash=sha256:59baf88468dbc8d63b1887afd92bda52e40bb1561696e5819670601403810cec \
- --hash=sha256:5a1c5215be81035e629d5bc756650634d0bf31991038db7a0eccb90f025ce16d \
- --hash=sha256:5b0c99ba93a07d56f6df340bb79be53202a082b2fdb81bfe6190b741a3470d54 \
- --hash=sha256:5ea0c297e27133853b4d8a3eb799bff5a2dbd9f2f41537a240d337ac9b4df890 \
- --hash=sha256:5f0cfc27c539f07cf5c0a4cfe211d0b6cae039f8f40526dbaa71944e64b50a7b \
- --hash=sha256:6223a72fd0e4c7156353ec0f08a5f93623e1d3034d0e2683b9bb8ea674131b1d \
- --hash=sha256:62a9f70b52e0b5a95cfef4a5c5641b06983cadc5e538a3feeb5c00211f523ac2 \
- --hash=sha256:62fd185ef9df3c33d1c8178c5af105f762afbad96038de9a4ae100aa6297ca33 \
- --hash=sha256:6a3cb83d1552c0cd1b4906655b6a33fd4a8473229633a901c6b73bf86914dee9 \
- --hash=sha256:6adc5a36984624a70bf11d7184e20fa0a49aa7c47ffab43804106a1a695ea22e \
- --hash=sha256:6b6b0853b895fe0e98cbfc580d1ec3393d9302b4b1e96a77b3f5c91fdab899e6 \
- --hash=sha256:6ff665fb023a77386fe11685190cee1f60a7d635994a30d9b0a061533d470fce \
- --hash=sha256:7279d2110a28cebc738b6459ecda2771735a4c18465fbbd36b3288fe5ed92247 \
- --hash=sha256:76a085d7005236a767e3426148b2c407e53ad61695c562f8a81da2d373324901 \
- --hash=sha256:7771b601718fdde84832c3a434ca9bbf4ae9adbc49d84198b4110700c3c77c36 \
- --hash=sha256:79058c47dae6788504b5effb319961bcd72d7240551464b91d474bc0ed186d69 \
- --hash=sha256:7af486dabe8954d03b087f0021540897afe084f04e16ff5579e08cc46f871416 \
- --hash=sha256:7f02d09f70776579b926d889a4c9c235070a1f47c40458aeaca563fae5acfdb5 \
- --hash=sha256:8011224a62280e50dab346960c03cf47aca1a1e09e608c0fb33fd6e0cc8e9500 \
- --hash=sha256:8270544c361ed405a27a060dbc9ed2c124b084d96dfdc2d9a2510482aef981ad \
- --hash=sha256:84ac9499e48700399a5dd0ea7085b5091961fec52c68d66b4ec0d3cf7f4441b1 \
- --hash=sha256:84b535f00655ecafe1d929d1fb00ed5d6fa3051ea643ab2c161a3887b86f294b \
- --hash=sha256:851b9e1e4e8a4608e77c79714b2e77c0970d2ed7202a05e92ae407817481887b \
- --hash=sha256:85e85586565842f6932abebd4c18bcb1074223dc0b3576e7d173ca710622813a \
- --hash=sha256:87ebdf787d4888e3f3f2d523eadc6e18c6d18c6d0eb173801a189641627fb37e \
- --hash=sha256:8a3ce026d73290f42f08dafecbd82c193a74df280461fbf97300fec51fd133ee \
- --hash=sha256:9132cd363a68a4c3daa7c8704a654b1e39d3360f6f5b8ddd470608a945236c07 \
- --hash=sha256:99cd41ff91afd94896fea3bc002706b6ae4ce95727d06e4a0f39c0a8d8bd8b1a \
- --hash=sha256:9eeb3fcbc13ba40dfbdb22d01d196a28e9cef9ed4c29b60061a1e0e823a9929d \
- --hash=sha256:a06c76364a9360e33d6d23769aefdf7f66f38e2ffb60ceb1baaa4989d83b695c \
- --hash=sha256:a07891c3f4805442b31b71e84ba3cf29ed1aa9a428284e06deeb4b23e5b46343 \
- --hash=sha256:a24a81f9715ee42ef59a316cc11611c98fe23920f7c81861315c9f3ff4a230f4 \
- --hash=sha256:a252f21c27e38347e60111a3266b03827422a7d5525951aceee313aa68bab1d2 \
- --hash=sha256:a311d8e1da24be5c1ccf85cbfb06315dbaa1703d5a1eab3f6432c72b837917c8 \
- --hash=sha256:a5274669f37f2343635a347b91a60777621341ab3378e9c6ac9335eee704bddf \
- --hash=sha256:aa5e304a873fabddc11e484e9b6b738bd38bd7bed17b09aa84eecf5332e8b8bb \
- --hash=sha256:ab4af6352741a604c431c6072fce5bee33bf0f20dc7a56618d6bf6bb89e9810c \
- --hash=sha256:b553d04b5e778a8e56d57eb134aff42a92718ecba45e79c4764ecfa40efd92ff \
- --hash=sha256:b84800013769a78ccb9ef4659402e26d06867e337b61ec365f77ad008adea80e \
- --hash=sha256:b84ffdf877644e7096aa936991efeed873f7f3df57b9cd001312b7668ab08550 \
- --hash=sha256:bcaa50684dcaadfa599ac48f81103c756d791cfd85c97203d2217c593d48b860 \
- --hash=sha256:be9f2c802dcfce3f71298303aa5dad0dce440a76c52f2f60dacd8656dab78793 \
- --hash=sha256:c643734307300234fafa36bf2a040a7235f8f177ea1fd6ec1423aea6fb7b929f \
- --hash=sha256:c79cead5b5bc584d9c71451cb984d0e3a84e0c0937379c8efcbf27c8d661b851 \
- --hash=sha256:c7e057326434e441306226fbeb5d1aaf14a2637efe97ba668306635835f32ad7 \
- --hash=sha256:c912c259304cfb5ee584481cfb7ce1ff932b4d61e6c9140b8f19cb7b5ed82332 \
- --hash=sha256:ce66d8e46da2bb5ee313a745cbd2e391d319176c1f7a9451bfcd3a2fb920859b \
- --hash=sha256:ced2f09ef276fd58611a1ef502164ad266d2b75174e5a40cabbdb4033f9f6cf2 \
- --hash=sha256:cfe5a5fec635799ef33428f1e5e61bafa45a92a96190ba731561ba558ccc214d \
- --hash=sha256:d13e6725992e2d2fd7d81d4f5241952d13740121dfd501da09201be39b2c003a \
- --hash=sha256:d34d75f892b3ab73ba11cab5442cce7b3e168fd64162b16f0e1e0d09c508edef \
- --hash=sha256:d5b89cdfb2ee051b71e8c3c70bd81a9eff81100f736a269136fe1a68efe00474 \
- --hash=sha256:d5ed429d0b8edaac649e889b4ffcedb6c80b06629a3f93050e3dddfb99235bee \
- --hash=sha256:da028256b04ec30e5e0114b6f76172938c313991f0a2d3d894271315cf5d5e43 \
- --hash=sha256:dcbf65f1f66a26cdd88c35cf68fb4729c5d1cd2e88added72420541dfb212034 \
- --hash=sha256:dd34767fa19848d35659ffc0a75314f58c7af3f1cd87ec521e8292a1238398a3 \
- --hash=sha256:ddf799247318f34dbcd2efa8c95a8d0642674e926bb1774cf9b63dfd2a389d1c \
- --hash=sha256:de286598cc65d2b489411174b1faec2f5a7775fb3201fd925db2a76b4030f37d \
- --hash=sha256:e471bc5769ff073b058cfadb0d736b56ce067c8560eabeb0da88462df98c23e7 \
- --hash=sha256:e854312c4103f2ad4c0dc023b69b77ebfd2c89db5f86c4c94dc2353f9a92167e \
- --hash=sha256:ea8cd6ca0ee9f616aaef3afc6882e32c2cbf18b00d96313ffd76af650574034d \
- --hash=sha256:f2302660e32562a532b442480121aef8aa61a5bdb20b30bf0adab29f10a5a4b4 \
- --hash=sha256:f497a1ea81d4cd7c10ddcaa685135b9aabd291af3d55775a9ddf3cb7a364cdd9 \
- --hash=sha256:f4ddbe407477f04c45115d1a4e5bc480f753553b534d338d4c3358b1cdd0ea52 \
- --hash=sha256:f747dc8edcfe740130f28f32f3995e955494285717e86ee25af51db2219df08a \
- --hash=sha256:fad54e871165f6ec2f536063ac74c3104508a12963e64072ba44bd822de52b0c \
- --hash=sha256:fc459e5d73be2d6332fcfe8dbf3d8994671fe33c700f4565988ecfa511547253 \
- --hash=sha256:fd86572566fb40189a8260446158235159bc7a82dfbc87a3b39cf4fb57fcec1c
+coverage[toml]==7.14.3 \
+ --hash=sha256:0096fd7559178f0cc9cf088f2dbd2a02ef85bacaa69732c633517286b4494610 \
+ --hash=sha256:02c41de2a88011b893050fc9830267d927a50a215f7ad5ec17349db7090ccf26 \
+ --hash=sha256:0423d64c013057a06e70f070f073cec4b0cbc7d2b27f3c7007292f2ff1d52965 \
+ --hash=sha256:0ee68f5c34812780f3a7063382c0a9fcbb99985b7ddcdcaa626e4f3fb2e0783a \
+ --hash=sha256:11a7ec9f97ab950f4c5af62229befc7faf208fdbc0116d3902d7e306cf2c5abd \
+ --hash=sha256:1551b4caac3e3ec9f2bfcec6bf3776e01c0edbdd2e240431a50ca1a1aac72c27 \
+ --hash=sha256:16b206e521feb8b7133a45754643dead0538489cf8b783b90cf5f4e3299625fd \
+ --hash=sha256:1a7563a443f3d53fdeb040ec8c9f7466aed7ca3dc5891aa09d3ca3625fa4387f \
+ --hash=sha256:1bb93c2aa61d2a5b38f1526546d95cf4132cb681e541a337bf8dfd092be816e5 \
+ --hash=sha256:1e3b91f9c4740aeb571ecf82e5e8d8e4ab62d34fcb5a5d4e5baa38c6f7d2857c \
+ --hash=sha256:2415902f385a23dcc4ccd26e0ba803249a169af6a930c003a4c715eeb9a5444e \
+ --hash=sha256:27d07a46500ba23515b838dbcf52512026af04090755cf6cc64166d88c9b9a1a \
+ --hash=sha256:2bfc4dd0a912329eccc7484a7d0b2a38032b38c40663b1e1ac595f10c457954b \
+ --hash=sha256:2e41fd3aab806770008279a93879b0924b16247e09ab537c043d08bbca53b4ab \
+ --hash=sha256:338b19131ab1a6b767b462bfcbaa692e7ae22f24463e39d49b02a83410ff6b37 \
+ --hash=sha256:360bec1f58e7243e3405d3bdf7a1a8115aa9b448d54dc7cd6f7b7e0e9406b62e \
+ --hash=sha256:39e1dbbb6ff2c338e0196a482558a792a1de3aa64261196f5cdb3da016ad9cda \
+ --hash=sha256:3c68df8e61f1e09633fefc7538297145623957a048534368c9d212782aa5e845 \
+ --hash=sha256:3d74ff26299c4879ce3a4d826f9d3d4d556fd285fde7bbce3c0ef5a8ab1cec24 \
+ --hash=sha256:3e5b550a128419373c2f6cec28a244207013ef15f5cbcff6a5ca09d1dfaaf027 \
+ --hash=sha256:41de778bd41780586e2b04912079c73089ab5d839624e28db3bdb26de638da92 \
+ --hash=sha256:47968988b367990ae4ab17523790c38cd125e02c6bfd379b6022be2d40bdc38c \
+ --hash=sha256:4b60ca6d8af70473491a15a343cbabab2e8f9ea66a4376e81c7aa24876a6f977 \
+ --hash=sha256:4d310baf69a4fbe8a098ce727e4808a34866ac718a6f759ae659cbd3221358bc \
+ --hash=sha256:526ce9721116af23b1065089f0b75046fe521e7772ab94b641cd66b7a0421889 \
+ --hash=sha256:583d50d59142f8549470bd6390471d0fe8b8c8d69d6a0f28ac71e05380cef640 \
+ --hash=sha256:5952f8c1bda2a5347154450379316e6dfa4d934d62ca35f6784451e6f55074fb \
+ --hash=sha256:5d788e5fd55347eef06ca0732c77d04a264de67e8ff24631270cdff3767a60cf \
+ --hash=sha256:605ab2b566a22bd94834529d66d295c364aba84afd3e5498285c7a524017b1fc \
+ --hash=sha256:611e62cb9386096d81b63e0a05330750268617231e7bd598e1fe77482a2c58a5 \
+ --hash=sha256:6197e5a00183c11a8ce7c6abd18be1a9189fd8399084ffc95196f4f0db4f2137 \
+ --hash=sha256:621e13c6108234d7960aaf5762ab5c3c00f33c30c15af06dcbff0c73bf112727 \
+ --hash=sha256:62c7f79db2851c95ef020e5d28b97afde3daf9f7febcd35b53e05638f729063f \
+ --hash=sha256:64b2055bb6e0dc945af35cdeceb3633e6ed9273475ef3af85592410fd6803803 \
+ --hash=sha256:68520c90babfa2d560eca6d497921ed3a4f469623bd709733124491b2aa8ef3f \
+ --hash=sha256:69918344541ed9c8368566c2adc03c0e33d4550d7faa87d1b35e49b6a3286ea9 \
+ --hash=sha256:6a3693b4153394d265f44fb855fdc80e72403024d4d6f91c4871b334d028e4e0 \
+ --hash=sha256:74fdd718d88fe144f4579b8747873a07ec3f04cb837d5faec5a25d9e22fa31a8 \
+ --hash=sha256:7b27c822a8161afbe48e99f1adfb098d270ae7e0f7d7b0555ce110529bdb69cc \
+ --hash=sha256:7dfe427045520d6abca33687dfef767b4f635015893a1816c5decb12eb72ce18 \
+ --hash=sha256:7ea52fc08f007bcc494d4bb3df3851e95843d881860ba38fe2c64dc100db5e7d \
+ --hash=sha256:830c1fca669c572dec37ce9c838224ee45aac5be0f6961edf871e82e49d6537c \
+ --hash=sha256:8427f370ca67db4c975d2a26acfc0e5783ca0b52444dbc50278ace0f35445949 \
+ --hash=sha256:878832eaac515b62decfa76965aed558775f86bf1fc8cca76993c0c84ae31aed \
+ --hash=sha256:8ac012839ff7e396030f1e94e10553a431d14e4de2ab65cb3acb72bbd5628ca2 \
+ --hash=sha256:8cec0ad652ec57790970d817490105bd917d783c2f7b38d6b58a0ca312e1a336 \
+ --hash=sha256:8cf0f2509acb4619e2471a1951089054dd58ebea7a912066d2ea56dd4c24ca4a \
+ --hash=sha256:90f7608aeb5d9b60b523b9fb2a4ee1973867cc4865a3f26fe6c7577073b70205 \
+ --hash=sha256:92c22e19ce64ca3f2ad751f16f14df1468b4c231bd6af97185063a9c292a0cb3 \
+ --hash=sha256:96150a9cf3468ea20f0bc5d0e21b3df8972c31480ef90fa7614b773cc6429665 \
+ --hash=sha256:98a0859b0e98e43e1178a9402e19c8127766b14f7109a374d976e5a62c0e5c73 \
+ --hash=sha256:9973ef2463f8e6cfb61a6324126bb3e17d67a85f22f58d856e583ea2e3ca6501 \
+ --hash=sha256:9a3f142070eb7b82fc4085a55d887396f9c4e21250bccebe2ba22502c45b9647 \
+ --hash=sha256:9be4e7d4c5ca0427889f8f9d614bd630c2be741b1de7699bca3b2b6c0e41003e \
+ --hash=sha256:a090cbf9521e78ffdb2fcf448b72902afe9f5923ff6a12d5c0d0120200348af9 \
+ --hash=sha256:a2335ea5fed26af2e831094964fa3f8fae60b45f7e37fcc2d3b615b2add3ad87 \
+ --hash=sha256:a3c2134809e80fac091bfed18a6991b5a5eb5df5ae32b17ac4f4f99864b73dd7 \
+ --hash=sha256:a571bd889cd36c5922ce8e42e059f9d37d02301531d11374afa4c87a578625d5 \
+ --hash=sha256:a574912f3bde4b0619f6e97d01aa590b70998859244793769eb3a6df78ee56d3 \
+ --hash=sha256:a64caee2193563601dbaaa55fe2dcf597debef04a2f8f1fa8a07aa4bb7ac7a1e \
+ --hash=sha256:ac082660de8f429ba0ea363595abb838998570b9a7546777c60f413ab902bbde \
+ --hash=sha256:b3d77f7f196abdef7e01415de1bce09f216189e83e58159cfeef2b92d0464994 \
+ --hash=sha256:b3ff255799f5a1676c71c1c32ec01fd043aa09d57b3d95764b24992757184784 \
+ --hash=sha256:b488bd4b23397db62e7a9459129d01ff06a846582a732efd24834b24a6ada498 \
+ --hash=sha256:b75ee850fc2d7c831e883220c445b035f2224de2ba6103f1e56dbd237ab913f7 \
+ --hash=sha256:b7f300ac92cd4b570724c8ffbbd0c130fee298d2447f41d5a3abf58976fae1de \
+ --hash=sha256:beaab199b9e5ceaf5a225e16a9d4df136f2a1eae0a5c20de1e277c8a5225f388 \
+ --hash=sha256:c02efd507227bde9969cab0db8f48890eb3b5dcad6afac57a4792df4133543ce \
+ --hash=sha256:c66f9f9d4f1e9712eb9b1de5310f881d4e2188cfcba5065e1a8490f38687f2c4 \
+ --hash=sha256:c90a7cdd5e380e1ce02f19792e2ac2fbfbf177e35a27e69fd3e873b30d895c0c \
+ --hash=sha256:c946099774a7699de03cbd0ff0a64e21aed4525eed9d959adde4afe6d15758ef \
+ --hash=sha256:cc96aa922e21d4bc5d5ed3c915cef27dfcbc13686f47d5e378d647fbfba655a2 \
+ --hash=sha256:d20a15c622194234161535459affa8f7905830391c9ccfa060d495dbfe3a1c7f \
+ --hash=sha256:d48400185564042287dc487c1f016a3397f18ab4f4c5d5ec36edc218f7ffa35b \
+ --hash=sha256:d8e88f335544a47e22ae2e45b344772925ec65166555c958720d5ed971880891 \
+ --hash=sha256:dc9b4e35e7c3920e925ba7f14886fd5fbe481232754624e832ddba66c7535635 \
+ --hash=sha256:de76caefc8deabb0dd1678b6a980be97d14c8d87e213ac194dbf8b09e96d63fb \
+ --hash=sha256:e0bb8a6bc7015efdf8a928753b25da1b9ca2d6f24ef04d2ee0688e486f32aae7 \
+ --hash=sha256:e343fb086c9cd780b38622fea7c369acd64c1a0724312149b5d769c387a2b1f5 \
+ --hash=sha256:e4ed44705ca4bead6fc977a8b741f2145608289b33c8a9b42a95d0f15aedbf4d \
+ --hash=sha256:e574801e1d643561594aa021206c46d80b257e9853087090ba97bed8b0a509d3 \
+ --hash=sha256:e6230e688c7c3e65cedd41a774eb4ec221adc6bfee13768231015b702d5e4150 \
+ --hash=sha256:ea3169c7116eb6cdf7608c6c7da9ecfcb3da40688e3a510fac2d1d2bafd6dc35 \
+ --hash=sha256:eadea7aba74e40adee867a8c0eec17b820b061d308a4b014f7a0e118c2b0aa61 \
+ --hash=sha256:ed68faa5e85de2f3e400bc3f122e5c82735a58c8bb24b9f63a2215954ba17b2d \
+ --hash=sha256:f0a47095963cfe054e0df178daca95aec21e680d6076da807c3add28dfe920f7 \
+ --hash=sha256:f502e948e03e866538048bba081c075caaa62e5bda6ea5b7432e45f587eb462a \
+ --hash=sha256:f82b6bb7d75a2613e85d07cefa3a8c973d0544a8993337f6e2728e4a1e94c305 \
+ --hash=sha256:fa9e5c6857a7e80fa22ace5cf3550ae392bbfc322f1d8dd2d2d5a8be38cec027 \
+ --hash=sha256:fb7e18afb6e903c1a92401a2f0501ac277dca527bb9ca6fe1f691a8a0026a0e8 \
+ --hash=sha256:fbb8c3a98e779013786ae01d229662aeacbc77100efbd3f2f245219ace5af700
# via -r src/backend/requirements-dev.in
cryptography==48.0.1 \
--hash=sha256:08a597acce1ff37f347400087776599e2348a3a8bc53b44120e463cd274efe4a \
@@ -422,13 +407,13 @@ django-silk==5.5.0 \
django-slowtests==1.1.1 \
--hash=sha256:3c6936d420c9df444ac03625b41d97de043c662bbde61fbcd33e4cd407d0c247
# via -r src/backend/requirements-dev.in
-django-stubs==6.0.5 \
- --hash=sha256:7742b8e60afc68a8545158e2bdb103376d5a092f7902c17f370920a9c08eb957 \
- --hash=sha256:9fb9eede9b2fc47b36c3dc4a93652eb959dff45466ec4a580e4a22782192d746
+django-stubs==6.0.6 \
+ --hash=sha256:c488fea05a9eac40ddbdc69887f63a5c0922cb13df285291ee99c9bbc89bc4f1 \
+ --hash=sha256:dfc01e052e33c7f8f0c30c3ff8eda0903ee29ac710d1e46d9effd773744a69b0
# via -r src/backend/requirements-dev.in
-django-stubs-ext==6.0.5 \
- --hash=sha256:1cc325e991303849bce70e19748981b225ef08b37256f263e113caf97cd3bcc0 \
- --hash=sha256:a9932c8233d6dd4e34ae0b192026379c1a9be8f0b7c27aa1fa09ae215169773e
+django-stubs-ext==6.0.6 \
+ --hash=sha256:5470c970f61a3ccf5aae7633feef1a097f944f417b955da200c9ac26ecd9134b \
+ --hash=sha256:e6f09884e48d7c5b250a373dfa22aa3e83bb91b8babbd8d05187f6b92247f232
# via django-stubs
django-test-migrations==1.5.0 \
--hash=sha256:1cbff04b1e82c5564a6f635284907b381cc11a2ff883adff46776d9126824f07 \
@@ -594,25 +579,25 @@ sqlparse==0.5.5 \
# -c src/backend/requirements.txt
# django
# django-silk
-ty==0.0.51 \
- --hash=sha256:08adbe53fb8bc9e7f00e89bf1d3c875a02cda76d83f109d2e6ab1ff35a7bfa8c \
- --hash=sha256:25a5b31e6f23fd5dc63ad29087ded09932409e4154e2fe07bbaed015035990bb \
- --hash=sha256:2faed19a8f1505370de071c008df52a994fc03a204f3267c3a33a32ca26f854f \
- --hash=sha256:429a997394dac73870d71b87cc90efc54da3efaf319e72ca18aeef35a78aef90 \
- --hash=sha256:49a21237f6fd1de56beaff0a3e85fe022a09a3401e67e3abec41ce838a5d4d2e \
- --hash=sha256:608d417cd1eaf79bcbd713d9830d5e3db9d57ec225c3af3e4ac9a9ff66b45d70 \
- --hash=sha256:61b4b6a003c3ebe53a63a1125c9b6542aa01bc1b6c9a235d01ee328d000d61a9 \
- --hash=sha256:62ced5e380284f12b2dc4802a3e4ed3dac39913fc6719afde7978814a4c7f169 \
- --hash=sha256:62d94f06e8c317e89b6884f2bde443040e596b88c7c79bd944c84c105b06257a \
- --hash=sha256:79d1877e93460f936bc10ed1a31525702b7ce51075763ccba993be17f0b9e905 \
- --hash=sha256:947986bd82d324b3a5c58ce03f1dad160cdf36443d3e8f64b3484b861ba9bc64 \
- --hash=sha256:abd92913bc90d1705ef9391ff8c6822b61e2e827fa295eb30bf0dfabcf815645 \
- --hash=sha256:b90172d46365bb9d51a7011cbb5c60cc4f514f42c86635df6c092b717f85e1ac \
- --hash=sha256:bc7459348a253247bbfb2669a021e614281b86bbea24c36112b8a6e1a2499a16 \
- --hash=sha256:c1bd1355aee86af01e4e21b0bc16fc460fb05905761f0d8b8d70841de0feade8 \
- --hash=sha256:cc233a6235fb23e2a44b14731a10043e37ba2f30f2c361cf49ad3633c5b9da9c \
- --hash=sha256:dc5e93695ab5dcbf1eef663aee60ec23a413547cc9cb06adcb0d842e9166bd0f \
- --hash=sha256:f8f52952cff665bc52a36147e610c10f5699d30007d7a14ab7f345cff93476ff
+ty==0.0.54 \
+ --hash=sha256:01ab9eb8c0802d35ae73fa08e4e037963250ee5ee6aa7ed8c8b994e5495db5ef \
+ --hash=sha256:0365ea133d6b028952c22e6412a00da9739bc3b538df3c0a61972bf64d8558f1 \
+ --hash=sha256:0de0cf48918609a3996cc2a4e18e8028fc4d2446bb82df822e9737f53bb9afee \
+ --hash=sha256:2259e1a1f744a5f20f079dcc4061c1464001c75f255aaca7316e422f8f5e5e09 \
+ --hash=sha256:57c7c6c1fcd2aa29cd40117142c0d45a2b0e6c42817ef58ea8dcb5f59d6ea802 \
+ --hash=sha256:5a0a764e2261f9292adf14bbc91b9d7ef7ee7c00b8f3d9f2563f19ae3605109b \
+ --hash=sha256:651e90094d41c4add3d616e0f2c1c881c6700a2ae3ac191c023c665050ff2cdc \
+ --hash=sha256:6a0ce5af9eefe636888377d8ab8ea817239ed96de64fede62c4e5331ae16db5c \
+ --hash=sha256:6e43124e6ac4cb9702d99facb28c6b2f2574c8a4b8f59eae2632eef4962e3439 \
+ --hash=sha256:7e876c9b5130afc6b6e46035a2eecca9b563b78249030296e1089922428d5415 \
+ --hash=sha256:8674617617399d4fdd568b3e3a8f87a913df525c80691d732b0744b571b341c8 \
+ --hash=sha256:994ede70fc1b6f0efc29d0f1fc0d819630bed1d2610eac2e9dabb2840f3f3bf9 \
+ --hash=sha256:ad329d1942e23ee428948e673b2a50249f27e164220075b0a2ef8169029c8423 \
+ --hash=sha256:b1d048df26abb433acc5b3bcef214167c7dc9e3341f8f200a3c59702516a0ed0 \
+ --hash=sha256:b6b3cfe174f27744413c898b2488ca52ea76070637095de131698e506b455055 \
+ --hash=sha256:dc179be5a070c5dc7785a5e108eece2ab216978a91f91e11661308749a6c28ee \
+ --hash=sha256:e949f7bbfa80a9fa00968924028aa673a505faa234b0b9d1241b7d34373eae14 \
+ --hash=sha256:f478476f3222807b4d92f15c5298a8c242f2ed17c724da75f4a8c6b522b4f29a
# via -r src/backend/requirements-dev.in
types-psycopg2==2.9.21.20260518 \
--hash=sha256:2fd728a4fa3860db0a4a9813e5f49c30ed329b3d2e60e73530d9db01b2b98420 \
diff --git a/src/backend/requirements.in b/src/backend/requirements.in
index 2c279968f9..50588bce64 100644
--- a/src/backend/requirements.in
+++ b/src/backend/requirements.in
@@ -1,12 +1,12 @@
# Please keep this list sorted - if you pin a version provide a reason
django<6.0 # Django package
blessed # CLI for Q Monitor
-cryptography>=48.0.1 # Core cryptographic functionality
+cryptography # Core cryptographic functionality
django-anymail[amazon_ses,postal] # Email backend for various providers
django-allauth[mfa,socialaccount,saml,openid,headless] # SSO for external providers via OpenID
django-cleanup # Automated deletion of old / unused uploaded files
django-cors-headers # CORS headers extension for DRF
-django-dbbackup>=5.0.0 # Backup / restore of database and media files
+django-dbbackup # Backup / restore of database and media files
django-error-report-2 # Error report viewer for the admin interface
django-filter # Extended filtering options
django-flags # Feature flags
@@ -16,7 +16,7 @@ django-mailbox # Email scraping
django-markdownify # Markdown rendering
django-money # Django app for currency management
django-mptt # Modified Preorder Tree Traversal
-django-redis>=7.0.0 # Redis integration
+django-redis # Redis integration
django-q2 # Background task scheduling
django-q-sentry # sentry.io integration for django-q
django-sesame # Magic link authentication
@@ -46,7 +46,7 @@ ppf.datamatrix # Data Matrix barcode generator
pypdf # PDF manipulation tools
python-barcode[images] # Barcode generator
python-dotenv # Environment variable management
-pyyaml>=6.0.1 # YAML parsing
+pyyaml # YAML parsing
qrcode[pil] # QR code generator
rapidfuzz # Fuzzy string matching
sentry-sdk # Error reporting (optional)
@@ -69,6 +69,3 @@ opentelemetry-instrumentation-system_metrics
opentelemetry-instrumentation-wsgi
opentelemetry-instrumentation-psycopg
opentelemetry-instrumentation-pymysql
-
-# Pins
-xmlsec==1.3.17
diff --git a/src/backend/requirements.txt b/src/backend/requirements.txt
index 991ee30ec6..c9e27528a7 100644
--- a/src/backend/requirements.txt
+++ b/src/backend/requirements.txt
@@ -91,15 +91,15 @@ blessed==1.44.0 \
--hash=sha256:d3b5037f0143eb7c80b2000be5bcdf86161af68aed231b91deadbce4e7379785 \
--hash=sha256:e1d2ed93d3d90d0a1494a8b134d188c83fb89ae25590af638b921e8c1c8fa223
# via -r src/backend/requirements.in
-boto3==1.43.34 \
- --hash=sha256:42595057324606928c6e2432b3093978e4d722e0d432bce942f2a385702c0a43 \
- --hash=sha256:444207c6c883d4df3ea3b2c36df43ad492b86e0b889eebd2fc1d5ea8db0a8a1a
+boto3==1.43.36 \
+ --hash=sha256:42942dde254673abcbc9e6e60017c88341a4f49d99d24e1f2e290fb38138c26f \
+ --hash=sha256:587d7ee92a12e440ad12b0e7f11f3358f0c4d65b19f64726efc94aaf194aff28
# via
# django-anymail
# django-storages
-botocore==1.43.34 \
- --hash=sha256:238a0269f33c5914b9343900b44767e783b3e8b6dcb6e065eac8b4495601c5df \
- --hash=sha256:ccc973cf30c6445b30afe5760f6dc949a80f1f862cb23d9c45747f2c814ece77
+botocore==1.43.36 \
+ --hash=sha256:3c65fdc39ed01d8dfde1e961b34038aed03c459f8ddf80717a12ac006475e49d \
+ --hash=sha256:4cae47d1b2d426316b85a0087d9e69e048f13bc003b5177d74639fe9dfd28205
# via
# boto3
# s3transfer
@@ -850,9 +850,9 @@ gunicorn==26.0.0 \
--hash=sha256:40233d26a5f0d1872916188c276e21641155111c2853f0c2cd55260aec0d24fc \
--hash=sha256:ca9346f85e3a4aeeb64d491045c16b9a35647abd37ea15efe53080eb8b090baf
# via -r src/backend/requirements.in
-icalendar==7.1.3 \
- --hash=sha256:690f30aa50a76cbf854db5ad52654705db9c5cd0e1b152222f5d4b7854b60667 \
- --hash=sha256:eb03a0e215f30db689a72c49f18f998aabf17522eb0858a293c393510850727c
+icalendar==7.2.0 \
+ --hash=sha256:32dacc396101825b82f9f1bbdf691c02be613130d5ab7a457e553fcd20959fdd \
+ --hash=sha256:77922b6be57dfcc2e94f93063d2fd7e948ada9b5bdf7b08bebbc684b1b66c7c4
# via django-ical
idna==3.18 \
--hash=sha256:7f952cbe720b688055e3f87de14f5c3e5fdaa8bc3928985c4077ca689de849a2 \
@@ -894,9 +894,9 @@ jsonschema-specifications==2025.9.1 \
--hash=sha256:98802fee3a11ee76ecaca44429fda8a41bff98b00a0f2838151b113f210cc6fe \
--hash=sha256:b540987f239e745613c7a9176f3edb72b832a4ac465cf02712288397832b5e8d
# via jsonschema
-jwcrypto==1.5.7 \
- --hash=sha256:70204d7cca406eda8c82352e3c41ba2d946610dafd19e54403f0a1f4f18633c6 \
- --hash=sha256:729463fefe28b6de5cf1ebfda3e94f1a1b41d2799148ef98a01cb9678ebe2bb0
+jwcrypto==1.5.8 \
+ --hash=sha256:85aeb475f808d56bbc2f2ed1f6f73e6a317c4011a4321505f02f0aed695a3742 \
+ --hash=sha256:c3d7114b6f6e65b52f6b7da817eb8cb8423e1da31e1ef13508447c81ecbdcc34
# via django-oauth-toolkit
lxml==6.1.1 \
--hash=sha256:05a82eb6e1530a64f26225b55cbd178113bd0b5af1c2b625f25e5296742c26d2 \
@@ -1131,34 +1131,34 @@ markupsafe==3.0.3 \
--hash=sha256:f9e130248f4462aaa8e2552d547f36ddadbeaa573879158d721bbd33dfe4743a \
--hash=sha256:fed51ac40f757d41b7c48425901843666a6677e3e8eb0abcff09e4ba6e664f50
# via jinja2
-nh3==0.3.5 \
- --hash=sha256:0a09f51806fd51b4fedbf9ea2b61fef388f19aef0d62fe51199d41648be14588 \
- --hash=sha256:207c01801d3e9bb8ec08f08689346bdd30ce15b8bf60013a925d08b5388962a4 \
- --hash=sha256:23a312224875f72cd16bde417f49071451877e29ef646a60e50fcb69407cc18a \
- --hash=sha256:2c069570b06aa848457713ad7af4a9905691291548c4466a9ad78ee95808382b \
- --hash=sha256:38748140bf76383ab7ce2dce0ad4cb663855d8fbc9098f7f3483673d09616a17 \
- --hash=sha256:387abd011e81959d5a35151a11350a0795c6edeb53ebfa02d2e882dc01299263 \
- --hash=sha256:3bb854485c9b33e5bb143ff3e49e577073bc6bc320f0ff8fc316dd89c0d3c101 \
- --hash=sha256:45855e14ff056064fec77133bfcf7cd691838168e5e17bbef075394954dc9dc8 \
- --hash=sha256:45e6a65dc88a300a2e3502cb9c8e6d1d6b831d6fba7470643333609c6aab1f30 \
- --hash=sha256:488928988caad25ba14b1eb5bc74e25e21f3b5e40341d956f3ce4a8bc19460dc \
- --hash=sha256:48f45e3e914be93a596431aa143dedf1582557bf41a58153c296048d6e3798c9 \
- --hash=sha256:50d401ab2d8e86d59e2126e3ab2a2f45840c405842b626d9a51624b3a33b6878 \
- --hash=sha256:52d877980d7ca01dc3baf3936bf844828bc6f332962227a684ed79c18cce14c3 \
- --hash=sha256:559e4c73b689e9a7aa97ac9760b1bc488038d7c1a575aa4ab5a0e19ee9630c0f \
- --hash=sha256:6ea58cc44d274c643b83547ca9654a0b1a817609b160601356f76a2b744c49ad \
- --hash=sha256:72c5bdedec27fa33de6a5326346ea8aa3fe54f6ac294d54c4b204fb66a9f1e79 \
- --hash=sha256:84bdeb082544fbcb77a12c034dd77d7da0556fdc0727b787eb6214b958c15e29 \
- --hash=sha256:8f85285700a18e9f3fc5bff41fe573fa84f81542ef13b48a89f9fecca0474d3b \
- --hash=sha256:acfd354e61accbe4c74f8017c6e397a776916dfe47c48643cf7fd84ade826f93 \
- --hash=sha256:c357f1d042c67f135a5e6babb2b0e3b9d9224ff4a3543240f597767b01384ffd \
- --hash=sha256:c3aae321f67ae66cff2a627115f106a377d4475d10b0e13d97959a13486b9a88 \
- --hash=sha256:c88605d8d468f7fc1b31e06129bc91d6c96f6c621776c9b504a0da9beac9df5f \
- --hash=sha256:de8e8621853b6470fe928c684ee0d3f39ea8086cebafe4c416486488dea7b68d \
- --hash=sha256:e49c9b564e6bcb03ecd2f057213df9a0de15a95812ac9db9600b590db23d3ae9 \
- --hash=sha256:ea232933394d1d58bf7c4bb348dc4660eae6604e1ae81cd2ba6d9ed80d390f3b \
- --hash=sha256:eeedc90ed8c42c327e8e10e621ccfa314fc6cce35d5929f4297ff1cdb89667c4 \
- --hash=sha256:fe3a787dc76b50de6bee54ef242f26c41dfe47654428e3e94f0fae5bb6dd2cc1
+nh3==0.3.6 \
+ --hash=sha256:082675ff87b9385ec430ffe6d5847ba7456cc39b73720cd4add472f9f4cffd56 \
+ --hash=sha256:2411e8c3cee81a1ddd62c2a5d50585c28aa5566d373ad1db92536b95ddb24ef2 \
+ --hash=sha256:25c733bee928530556b1db0ea46c52cf5aa686146e38e60a6fc7cb801ef91cec \
+ --hash=sha256:2f90d9a0cfdbee218994fdaaeeb5a0fde62d08f35e4eef0378ec1e2200172fd0 \
+ --hash=sha256:34d2b0d934156b87ee114f599a3ba9b8b9e17b5d79652ba3a13fa50903de965e \
+ --hash=sha256:36d06341bd501240d320f5942481ed5e6846136b666e1ba4faf802b78ebc875f \
+ --hash=sha256:43bc1ed3fa0716295fabee29ba42b2667e4a51d140b0a68e092170a765474fa6 \
+ --hash=sha256:44673b27010051ab5a5e438a86ec31bbda61d4a77d7e900af6b7be3037c1abae \
+ --hash=sha256:455469a29951edc92bc48b47ac2281c3f2609e6c4f6a047056449f8c2c23facf \
+ --hash=sha256:4713502748f564fee0633b37b3403783ce0a3af3a3d148ad91025a5bdadb7bc6 \
+ --hash=sha256:5276ef17bdba9ad8040575c74072008b13aae429436e9d0429e718bb5f90f4da \
+ --hash=sha256:597a8e843bea00b2eb5520658dc24a9bb032e7fc9e7c2c0c4cd29420220c9796 \
+ --hash=sha256:69bbb92865a693d909db3a700d3c01537533844d0948c1e9323561ce06ecda41 \
+ --hash=sha256:69f365963f63a1e9bff53bdbb3c542c7c2efed3e163c9d5d83a772a2ac468c21 \
+ --hash=sha256:82ca5bf427ad1b216b65ede1a2e2d87dc49bec417ceba0f297213107d3cd9d78 \
+ --hash=sha256:889932a97fb4abb6f95fef1914c0d269ebfb60011e67121c1163059b9449dbb4 \
+ --hash=sha256:905f877dc66dd7aea4a76e54bcb26acb5ff8216f720c0017ccf63e0e6035698e \
+ --hash=sha256:a43ebd7543555c3ac1bc353023d0794e75cb76f6f18f19c32e95441496c0cc25 \
+ --hash=sha256:d14bf7982e7a77c0c775634c29c07ce08b38a046df73e1c1f139b3e82f18a38e \
+ --hash=sha256:e196fa70c2ff2eb4de7d3df3108f8f358c1d69dff20d45b11f20a5aa227ffb6d \
+ --hash=sha256:e1b160831c9cdb06a6c79c2f9cdb11386602938f9af260d1c457a85add4f6f69 \
+ --hash=sha256:e6b7beece07525dc6e6b0fc2f104442de2ba328360ad00e50cbe2e1fd620447d \
+ --hash=sha256:edb2b4a1a27523e6cc7c417f8d21ce3d005243548b93e56b762b66b0c7f589f9 \
+ --hash=sha256:f2f14b7ae1fca99c4a66c981aac3974e7fbc1ca30a12673d223ae1df76680917 \
+ --hash=sha256:f338ac7d594c067679f1e99b4f5ec3906842979560f9d8f15d6bdfa39a353b10 \
+ --hash=sha256:f3736c9dd3d1856f80cd031715b84ca75cda2bbb1ac802c3da26bfce590838d7 \
+ --hash=sha256:f5ed5fe84aee7f39db95c214a7421bf0499fbf500fec6d86a4e29bfc37971438
# via -r src/backend/requirements.in
oauthlib==3.3.1 \
--hash=sha256:0f0f8aa759826a193cf66c12ea1af1637f87b9b4622d46e866952bb022e538c9 \
@@ -1170,9 +1170,9 @@ openpyxl==3.1.5 \
--hash=sha256:5282c12b107bffeef825f4617dc029afaf41d0ea60823bbb665ef3079dc79de2 \
--hash=sha256:cf0e3cf56142039133628b5acffe8ef0c12bc902d2aadd3e0fe5878dc08d1050
# via tablib
-opentelemetry-api==1.42.1 \
- --hash=sha256:51a69edacadbc03a8950ace1c4c21099cacc538820ac2c9e36277e78cebba714 \
- --hash=sha256:56c63bea9f77b62856be8c47600474acad853b2924b99b1687c4cb6297166716
+opentelemetry-api==1.43.0 \
+ --hash=sha256:107d0d03857ea8fc7c5fcbbbd83f800c281f0d560553d61c1d675fccfd1761c1 \
+ --hash=sha256:20acf45e9b21851926835292e4045d290acade1edd2ff3de86d2f069687ba1fd
# via
# -r src/backend/requirements.in
# opentelemetry-exporter-otlp-proto-grpc
@@ -1189,27 +1189,27 @@ opentelemetry-api==1.42.1 \
# opentelemetry-instrumentation-wsgi
# opentelemetry-sdk
# opentelemetry-semantic-conventions
-opentelemetry-exporter-otlp==1.42.1 \
- --hash=sha256:2d9ebaed714377a67d224d46795ddcc11d2c877fa5de35fda70b6f3b010729a9 \
- --hash=sha256:aedd54545bb0587cd45210abdc8be545af9c01413f3307786e276df1e3c83bee
+opentelemetry-exporter-otlp==1.43.0 \
+ --hash=sha256:65aded6c50ee7dd2b9948c9d0e59ddb4ed4eea6e8532fba95cbe6a4a64a566ba \
+ --hash=sha256:70f3fe740a64596d4157588a2ee7e4fd37d2acc0c0f522a2882b8c29316cd0f0
# via -r src/backend/requirements.in
-opentelemetry-exporter-otlp-proto-common==1.42.1 \
- --hash=sha256:04f1f01fb597c4249dfcd7f8b861c902c2102369d376d9d346ff38de4469a2ee \
- --hash=sha256:f48d395ab815b444da118868977e9798ea354c25737d5cf39578ae894011c140
+opentelemetry-exporter-otlp-proto-common==1.43.0 \
+ --hash=sha256:123c3f9cc87218562490c63b36f497bf3a722faf174a515d1443f31ababa6264 \
+ --hash=sha256:c4e32ba6d6b13bdb2b8f6764c4fd28d00192826561aa04f6d14eedfce7ac076f
# via
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
-opentelemetry-exporter-otlp-proto-grpc==1.42.1 \
- --hash=sha256:0ae1177e2038b18a929b3098215243631ef91136cba26b7e2b12790ceb7e87cc \
- --hash=sha256:975c4461f167dd8ed8857d68d3b6b25f3d272eab896f6a9470d0f5b90e2faf15
+opentelemetry-exporter-otlp-proto-grpc==1.43.0 \
+ --hash=sha256:1b3e0627daa9bc21884d4a13946807c255eb558bfe5bdd543dffb6f4c9faee0d \
+ --hash=sha256:6a10d1feacffffda19acacbf277b736094b1e2f4dbb98c90ccb2c6e1962e2ec6
# via opentelemetry-exporter-otlp
-opentelemetry-exporter-otlp-proto-http==1.42.1 \
- --hash=sha256:00a16da1b312a1d6c7233d600d557c91df71125af73020f3b9a7765bd699d59d \
- --hash=sha256:bf142a21035d7571ac3a09cb2e5639f49886f243972883cfe777ed3bf02b734d
+opentelemetry-exporter-otlp-proto-http==1.43.0 \
+ --hash=sha256:647f603aa8efdbdb4dbff842e0729d0406a6fff26b295a72d3d60e7d963b2610 \
+ --hash=sha256:fa8a42bb7d00ee5391f4c0b04d8e6a46c03caa437903296ab73a81dc11ba118f
# via opentelemetry-exporter-otlp
-opentelemetry-instrumentation==0.63b1 \
- --hash=sha256:32368d6ae52c8de20aa790a6ad86b10a76f09956092337ae37d675773990e541 \
- --hash=sha256:f1986716d52cc316ea5f60189098726a9071d8ecc0eee96c9ed110be08bade9c
+opentelemetry-instrumentation==0.64b0 \
+ --hash=sha256:133ab7ffca796557aec059bf6be3190a34b6dea987f25be3d9409e230cbdad8b \
+ --hash=sha256:b47d528dead6271d7743114417eb67fc915bd9258111c48dbf9a4951d2efa88d
# via
# opentelemetry-instrumentation-dbapi
# opentelemetry-instrumentation-django
@@ -1220,64 +1220,64 @@ opentelemetry-instrumentation==0.63b1 \
# opentelemetry-instrumentation-sqlite3
# opentelemetry-instrumentation-system-metrics
# opentelemetry-instrumentation-wsgi
-opentelemetry-instrumentation-dbapi==0.63b1 \
- --hash=sha256:1bc842ddcacb7ec3622ef306ffdb3c584bf97df79d381e03604ea6eb23c63781 \
- --hash=sha256:406978ed56bcfc5fd246fd918e6b36d0f5de26fa396c78cf63326a7b530597c8
+opentelemetry-instrumentation-dbapi==0.64b0 \
+ --hash=sha256:1caa96d438bf37f71dd778c9f1e03ba1f50b8ab54aeef68b2a630c93c05cddc6 \
+ --hash=sha256:8e3a1528fc9753a04190a7e7bf0180c5abd059f3aa68ec3857edb363c9847c44
# via
# opentelemetry-instrumentation-psycopg
# opentelemetry-instrumentation-pymysql
# opentelemetry-instrumentation-sqlite3
-opentelemetry-instrumentation-django==0.63b1 \
- --hash=sha256:909ea4afbb18f16eb811d7ac330ed0f6fda7765191d49bccb8cca38c4fbc005f \
- --hash=sha256:f2071d2f92e4779c5a14dd452b0dfe426343599e6efa9d888304fb639a9f3101
+opentelemetry-instrumentation-django==0.64b0 \
+ --hash=sha256:3d2673b4f77156b15b1b119c8849b50e3644cfc325f7a24c03602596de2dbba4 \
+ --hash=sha256:c1f628e53c22aa8f9cc9cbe6e61e781940da6eda5f910d26720ef8ac73e25afe
# via -r src/backend/requirements.in
-opentelemetry-instrumentation-psycopg==0.63b1 \
- --hash=sha256:4d74ec2dda8e54ead9bd71f134af984792f77e1d8809591ae53edadddd4c8fc0 \
- --hash=sha256:86819f4cccea21a47920807826495797b7261cc1893c8e855415e76fb7b8e2e8
+opentelemetry-instrumentation-psycopg==0.64b0 \
+ --hash=sha256:a9835b8749db71a9c1e075ae81c084b1f370130341ceff6a231095f89f48a0c6 \
+ --hash=sha256:e9f41fad425183392d97068dbe2ce6e938514520312cfd7bf409242bd800c013
# via -r src/backend/requirements.in
-opentelemetry-instrumentation-pymysql==0.63b1 \
- --hash=sha256:2cf6a24e136b5b0c3f6e59675fc44b42ad2b97474b075a82859f9868a9252648 \
- --hash=sha256:6b54b83c86ac6c2e8dae642bbee4894e2283ceb5da23d571f1abb7060f7b62f4
+opentelemetry-instrumentation-pymysql==0.64b0 \
+ --hash=sha256:f5ab8399f7d8952b1622f9938d56604b51f51e7882f5058d7fd4fa3509c458f4 \
+ --hash=sha256:fc0da8eb158e0fb525f18e5be3bfa25dc0bc1d9e195c5fe31fbf919b55bd1a64
# via -r src/backend/requirements.in
-opentelemetry-instrumentation-redis==0.63b1 \
- --hash=sha256:28d235159df43cc2bc8779af5c602afad1e08603fff75ac8ca34dd1bf30a9cb9 \
- --hash=sha256:f0e51c4006f68e340abbf28a7995feff004de78649697cbdf3bac0072cacd082
+opentelemetry-instrumentation-redis==0.64b0 \
+ --hash=sha256:5458a541986f665b9d7e641421fa5d0c286f1813b452faab6f84503823719d52 \
+ --hash=sha256:c37e194c1e8ff59944d5c2f18014ee18f244a103958b1f2482099525ae9099f9
# via -r src/backend/requirements.in
-opentelemetry-instrumentation-requests==0.63b1 \
- --hash=sha256:513fcaa3d93debbdb359c00ce1a137a34a89ee908c51ac43beb7e8c18ac2b3cd \
- --hash=sha256:935c980a11e33bfd7ed969c741e4bd7c84077045651469f10e163534368d87f7
+opentelemetry-instrumentation-requests==0.64b0 \
+ --hash=sha256:8213a20b6578c41aa05cc5b48419aea75e1584924a4904dfcf36524597e7cc96 \
+ --hash=sha256:dcad4324ad97d785a5a3b9500acf3af3965b4c1d1b95776fa5e275b173d9541c
# via -r src/backend/requirements.in
-opentelemetry-instrumentation-sqlite3==0.63b1 \
- --hash=sha256:3d61afda8358dc32135fabd27e5934bd25ea0eed68d64c34508f24ba8d723efc \
- --hash=sha256:cc11c68cccde061dc8bcc5f80fe00bb0105a0fbb11b390859a23ca91ccd4e3b6
+opentelemetry-instrumentation-sqlite3==0.64b0 \
+ --hash=sha256:2d46810db20543a209c6568c8d1220859563bc4135cd6d00461ef70e446a0297 \
+ --hash=sha256:fc73cd28b7c77ddbec1d688113abe944805e9f085ff724729a8b7a4888efc3e7
# via -r src/backend/requirements.in
-opentelemetry-instrumentation-system-metrics==0.63b1 \
- --hash=sha256:995051f47876d79461aed8b7aa205d4584d90794ef864342cc748929c389bb42 \
- --hash=sha256:d6d4d7a1a854be4165143cf6420ee5894188762eb367d7bf9da5be4a83a4b632
+opentelemetry-instrumentation-system-metrics==0.64b0 \
+ --hash=sha256:38bc9c4ed4fccea2a68b1a43d57764649d1c3096927dc7244c5e7f173899044b \
+ --hash=sha256:ec8280693cdf6ea9020384c3fe884eea64a43ae78f1e2f6edc20951c871aac7e
# via -r src/backend/requirements.in
-opentelemetry-instrumentation-wsgi==0.63b1 \
- --hash=sha256:03d61c4678ce82402e7f37b6a3dbd84cb97b85b3cb416a78c2e74c7c6d9451fa \
- --hash=sha256:86779715262227d3436bdfb16aabd1c524b0f236725a69e8754ceda76c6d79dc
+opentelemetry-instrumentation-wsgi==0.64b0 \
+ --hash=sha256:1cce6ea28d1800c154e6ccdf52f05bae2f05c5e28ee44f0dddb17ada26208986 \
+ --hash=sha256:5a3b0174f39072c0abb749be4ae7e469c7585e87cdfaf63665657b1a7058c105
# via
# -r src/backend/requirements.in
# opentelemetry-instrumentation-django
-opentelemetry-proto==1.42.1 \
- --hash=sha256:c6a51e6b4f05ae63565f3a113217f3d2bfaec68f78c02d7a6c85f9010d1cfca6 \
- --hash=sha256:dedb74cba2886c59c7789b227a7a670613025a07489040050aedff6e5c0fb43c
+opentelemetry-proto==1.43.0 \
+ --hash=sha256:224778df17e1f3fafeaaa21d874236ca5f6ffc2f86e0899298ec7351aac27924 \
+ --hash=sha256:c58f1f7ef84bc7dc2834016c0c37fe0081dde7ca9f6339be1970fbf9cdaaa90d
# via
# opentelemetry-exporter-otlp-proto-common
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
-opentelemetry-sdk==1.42.1 \
- --hash=sha256:083cd4bbfaa5aa7b5a9e552430d9951219967cfb27aa61feb13a77aba1fc839d \
- --hash=sha256:8c834e8f8c9ba4171d4ec843d0cb8a67e4c7394d3f9e9297e582cbd9456ddbf7
+opentelemetry-sdk==1.43.0 \
+ --hash=sha256:d1323a547c1ce69d6a069a17a44b7da82bb8b332051ecb074041f87642c86823 \
+ --hash=sha256:d8187c81c162df9913e4003dd6485f7390d9a24fc17026ec7387b8b8218b08e9
# via
# -r src/backend/requirements.in
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
-opentelemetry-semantic-conventions==0.63b1 \
- --hash=sha256:3daf963611334b365e98a57438183eb012d3bfb40b2d931a9af613476b8701a9 \
- --hash=sha256:dfe5ef4dee82586b746f522b818ceb298d00b3d59f660042bd79404bff8d0682
+opentelemetry-semantic-conventions==0.64b0 \
+ --hash=sha256:72f76fb2d1582d9d033dd1fcd84532e961e6ff3d90d24ba6fabc72975a83864c \
+ --hash=sha256:ea77e85e354b8f604ddbe5f3d9135216f982fa4d77e5859ac30f6d8a50505aa6
# via
# opentelemetry-instrumentation
# opentelemetry-instrumentation-dbapi
@@ -1287,9 +1287,9 @@ opentelemetry-semantic-conventions==0.63b1 \
# opentelemetry-instrumentation-system-metrics
# opentelemetry-instrumentation-wsgi
# opentelemetry-sdk
-opentelemetry-util-http==0.63b1 \
- --hash=sha256:6284194028c59cd439f8acfe388145069a6127f11dc077e1344a2094adacc3f8 \
- --hash=sha256:ba1268f00922ee522dba2ae38458060f99486e7385a8056985901ca9685adfff
+opentelemetry-util-http==0.64b0 \
+ --hash=sha256:8a86a220dbfc56d736f47f1e5c4e7932a21fcf69052312e1bcf166444dc79322 \
+ --hash=sha256:c1e5350d25507c1afcd6076cf9ac062485a0a4f79cd9971366996fd3056bacdb
# via
# opentelemetry-instrumentation-django
# opentelemetry-instrumentation-requests
@@ -1423,21 +1423,19 @@ ppf-datamatrix==0.2 \
--hash=sha256:819be65eae444b760e178d5761853f78f8e5fca14fec2809b5e3369978fa9244 \
--hash=sha256:8f034d9c90e408f60f8b10a273baab81014c9a81c983dc1ebdc31d4ca5ac5582
# via -r src/backend/requirements.in
-prettytable==3.17.0 \
- --hash=sha256:59f2590776527f3c9e8cf9fe7b66dd215837cca96a9c39567414cbc632e8ddb0 \
- --hash=sha256:aad69b294ddbe3e1f95ef8886a060ed1666a0b83018bbf56295f6f226c43d287
+prettytable==3.18.0 \
+ --hash=sha256:439217116152244369caf3d9f1caf2f9fe29b03bd79e88d2928c8e718c95d680 \
+ --hash=sha256:b3346e0e6f79180833aebaac088ae926340586cf6d7d991b9eb125b65f72313a
# via pip-licenses
-protobuf==6.33.6 \
- --hash=sha256:0cd27b587afca21b7cfa59a74dcbd48a50f0a6400cfb59391340ad729d91d326 \
- --hash=sha256:77179e006c476e69bf8e8ce866640091ec42e1beb80b213c3900006ecfba6901 \
- --hash=sha256:7d29d9b65f8afef196f8334e80d6bc1d5d4adedb449971fefd3723824e6e77d3 \
- --hash=sha256:9720e6961b251bde64edfdab7d500725a2af5280f3f4c87e57c0208376aa8c3a \
- --hash=sha256:a6768d25248312c297558af96a9f9c929e8c4cee0659cb07e780731095f38135 \
- --hash=sha256:bd56799fb262994b2c2faa1799693c95cc2e22c62f56fb43af311cae45d26f0e \
- --hash=sha256:c96c37eec15086b79762ed265d59ab204dabc53056e3443e702d2681f4b39ce3 \
- --hash=sha256:e2afbae9b8e1825e3529f88d514754e094278bb95eadc0e199751cdd9a2e82a2 \
- --hash=sha256:e9db7e292e0ab79dd108d7f1a94fe31601ce1ee3f7b79e0692043423020b0593 \
- --hash=sha256:f443a394af5ed23672bc6c486be138628fbe5c651ccbc536873d7da23d1868cf
+protobuf==7.35.1 \
+ --hash=sha256:11d6b0ec246892d85215b0a13ca6e0233cf5284b68f0ac02646427f4ff88a799 \
+ --hash=sha256:230a75ddfc2de4806e56696ce9640c1cdfdb6543b7cfce98d42a4c0a0e7bdb87 \
+ --hash=sha256:24f857477359a85c0c235261b8ba905fd51b2562f4a64ca1df5473f29850cbf6 \
+ --hash=sha256:353652e4efd0bca5b5fc2656abf8307ef351f0cf938c9eba09f0e09c20a25c30 \
+ --hash=sha256:4bc97768d8fe4ad6743c8a19403e314511ed9f6d13205b687e52421c023ac1b9 \
+ --hash=sha256:74758715c53d7158fb76caf4f0cfdacc5329a4b1bb994f865d6cf302d413a1c4 \
+ --hash=sha256:b73f9489a4b8b1c9cb1f8ed951c736392592edb24b9d6819f36d2e10b171d5b4 \
+ --hash=sha256:ce115a26fe0c39a2c29973d914d327e516a6455464489fe3cd1e51a1b354f81a
# via
# googleapis-common-protos
# opentelemetry-proto
@@ -1509,9 +1507,9 @@ pynacl==1.6.2 \
--hash=sha256:d29bfe37e20e015a7d8b23cfc8bd6aa7909c92a1b8f41ee416bbb3e79ef182b2 \
--hash=sha256:fe9847ca47d287af41e82be1dd5e23023d3c31a951da134121ab02e42ac218c9
# via paramiko
-pypdf==6.13.3 \
- --hash=sha256:c6e3f86afb625791510b02ad5480e94b63970bb957df75d44657c282ecc52224 \
- --hash=sha256:f3cb822769725f1bac658c406cfc9460399043f3750c2d3e4650e0a85eacabd7
+pypdf==6.14.2 \
+ --hash=sha256:3f07891af76dc002657e04993ab9b4de81de29f9013b9761d0b7968bff12e946 \
+ --hash=sha256:7873f502fe4385e79539b21d872392dc0c4e3714327c15881cbc7fbfd1f95b25
# via -r src/backend/requirements.in
pyphen==0.17.2 \
--hash=sha256:3a07fb017cb2341e1d9ff31b8634efb1ae4dc4b130468c7c39dd3d32e7c3affd \
@@ -1718,9 +1716,9 @@ rapidfuzz==3.14.5 \
--hash=sha256:fbf1b8bb2695415b347f3727da1addca2acb82c9b97ac86bebf8b1bead1eb12d \
--hash=sha256:feedf219672eef83ea6be6f3bb093bba396a8560fc75be85ba225f082903df0a
# via -r src/backend/requirements.in
-redis==8.0.0 \
- --hash=sha256:a00c5355432051ac14e593b8b197fc76c887ee12d55a0984f69328a1115fdc49 \
- --hash=sha256:c938c18338585009f0bc310f4c7e4e4b4d37639356c4ac072cedf3af570c8dc7
+redis==8.0.1 \
+ --hash=sha256:47daa35a058c23468d6437f17a8c76882cb316b838ef763036af99b96cedd743 \
+ --hash=sha256:afc5a7a2f5a084f5b1880dec548dd45be17db7e43c82a30d84f952aefb05cfb0
# via django-redis
referencing==0.37.0 \
--hash=sha256:381329a9f99628c9069361716891d34ad94af76e461dcb0335825aecc7692231 \
@@ -1977,97 +1975,97 @@ whitenoise==6.12.0 \
--hash=sha256:f723ebb76a112e98816ff80fcea0a6c9b8ecde835f8ddda25df7a30a3c2db6ad \
--hash=sha256:fc5e8c572e33ebf24795b47b6a7da8da3c00cff2349f5b04c02f28d0cc5a3cc2
# via -r src/backend/requirements.in
-wrapt==2.2.1 \
- --hash=sha256:036dfb40128819a751c6f451c6b9c10172c49e4c401aebcdb8ecf2aec1683598 \
- --hash=sha256:03df9ebed4c73ab93fa8c07e3d41d818dfca1852b15731a3de59457b27814624 \
- --hash=sha256:05d5cb74d1b232ec8cfa130a8f900708699ff2491d97b8f85a4cdc5996294b85 \
- --hash=sha256:07be671fa8875971222b0ba9059ed8b4dc738631122feba17c93aa36b4213e9a \
- --hash=sha256:09ac16c081bebfd15d8e4dfa5bdc805990bbd52249ecff22530da7a129d6120b \
- --hash=sha256:0d9ff006f420b2ec8296aa56ade43ea7da3e997e85769f0aafc5e0661aacb710 \
- --hash=sha256:0f68f478004475d97906686e702ddbddeaf717c0b68ad2794384308f2dc713ae \
- --hash=sha256:17de18fc12cea55b8a9587314cb830573e37fb33b247a7515696350863714188 \
- --hash=sha256:1ae574d65c9fa8e86f64f6a7c2668f9fcd507b183e0e577619f504b883cb0a6c \
- --hash=sha256:1c9934ea5d92957e3cd0adbc0845539dccfd62710ebe16195a8c66c53954db36 \
- --hash=sha256:1d676ee388bc42a04d56dd7deb5605244dac2e35cc2fadbb43c9fa25bbd93508 \
- --hash=sha256:1ffa9cfd4bdb581539951b14ae661ff20ed0c3599b3e911a131ee0ec5ac11337 \
- --hash=sha256:2076d2335085eb09b9547e7688656fa8f5cf0183eab589d33499cd353489d797 \
- --hash=sha256:211f595f8e7faae5c5930fcc64708f2ba36849e0ba0fd653a843de9fa8d7db77 \
- --hash=sha256:24c52546acf2ab82412f2ab6fc5948a7fe958d3b4f070202e8dcdd865489eaf9 \
- --hash=sha256:2d83966dc7f4f45e8b97b5933685ac2e6e67fc0e19246ea314bceb9a8970c956 \
- --hash=sha256:2de9e20769fe9c1f6dcdc893c6a89287c5ccf8537c90b5de78aed8017697aad5 \
- --hash=sha256:2e08688ab16525897da6589d56d0aebaf417bbe91c2d8e3b96203b1efa596e85 \
- --hash=sha256:2f8c90c8afde51969487be4e1343ae049b268854877d415c2510baf833775052 \
- --hash=sha256:368eac1e20fd0bb03dd3cc42bf9887154c3861b60989389ccb5fac032617d215 \
- --hash=sha256:3aafea2975caef8ca49400640dde02cc7426e798f24870ed01f490bc3cffd32f \
- --hash=sha256:3e2f02472a1cbbf3884b365714a810b5947134a95ad6952b554cb8cce9d492b0 \
- --hash=sha256:3ffad790d9d11d8ecf9f17c4bb671a5b4089e4d8b575c46c5129597f41f836b0 \
- --hash=sha256:401229e9d63ca09f9b8891ecf83798d26c11bbb445d11ed9f1836b6d4585b38a \
- --hash=sha256:436addbc4bb4fc0a88c702577f51195d7d73683a7f3e0e5b253d8404d7847243 \
- --hash=sha256:44255c84bc57554fed822e83e70036b51afa9edb56fc7ca56c54410ece7898c9 \
- --hash=sha256:50972a1d974ea07725a7f6b1cec5f8759008afd030a0024843ebe7d52de47f2b \
- --hash=sha256:5590d63f5243251641cf543009b4c9314a79d0598fdb8a8e4cfc918494536c53 \
- --hash=sha256:585916e210db57b23543342c2f298e42331b617fd0c934caf5c64df44de8640e \
- --hash=sha256:5f1845c2a8cc1180ccccfa45785dd06f562730d19ef75be180334254012b6283 \
- --hash=sha256:5fa9bf3b9e66336589d03f42abce2da1055ad5c69b0c2b764852a8471c9b9114 \
- --hash=sha256:61a0013344674d2b648bc6e6fe9828dd4fc1d3b4eb7523809792f8cb952e2f16 \
- --hash=sha256:61acce4257a9883669703c525447c5b4c392edf0f987ae77ec32668440158f0e \
- --hash=sha256:628f5220c7a904d5fc78f7075c8d7871433eb6d035c94728a22fdf85f193d2a8 \
- --hash=sha256:64b7deeda4b70408e382328d8bbe52a256fe9bc63ae3db86d804608367e5422c \
- --hash=sha256:6744f504375775d7609c82c8d3d94af1c9a6f05586984536905908ba905277b9 \
- --hash=sha256:67a97e5b6c457f0cd3cfc19ebb2d84463e60c3ece754cc831e4281a3ca29bb18 \
- --hash=sha256:69f2e9244542cb34dd59c7f073445b9e54ad9f3fce8d93606c368a1b499fc413 \
- --hash=sha256:6ce32763ac31ce94fe9aada947e479b1975012bff166da409b4b9e4e376cf7e5 \
- --hash=sha256:6f56a647e4eaf5f0ca40330fb070f566bdf9f7b0db89a1af20d71c28dcd7a0ab \
- --hash=sha256:727ab4244622cd6ad2390f322642090c877d2e83a608d2653a7643ae5368d926 \
- --hash=sha256:74d6a0c31472fe5d814917266b9f46495d7c61ed890af08b468acea92fb89a8d \
- --hash=sha256:78b0aa6bfb7be8deed0ab23e7aa028cc5210c29bc2d32a04d52b50e517a7307e \
- --hash=sha256:7975bc88ab4b0f72ef2a2d5ae9d77d87efb5ef95e8f8046242fa9afdaaf2030b \
- --hash=sha256:7a4fdb9326aab4a5a477a1640e5ad786a8495901009d7e7b038371edd23a9d2b \
- --hash=sha256:844c858fc3bb7eacc0ba8efa904935d16aac6a4470948ad1e7e55c9f5a2a665f \
- --hash=sha256:87bacdaf225117a342a20d9c03438d701c02112f6e3f351ce9b7f32354f14797 \
- --hash=sha256:8a983a603a18c8708f024f7f6991b2e66159219abbf894634c5056243c55f3cd \
- --hash=sha256:8d1b4d0e0c2119587a31f5c029abd547e0c81d93b89d394566fe1588659eb579 \
- --hash=sha256:9011395be8db1827d106c6449b4bb6dd17e331ff6ec521f227e4588f1c78e46f \
- --hash=sha256:93fc2bf40cd7f4a0256010dce073d44eeb4a351b9bca94d0477ce2b6e62532b3 \
- --hash=sha256:95821352042722cd9f1108874579a47989d0a7e12a37d87d2fc4af20fd99ab8a \
- --hash=sha256:9907a4402ab6db12b7077a0ea5d7a4d028ecb22c8eee2b53527080d347cd1562 \
- --hash=sha256:9a04c28c10ba7fd12842b109d2edb0678872a2fe65277ca4ff06a0d61edee245 \
- --hash=sha256:9a5934eaea872e17936b5f45501eba5ab0bce9a74122e172b663d7c28c459c4a \
- --hash=sha256:9b984d1eb252145d6302c1dbd5e87fc6d404d45531447c84eadec04bf1fcb027 \
- --hash=sha256:9c210a6994b21aa9b29e81c8d11560e8fdab54c117e9cff37870d0a27bde1343 \
- --hash=sha256:9d8f204c8e3a8bf9ece17e0a83d137fd807440977f8a5e762d59306795011440 \
- --hash=sha256:a8f7176b83664af44567e9cc06e0d3827823fcc1a5e52307ebb8ac3aa95860b9 \
- --hash=sha256:a9dec1aca52dddde7df94818310fa2fe79739c8f385b2014c4cb1035f5508199 \
- --hash=sha256:ab5be648d5a0b86b7438864f8df3c705a65cef35a2fd3e5561e3e203167e0f27 \
- --hash=sha256:abd621552ede77c4c69be7fac44ba911225b0c812b6ba604e5964cf98085b474 \
- --hash=sha256:ac2745950b2bff80219c15ebf2fa9d8427eba7e249739f97e55c9d169e47e9e1 \
- --hash=sha256:aed9658797d0b45d6c49adcfc6b41f66e6f2d0c6de3ec79e16cf4b1855df240f \
- --hash=sha256:b6c0febfe38f22df2eb565c0ce8a092bb80411e56861ca382c443da83105423f \
- --hash=sha256:b9cf53ba90717db2e292401de290776c498d4bbfb0d4a559ca2895db8b9dcb5c \
- --hash=sha256:ba519b2d765df9871a25879e6f7fa78948ea59a2a31f9c1a257e34b651994afc \
- --hash=sha256:c318a64b53d97b841d7b5e637517e50a27be64bc695128422953d4b21710954e \
- --hash=sha256:c3723ff8eb8721f4daac98bc0256f15158e05316d5e52648ce9cebee434fbdd5 \
- --hash=sha256:c754dafdf5aaf0b401b644a90a30046929a0dd1a536e0ff0ec959a59155d9c7f \
- --hash=sha256:c803a3d331796255af51ba2c79ed0ac8275865b516c09e61f248d1e7aff31ce9 \
- --hash=sha256:c8cc5094b08abeae52da9c73c8a32003623be691a5193df2f4e3eac3d557c394 \
- --hash=sha256:cf3638274ab9d9b724c9baa0b4c04e132cd6faefb78b4dd3dd1a02a4bdaad41e \
- --hash=sha256:d047f6498c973874ba08ac3f97c69a2c4b2211c8de6f4c205f75cb1c9522596e \
- --hash=sha256:d2beb1c7cab10603aecdc42f8edd6ff013f9a32e4543474e38e6b77ce9975aeb \
- --hash=sha256:d7f513d3185e6fec82d0c3518f2e6365d8b4e49f5f45f29640d5162d56a23b54 \
- --hash=sha256:dd57607acc85678925940bd5df0385ff8332083a32fa8d7a43f8767f4997263c \
- --hash=sha256:e0cb7e4dd71f4c32e5e84843cd3c4cd65dda034314004bbe1d7f99af2426ab80 \
- --hash=sha256:e3677c7146ce694874941ba82b57092cc4875445aadf29d72807351023105143 \
- --hash=sha256:e395f7bc31851ef9b612050368cb446e9bc14cd7454b025018980349caf25ae5 \
- --hash=sha256:e422b2d647a65d6b080cad5accd09055d3809bdff00c76fba8dca00ca935572a \
- --hash=sha256:ed55af48b3eb28f43228ca2306788892bcb629eb2b5c4876e2a3659872c2f17a \
- --hash=sha256:ed928d0fda15fc0adc8d13305c8b3c0f2fba5b0669950c9e6d019d9162a3b3e8 \
- --hash=sha256:f4e1a92032a39cd5e3c647ca57dbf33b6a1938fd975623175793f9dbb63236de \
- --hash=sha256:f53ac9f3ef573326d009ed809beff4efcac6451931c2b8132586da4b9e53ff31 \
- --hash=sha256:f5b9daf6b629fce418e0cc3dd0436eac045188fa35deadb7a7f3941d5b8203f9 \
- --hash=sha256:f6518b94edb9150452e9aba08027d4cc293433753ec1fbefb4629a21cbc74181 \
- --hash=sha256:f70db64e8266d7c45d3b735f2e08eeb434b5e03da9a479ae42b2e2e486a21a00 \
- --hash=sha256:fafb4e739e43544d12cb4abd1605fd4683b6ca6a9ad682b7fd8f4d21973eafa8 \
- --hash=sha256:fd0135d34387f5fd087d9be368ea77ea89cf2451dc1cd1c622d35021bcb3ab50
+wrapt==2.2.2 \
+ --hash=sha256:0065a3b657cec06813b4241d2462ccec287f6863103d7445b725fb3a889736f9 \
+ --hash=sha256:055e6fcfaa28e58c6a8c247d48b92be9d56f818b7068aa4f22b15b3343a09931 \
+ --hash=sha256:0788e321027c999bf221b667bd4a54aaefd1a36283749a860ac3eb77daed0302 \
+ --hash=sha256:07fdcb012821859168641acf68afad61ef9783cf37100af85f152550e9677194 \
+ --hash=sha256:09f811d43f6f33ec7515f0be76b159569f4057ab54d3e079c3204dddb90afa2a \
+ --hash=sha256:0abfd648dac9ac9c5b3aa9b523d27f1789046640b58dcd5652a720ddb325e1fc \
+ --hash=sha256:0ad520e6daa9bbf136f14de735474dbec7dcc0891f718e1d274ce8dc92e645af \
+ --hash=sha256:0e64826f920c42d9d9f87e8cc09ffae66c51ede12d59061a5a426deb9aa71745 \
+ --hash=sha256:0e7070c7472582e31af3dfc2622b2381a0df7435110a9388ed8db5ffbce67efb \
+ --hash=sha256:10adb01371408c6de504a6658b9886480f1a4919a83752748a387a504a21df79 \
+ --hash=sha256:11d95fc2fbad3163596c39d440e6f21ca9fccece74b56e30a37ac2fca786a07c \
+ --hash=sha256:173e5bb5ca350a6e0abab60b7ec7cdd7992a814cb14b4de670a28f067f105663 \
+ --hash=sha256:1fc7691f070220215cccb2a20836b9adbaecb8ff22ad47abe63de5f110994fac \
+ --hash=sha256:209112cafd963710a05d199aae431d79a28bc76eb8e6d1bbbb8ad24340722cae \
+ --hash=sha256:2252f77663651b89255895f58cc6ac08fcb206d4371813e5af61bb62d4f7689c \
+ --hash=sha256:25904acb9475f46c24fe0423dbc8fda8cc5fbc282ab3dc6e72e919748c53f4e9 \
+ --hash=sha256:26fc73a1b15e0946d2942b9a4426d162b51676338327dc067ccd8d2d76385f94 \
+ --hash=sha256:2cb07f414fab25dbe6b5c7398e1491423a5c81a6209533639969a6c928d474a4 \
+ --hash=sha256:2cd7181ab1c31192ff5219269830744b5a62020b3a6d433588c4f1c95b8f8bff \
+ --hash=sha256:2e096c9d39a59b35b63c9aacfbbbec2088ff51ff1fc31051acc60a07f42f273a \
+ --hash=sha256:305d4c247d61c4115794a169141823c62f719525ddb90b23aa332741c77d2c28 \
+ --hash=sha256:30f7424af5c5c345b7f26490e097f74a2ef45b3d08b664dc33571aee3bd3b56c \
+ --hash=sha256:3179a4db066b53d40562e368b12895440c8f0953b6543b89d6acc41c0273996e \
+ --hash=sha256:3442eee2a5798f9b451f1b2cd7518ce8b7e28a2a364696c414460a0e295c012a \
+ --hash=sha256:385cb1866f20479e83299af585375bfa0a4b0c6c9907a981483ea782ea8ae406 \
+ --hash=sha256:3a4eb7964ff4643d333c84f880bcf554652b2a1050aebc54ae696327f61acfaf \
+ --hash=sha256:3b686cfc008776a3952d6213cb296ed7f45d782a8453936406faa89eac0835ab \
+ --hash=sha256:3c4095803491f6ef72128914c28ec05bbad9758433bb35f6715a3e9c8e46fb2d \
+ --hash=sha256:3dc3dcfc2da95d501905f10dc11a0dc622e91d8cdd8bbfcb63ca54afd131e556 \
+ --hash=sha256:4250b43d1a129d947e083c4dc6baf333c9bb34edd26f912d5b0457841fc858ab \
+ --hash=sha256:4402f57c5f0d0579599858ffbdd9bf4e3f0972f51096f2bd6cc7dab6b76ee49e \
+ --hash=sha256:45c2f2768e790c9f8db90f239ef23a2af8e7570f25a35619ef902df4a738447f \
+ --hash=sha256:4b481fb0c40d9fd90a5809911208da700987d373a20a4709dc9e3944af7a6bec \
+ --hash=sha256:4bccea5cdecffa9dd70e343741f0e41e0a16619313d04b72f78bb525162ebcd0 \
+ --hash=sha256:518b0c5e323511ec56a38894802ddd5e1222626484e68efe63f201854ad788e5 \
+ --hash=sha256:5499236ad1dc116012e2a5dd943f3f31af12fce452128e2bbcbd55a7d3d4d14c \
+ --hash=sha256:55b9a899e6fff5444f229d30aa6e9ac92d2216d9d60f33c771b5d76a760d5f8e \
+ --hash=sha256:58f9f8d637c9a6e245c6ef5b109b67ec187d2faed23d1405656b51d96e0a5b56 \
+ --hash=sha256:5bad217350f19ce99ca5b5e71d406765ea86fe541628426772b657375ee1c048 \
+ --hash=sha256:5d0a142f7af07caeb5e5da87493162a7b8efa19ba919e550a746f7446e13fb30 \
+ --hash=sha256:62415fd095bc590b842b6d092f2b5d9ccbaeb7e0b28535c03dcea2718b48636b \
+ --hash=sha256:656593bb3f5529f03d27af4136c4d7b11990e470bcbc6fefa5ef218695bece55 \
+ --hash=sha256:6c99012a22f735a85eed7c4b86a3e99c30fdd57d9e115b2b45f796264b58d0bf \
+ --hash=sha256:6d1a6050405bf334be33bf66296f113563622972a34900ae6fa60fd283a1a900 \
+ --hash=sha256:6e7e45b43d3c774d244fe7264378f5a3f0f383bc55a54a9866434e524540110f \
+ --hash=sha256:6fe35fd51b74867d8b80174c277bd6bbf6a73e443f908129dc531c4b688a20d5 \
+ --hash=sha256:7d2f6573561fa05002e5ee71529f4ab0a7dffed3e45b51013fe6298fe2723c02 \
+ --hash=sha256:814f1bf3e0a7035f67a1db0cdaf5e2bbcaa4d7092db96673cfa467adeaab8591 \
+ --hash=sha256:8374eb6b1a58809211e84ff835a182bb17ab2807a5bfef23204c8cff38178a00 \
+ --hash=sha256:8417fd3c674d3c8023d080292d29301531a12daf8bd938dd419710dd2f464f2b \
+ --hash=sha256:8636809939152be6ae20a6cef0fed9fe60f411b47847d0426a826884b469e971 \
+ --hash=sha256:8ffbeaea6771a6eba6e6eeb09767864995726bc8240bb54baf88a9bb1db34d5c \
+ --hash=sha256:94b00b00f806eb3ef2abe9049ed45994a81ee9284884d96e6b8314927c6cea3d \
+ --hash=sha256:955f1d6e72a352e478de8d8b503abe301c5e139a141b62eb0923bd694995025f \
+ --hash=sha256:9e8b648270c613720a202d9a45ebabc33261b22c3a839b115ac5bce8c0bb0d69 \
+ --hash=sha256:9ee098171b07edba66ab69a9bf0251d3cbef654107e800feb24c0c6f30592728 \
+ --hash=sha256:a28287413351cb198b8c5ddd045c56fac1d195808642cd264d1ab50426146650 \
+ --hash=sha256:a2d78c363f97d8bd718ee40432c66395685e9e98528ccaa423c3355d1715a26d \
+ --hash=sha256:a41e758d80dc0ab8c210f641ac892009d356cf1f955d97db544c8dd317b4d14c \
+ --hash=sha256:a795d3c06e5fbf9ea2f13196180b77aeab1b4685917256ee0d014cc163d90063 \
+ --hash=sha256:aa14b01804bce36c6d63d7b6a4f55df390f29f8648cc13a1f40b166f4d54680d \
+ --hash=sha256:abf033b7e4542357659cd83ed6cd5033c43aaa1887044045ceb571528837f72f \
+ --hash=sha256:abf8c20a2d72ee69e16328b3c91342c446e723bfe48bfcc4dded3b9722ac027f \
+ --hash=sha256:b84cd4058001c9727b0e9980b7a9e66325b5ca748b1b578e822cade1bc6b304f \
+ --hash=sha256:b89d8d73c82db2bb7e6090b3afd7973f980d24e905cc34394eab60b884b3bf67 \
+ --hash=sha256:bbf00ee0cb55ec24e2b0995a71942b85b21a066db8f3f46e1dbfdb9433ffba81 \
+ --hash=sha256:c20279cd1a29800815d7b2d6338b60a6c6e78263f9d6e62e0eda251ba9cae2d0 \
+ --hash=sha256:c38510a21d5b9cf3e84c460d909e9f2a098667439fd42841bb081cab45835d68 \
+ --hash=sha256:c427c9d06d859848a69f0d928fe28b5c33a941b2265d10a0e1f15cd244f1ee33 \
+ --hash=sha256:c5d7825491bfa2d08b97e9557768987952c7b9ae687d06c3320b40a37ccb7f20 \
+ --hash=sha256:c6c64c5d02578bc4c4bca4f0aef1504de933c1d5b4ac2710b9131111459506c8 \
+ --hash=sha256:cd385a48b055bdc3630ab30e0c7fd8514a36904ec23f9cee7a65d887334a3cea \
+ --hash=sha256:d01d8e0afc55823245a3b97a79c7c77464e31ea7a7b629a4bf26f9441dc1f18e \
+ --hash=sha256:d09db0f7e8357060d3c38fc22a018aba683a796bf184360fd1a58f6fc180dc77 \
+ --hash=sha256:d619e1eed9bd4f6ed9f24cd61971aa086fa86505289628d464bcf8a2c2e3f328 \
+ --hash=sha256:d8a15813215f33fa83667bfc978b300e35669ea8bb424e970a1426bcb7bc6cca \
+ --hash=sha256:dcaa5e1451bd8751d7bd1568dfa3321c78092a52a7ecb5d1a0f18a5791e1fd00 \
+ --hash=sha256:dfb00cb7bb22099e2f64b7340fb96113639aa7260c0972af3797ace2297b936c \
+ --hash=sha256:e542b7c5af91e2123a8aabf19894319d5ec4268d2a9ffd2f239386133fc47746 \
+ --hash=sha256:e5a5290e4bf2f332fc29ce72ffb9a2fff678aaac047e2e9f5f7165cd7792e099 \
+ --hash=sha256:e6fb7e94e8fe3e4c3067bb1653a91cce7c5e83acc119fdd41501b1bf74654617 \
+ --hash=sha256:e7f10ee0bd53673bfd52b67cbce83336fe6cad90d2377b03baf66491d2bbfb91 \
+ --hash=sha256:ec8f83949028366531383603139403cac7a826e4011955813cdd640017845ce5 \
+ --hash=sha256:ef2cce266b5b0b07e19fa82e59673b81142b7a3607c8ed1254113d048ed668da \
+ --hash=sha256:f1a2ff355ece6a111ca7a20dc86df6659c9205d3fcee674ca34f2a2854fd4e73 \
+ --hash=sha256:f32fe639c39561ccc187bcae17e9271be0eb45f1c2952510d2f29b33ab577347 \
+ --hash=sha256:f4bfd8d1eb438153eff8b8cfe87f032ba65731e1ce06138b5090f745a33f6f95 \
+ --hash=sha256:f90038ab58fafb584801ca62d72384d7d5225d93c76f7b773c22fae545bd8066 \
+ --hash=sha256:fa81c5b5fe8cd6c41e3a798533b81288279e5fdbde2128f21071922764281c99 \
+ --hash=sha256:fb18fc51e813df0d9c98049e3bf2298a5495a648602040e21fa3c7329371159e
# via
# opentelemetry-instrumentation
# opentelemetry-instrumentation-dbapi
@@ -2136,9 +2134,7 @@ xmlsec==1.3.17 \
--hash=sha256:ed63cbd87dd69ebcf3a9f82d87b67818c9a7d656325dd4fb34d6c4dfbaa84017 \
--hash=sha256:eee89c268a35f8a08a8e9abef6f466b97577e94f5cac8bf32c25e97cd5020097 \
--hash=sha256:f3fac9ae679f66585925cc00c5f6839ae36c1d03157619571dee18acc05b9c01
- # via
- # -r src/backend/requirements.in
- # python3-saml
+ # via python3-saml
zopfli==0.4.3 \
--hash=sha256:0087c9a6f0c8a052be0f6d1a9bb71b6caffdd3e10201d6d6166e28d482cebe6d \
--hash=sha256:47604eee5c6704bdf0e94d8391fe3b74ddb2abd84128fbcfdc3ee0fc265feaef \
diff --git a/src/frontend/package.json b/src/frontend/package.json
index 10e1d887c8..8c1bf2e93e 100644
--- a/src/frontend/package.json
+++ b/src/frontend/package.json
@@ -134,7 +134,7 @@
"rollup": "^4.61.1",
"rollup-plugin-license": "^3.7.1",
"typescript": "^5.9.3",
- "vite": "^6.4.2",
+ "vite": "^7.0.0",
"vite-plugin-babel-macros": "^1.0.6",
"vite-plugin-dts": "^5.0.2",
"vite-plugin-externals": "^0.6.2",
@@ -142,6 +142,8 @@
},
"resolutions": {
"undici": "^6.24.0",
- "vite": "^6.4.2"
+ "vite": "^7",
+ "js-yaml": "^4",
+ "esbuild": "^0.28"
}
}
diff --git a/src/frontend/src/forms/BuildForms.tsx b/src/frontend/src/forms/BuildForms.tsx
index 3fd3acbc41..2ff3c0bd53 100644
--- a/src/frontend/src/forms/BuildForms.tsx
+++ b/src/frontend/src/forms/BuildForms.tsx
@@ -5,7 +5,6 @@ import {
IconCircleCheck,
IconInfoCircle,
IconLink,
- IconList,
IconSitemap,
IconTruckDelivery,
IconUsersGroup
@@ -36,7 +35,7 @@ import {
} from '../hooks/UseGenerator';
import { useGlobalSettingsState } from '../states/SettingsStates';
import { RenderPartColumn } from '../tables/ColumnRenderers';
-import { TagsField } from './CommonFields';
+import { ProjectCodeField, TagsField } from './CommonFields';
/**
* Field set for BuildOrder forms
@@ -93,9 +92,7 @@ export function useBuildOrderFields({
},
title: {},
quantity: {},
- project_code: {
- icon:
- },
+ project_code: ProjectCodeField(),
priority: {},
parent: {
icon: ,
diff --git a/src/frontend/src/forms/CommonFields.tsx b/src/frontend/src/forms/CommonFields.tsx
index 9fcd5fd25b..07f16e0bb9 100644
--- a/src/frontend/src/forms/CommonFields.tsx
+++ b/src/frontend/src/forms/CommonFields.tsx
@@ -1,5 +1,6 @@
import type { ApiFormFieldType } from '@lib/types/Forms';
import { t } from '@lingui/core/macro';
+import { IconList } from '@tabler/icons-react';
export function TagsField({
label,
@@ -17,3 +18,14 @@ export function TagsField({
placeholder: placeholder ?? t`Select tags`
};
}
+
+export function ProjectCodeField(): ApiFormFieldType {
+ return {
+ filters: {
+ active: true
+ },
+ label: t`Project Code`,
+ description: t`Select project code for this item`,
+ icon:
+ };
+}
diff --git a/src/frontend/src/forms/CommonForms.tsx b/src/frontend/src/forms/CommonForms.tsx
index fc3ad49135..3bd64bc0d0 100644
--- a/src/frontend/src/forms/CommonForms.tsx
+++ b/src/frontend/src/forms/CommonForms.tsx
@@ -5,7 +5,6 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints';
import { ModelType } from '@lib/enums/ModelType';
import { apiUrl } from '@lib/functions/Api';
import type { ApiFormFieldSet, ApiFormFieldType } from '@lib/types/Forms';
-import { t } from '@lingui/core/macro';
import type {
StatusCodeInterface,
StatusCodeListInterface
@@ -13,6 +12,7 @@ import type {
import { useApi } from '../contexts/ApiContext';
import { useGlobalStatusState } from '../states/GlobalStatusState';
import { useUserState } from '../states/UserState';
+import { ProjectCodeField } from './CommonFields';
export function projectCodeFields(): ApiFormFieldSet {
return {
@@ -20,7 +20,8 @@ export function projectCodeFields(): ApiFormFieldSet {
description: {},
responsible: {
icon:
- }
+ },
+ active: {}
};
}
@@ -90,9 +91,7 @@ export function extraLineItemFields(): ApiFormFieldSet {
quantity: {},
price: {},
price_currency: {},
- project_code: {
- description: t`Select project code for this line item`
- },
+ project_code: ProjectCodeField(),
notes: {},
link: {}
};
diff --git a/src/frontend/src/forms/PurchaseOrderForms.tsx b/src/frontend/src/forms/PurchaseOrderForms.tsx
index 4faf5756ad..3dce873eb6 100644
--- a/src/frontend/src/forms/PurchaseOrderForms.tsx
+++ b/src/frontend/src/forms/PurchaseOrderForms.tsx
@@ -20,7 +20,6 @@ import {
IconHash,
IconInfoCircle,
IconLink,
- IconList,
IconNotes,
IconSitemap,
IconUser,
@@ -57,7 +56,7 @@ import {
useSerialNumberGenerator
} from '../hooks/UseGenerator';
import { useGlobalSettingsState } from '../states/SettingsStates';
-import { TagsField } from './CommonFields';
+import { ProjectCodeField, TagsField } from './CommonFields';
/*
* Construct a set of fields for creating / editing a PurchaseOrderLineItem instance
*/
@@ -191,9 +190,7 @@ export function usePurchaseOrderLineItemFields({
value: autoPricing,
onValueChange: setAutoPricing
},
- project_code: {
- description: t`Select project code for this line item`
- },
+ project_code: ProjectCodeField(),
target_date: {
icon:
},
@@ -271,9 +268,7 @@ export function usePurchaseOrderFields({
}
},
supplier_reference: {},
- project_code: {
- icon:
- },
+ project_code: ProjectCodeField(),
order_currency: {
icon:
},
diff --git a/src/frontend/src/forms/ReturnOrderForms.tsx b/src/frontend/src/forms/ReturnOrderForms.tsx
index ea919f5da7..3377ff1f22 100644
--- a/src/frontend/src/forms/ReturnOrderForms.tsx
+++ b/src/frontend/src/forms/ReturnOrderForms.tsx
@@ -23,7 +23,7 @@ import { Thumbnail } from '../components/images/Thumbnail';
import { useCreateApiFormModal } from '../hooks/UseForm';
import { useGlobalSettingsState } from '../states/SettingsStates';
import { StatusFilterOptions } from '../tables/Filter';
-import { TagsField } from './CommonFields';
+import { ProjectCodeField, TagsField } from './CommonFields';
export function useReturnOrderFields({
duplicateOrderId
@@ -44,7 +44,7 @@ export function useReturnOrderFields({
}
},
customer_reference: {},
- project_code: {},
+ project_code: ProjectCodeField(),
order_currency: {},
start_date: {
icon:
@@ -138,9 +138,7 @@ export function useReturnOrderLineItemFields({
},
price: {},
price_currency: {},
- project_code: {
- description: t`Select project code for this line item`
- },
+ project_code: ProjectCodeField(),
target_date: {},
notes: {},
link: {}
diff --git a/src/frontend/src/forms/SalesOrderForms.tsx b/src/frontend/src/forms/SalesOrderForms.tsx
index 125ca7f894..a863a51852 100644
--- a/src/frontend/src/forms/SalesOrderForms.tsx
+++ b/src/frontend/src/forms/SalesOrderForms.tsx
@@ -31,7 +31,7 @@ import { useCreateApiFormModal, useEditApiFormModal } from '../hooks/UseForm';
import { useGlobalSettingsState } from '../states/SettingsStates';
import { useUserState } from '../states/UserState';
import { RenderPartColumn } from '../tables/ColumnRenderers';
-import { TagsField } from './CommonFields';
+import { ProjectCodeField, TagsField } from './CommonFields';
export function useSalesOrderFields({
duplicateOrderId
@@ -57,7 +57,7 @@ export function useSalesOrderFields({
}
},
customer_reference: {},
- project_code: {},
+ project_code: ProjectCodeField(),
order_currency: {},
start_date: {
icon:
@@ -194,9 +194,7 @@ export function useSalesOrderLineItemFields({
value: partCurrency,
onValueChange: setPartCurrency
},
- project_code: {
- description: t`Select project code for this line item`
- },
+ project_code: ProjectCodeField(),
target_date: {},
notes: {},
link: {}
diff --git a/src/frontend/src/forms/StockForms.tsx b/src/frontend/src/forms/StockForms.tsx
index 99255cf0d5..a0de3608b2 100644
--- a/src/frontend/src/forms/StockForms.tsx
+++ b/src/frontend/src/forms/StockForms.tsx
@@ -33,8 +33,16 @@ import {
IconUsersGroup
} from '@tabler/icons-react';
import { useQuery, useSuspenseQuery } from '@tanstack/react-query';
+
import dayjs from 'dayjs';
-import { type JSX, Suspense, useEffect, useMemo, useState } from 'react';
+import {
+ type JSX,
+ Suspense,
+ useCallback,
+ useEffect,
+ useMemo,
+ useState
+} from 'react';
import { useFormContext } from 'react-hook-form';
import { useNavigate } from 'react-router-dom';
import { api } from '../App';
@@ -566,6 +574,7 @@ function StockOperationsRow({
add = false,
setMax = false,
merge = false,
+ transferMerge = false,
returnStock = false,
record
}: {
@@ -575,6 +584,7 @@ function StockOperationsRow({
add?: boolean;
setMax?: boolean;
merge?: boolean;
+ transferMerge?: boolean;
returnStock?: boolean;
record?: any;
}) {
@@ -742,6 +752,17 @@ function StockOperationsRow({
variant={packagingOpen ? 'filled' : 'transparent'}
/>
)}
+ {transferMerge && (
+ }
+ tooltip={t`Merge into existing stock`}
+ onClick={() =>
+ callChangeFn(props.idx, 'merge', !props.item?.merge)
+ }
+ variant={props.item?.merge ? 'filled' : 'transparent'}
+ />
+ )}
props.removeFn(props.idx)} />
@@ -789,9 +810,10 @@ type StockAdjustmentItem = {
batch?: string;
status?: number | '' | null;
packaging?: string;
+ merge?: boolean;
};
-function mapAdjustmentItems(items: any[]) {
+function mapAdjustmentItems(items: any[], mergeDefault?: boolean) {
const mappedItems: StockAdjustmentItemWithRecord[] = items.map((elem) => {
return {
pk: elem.pk,
@@ -799,6 +821,7 @@ function mapAdjustmentItems(items: any[]) {
batch: elem.batch || undefined,
status: elem.status || undefined,
packaging: elem.packaging || undefined,
+ merge: elem.merge ?? mergeDefault ?? false,
obj: elem
};
});
@@ -806,7 +829,10 @@ function mapAdjustmentItems(items: any[]) {
return mappedItems;
}
-function stockTransferFields(items: any[]): ApiFormFieldSet {
+function stockTransferFields(
+ items: any[],
+ mergeDefault = false
+): ApiFormFieldSet {
if (!items) {
return {};
}
@@ -819,7 +845,7 @@ function stockTransferFields(items: any[]): ApiFormFieldSet {
const fields: ApiFormFieldSet = {
items: {
field_type: 'table',
- value: mapAdjustmentItems(items),
+ value: mapAdjustmentItems(items, mergeDefault),
modelRenderer: (row: TableFieldRowProps) => {
const record = records[row.item.pk];
@@ -829,6 +855,7 @@ function stockTransferFields(items: any[]): ApiFormFieldSet {
transfer
changeStatus
setMax
+ transferMerge
key={record.pk}
record={record}
/>
@@ -1379,9 +1406,20 @@ export function useRemoveStockItem(props: StockOperationProps) {
}
export function useTransferStockItem(props: StockOperationProps) {
+ const globalSettings = useGlobalSettingsState();
+
+ const fieldGenerator = useCallback(
+ (items: any[]) =>
+ stockTransferFields(
+ items,
+ globalSettings.isSet('STOCK_MERGE_ON_TRANSFER')
+ ),
+ [globalSettings]
+ );
+
return useStockOperationModal({
...props,
- fieldGenerator: stockTransferFields,
+ fieldGenerator: fieldGenerator,
endpoint: ApiEndpoints.stock_transfer,
title: t`Transfer Stock`,
successMessage: t`Stock transferred`,
diff --git a/src/frontend/src/forms/TransferOrderForms.tsx b/src/frontend/src/forms/TransferOrderForms.tsx
index 3935d89b92..638028603d 100644
--- a/src/frontend/src/forms/TransferOrderForms.tsx
+++ b/src/frontend/src/forms/TransferOrderForms.tsx
@@ -10,7 +10,7 @@ import type { TableFieldRowProps } from '../components/forms/fields/TableField';
import { useCreateApiFormModal } from '../hooks/UseForm';
import { useGlobalSettingsState } from '../states/SettingsStates';
import { RenderPartColumn } from '../tables/ColumnRenderers';
-import { TagsField } from './CommonFields';
+import { ProjectCodeField, TagsField } from './CommonFields';
export function useTransferOrderFields({
duplicateOrderId
@@ -23,7 +23,7 @@ export function useTransferOrderFields({
const fields: ApiFormFieldSet = {
reference: {},
description: {},
- project_code: {},
+ project_code: ProjectCodeField(),
start_date: {
icon:
},
@@ -91,9 +91,7 @@ export function useTransferOrderLineItemFields({
},
reference: {},
quantity: {},
- project_code: {
- description: t`Select project code for this line item`
- },
+ project_code: ProjectCodeField(),
target_date: {},
notes: {},
link: {}
diff --git a/src/frontend/src/locales/ar/messages.po b/src/frontend/src/locales/ar/messages.po
index 9aeb9a40de..0fa8bb7db9 100644
--- a/src/frontend/src/locales/ar/messages.po
+++ b/src/frontend/src/locales/ar/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: ar\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Arabic\n"
"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"
@@ -79,12 +79,12 @@ msgstr "إلغاء"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "الإجراءات"
@@ -135,16 +135,16 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr ""
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr ""
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr ""
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr ""
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr ""
@@ -2874,8 +2874,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr ""
@@ -2924,7 +2924,7 @@ msgstr ""
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr ""
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr ""
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr ""
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr ""
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr ""
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr ""
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr ""
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr ""
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr ""
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr ""
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr ""
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr ""
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr ""
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr ""
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr ""
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr ""
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr ""
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr ""
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr ""
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/bg/messages.po b/src/frontend/src/locales/bg/messages.po
index 3bf24ed399..3d8991e8e5 100644
--- a/src/frontend/src/locales/bg/messages.po
+++ b/src/frontend/src/locales/bg/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: bg\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Bulgarian\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr ""
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr ""
@@ -135,16 +135,16 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr ""
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr ""
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr ""
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr ""
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr ""
@@ -2874,8 +2874,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr ""
@@ -2924,7 +2924,7 @@ msgstr ""
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr ""
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr ""
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr ""
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr ""
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr ""
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr ""
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr ""
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr ""
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr ""
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr ""
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr ""
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr ""
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr ""
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr ""
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr ""
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr ""
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr ""
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr ""
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr ""
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/cs/messages.po b/src/frontend/src/locales/cs/messages.po
index 1b193f4ba9..2869ebe8e3 100644
--- a/src/frontend/src/locales/cs/messages.po
+++ b/src/frontend/src/locales/cs/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: cs\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-23 06:29\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Czech\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 3;\n"
@@ -79,12 +79,12 @@ msgstr "Zrušit"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Akce"
@@ -135,16 +135,16 @@ msgstr "Ne"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "Výrobní příkaz"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Kódy projektu"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Objednávka"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Prodejní objednávka"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Vrácená objednávka"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr "Převodní příkaz"
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Odstranit přidružený obrázek z této položky?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "Verze rozhraní API"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Pluginy"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "Změnit"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Přidat"
@@ -2874,8 +2874,8 @@ msgstr "Uživatelská nastavení"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Nastavení systému"
@@ -2924,7 +2924,7 @@ msgstr "Odhlásit"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Zásoby"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "Výroba"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Nákup"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Přílohy"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Kategorie"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Sériové číslo"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Sériové číslo"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Množství"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Dávka"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Dodavatel"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Načítání..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr "Požadavky prodeje"
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr "Položka přidána k objednávce"
msgid "Select supplier part"
msgstr "Vyberte položku dodavatele"
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr "Kopírovat číslo dílu dodavatele"
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "Nová položka dodavatele"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr "Vyberte nákupní objednávku"
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "Nová objednávka"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr "Přidat do zvolené objednávky"
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "Nebyly vybrány žádné položky"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr "Nebyly vybrány žádné nakoupitelné položky"
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "Přidané položky"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "Všechny vybrané části byly přidány do objednávky"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "Musíte vybrat alespoň jednu položku pro objednávku"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "Je vyžadována položka dodavatele"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "Je vyžadováno množství"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "Neplatný výběr položky"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "Opravte chyby ve vybraných položkách"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr "Množství k dokončení"
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr "Nastavit datum expirace"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "Upravit balení"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Změnit stav"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "Zadat kód dávky pro příchozí položky skladu"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Sériová čísla"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr "Zadejte datum expirace pro přijaté položky"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr "Ponechte prázdné pro použití adresy objednávky"
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Přidat dané množství jako balení namísto jednotlivých položek"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Zadejte počáteční množství pro tuto skladovou položku"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Zadejte sériová čísla pro novou skladbu (nebo ponechte prázdné)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Stav skladu"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Nová skladová položka"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "Vyberte skladovou položku k instalaci"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "Potvrdit převod zásob"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr "Potvrdit vrácení zásob"
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Přesunout do výchozího umístění"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Přesunout"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "Vrátit"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr "Sloučit do existujících zásob"
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Přesunout"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "Vrátit"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr "Sloučit vrácené položky do existujících zásob, pokud je to možné"
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr "Poznámky k transakci"
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Počet"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Přidat zásobu"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "Zásoba přidána"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr "Zvyšte množství vybraných skladových položek o danou částku."
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Snížit zásobu"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "Zásoba snížena"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr "Snižte množství vybraných skladových položek o danou částku."
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Převést zásobu"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "Skladová položka převedena"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr "Přesunout vybrané položky do určeného umístění."
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr "Vrátit zásoby"
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr "Zásoby vráceny"
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr "Vrátit vybrané položky do skladu na určené místo."
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Spočítat zásoby"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "Spočítáno"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr "Spočítat vybrané skladové položky, a podle toho upravit množství."
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Změnit stav skladu"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "Stav skladu byl změněn"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr "Změnit stav vybraných skladových položek."
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr "Změnit kód sarže"
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr "Změnit kód sarže pro vybrané skladové položky"
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Sloučit zásoby"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "Zásoby sloučeny"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr "Sloučit skladové položky"
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr "Sloučení nelze vrátit zpět"
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr "Při slučování položek mohou být informace o sledování ztraceny"
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr "Informace o dodavateli mohou být při slučování položek ztraceny"
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "Přiřadit sklad zákazníkovi"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "Zásoby přiřazené zákazníkovi"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Odstranit skladové položky"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "Skladová položka odstraněna"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr "Tato operace trvale odstraní vybrané skladové položky."
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Nadřazené skladové umístění"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr "Najít sériové číslo"
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr "Žádné odpovídající položky"
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr "Více odpovídajících položek"
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr "Neplatná odpověď ze serveru"
@@ -7294,15 +7295,15 @@ msgstr "Ceník"
msgid "Part Creation"
msgstr "Vytvoření dílu"
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr "Expirace zásob"
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr "Inventura dílu"
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "Sledování skladových položek"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr "Externí výrobní příkazy"
diff --git a/src/frontend/src/locales/da/messages.po b/src/frontend/src/locales/da/messages.po
index f9130209bf..a8586f1d2e 100644
--- a/src/frontend/src/locales/da/messages.po
+++ b/src/frontend/src/locales/da/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: da\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Danish\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr "Annuller"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Handlinger"
@@ -135,16 +135,16 @@ msgstr "Nej"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "Produktionsordre"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Projektkoder"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Købsordre"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Salgsordrer"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Returordre"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Fjern det tilknyttede billede fra denne vare?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "API Version"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Plugins"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "Ændre"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Tilføj"
@@ -2874,8 +2874,8 @@ msgstr "Brugerindstillinger"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Systemindstillinger"
@@ -2924,7 +2924,7 @@ msgstr "Log ud"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Lager"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "Produktion"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Indkøb"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Vedhæftninger"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Kategori"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Serienummer"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Serienummer"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Antal"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Batch"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Leverandør"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Indlæser..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr "Salgs Krav"
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr "Del tilføjet til indkøbsordre"
msgid "Select supplier part"
msgstr "Vælg leverandørdel"
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr "Kopier leverandørens del nummer"
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "Ny leverandørdel"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr "Vælg indkøbsordre"
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "Ny indkøbsordre"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr "Tilføj til den valgte indkøbsordre"
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "Ingen dele valgt"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr "Ingen dele, der kan købes, er valgt"
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "Dele Tilføjet"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "Alle valgte dele føjet til en indkøbsordre"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "Du skal vælge mindst en del for at bestille"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "Leverandør del er påkrævet"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "Mængde er påkrævet"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "Ugyldig del valg"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "Ret venligst fejlene i de valgte dele"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr "Antal til fuldførelse"
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr "Sæt Udløbsdato"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "Juster Emballering"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Ændre Status"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "Indtast batch kode for modtagne varer"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Serienummer"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr "Indtast en udløbsdato for modtagne vare"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr "Efterlad blank for at bruge ordreadressen"
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Tilføj givet antal som pakker i stedet for individuelle elementer"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Angiv første antal for denne lagervare"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Indtast serienumre for nyt lager (eller efterlad blank)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Lager Status"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Tilføj Lagervare"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "Vælg den del, der skal installeres"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "Bekræft Lager Overførsel"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Flyt til standard lokation"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Flyt"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "Retur"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Flyt"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "Retur"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Antal"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Tilføj Lagerbeholdning"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "Lager tilføjet"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr "Forøg antallet af valgte lagervarer med et givet beløb."
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Fjern Lagervarer"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "Lager fjernet"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr "Reducer antallet af de valgte lagervarer med et givet beløb."
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Overfør Lager"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "Lager overført"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr "Overfør valgte elementer til den angivne lokation."
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr "Retur Lager"
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr "Lager returneret"
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr "Returner valgte elementer til lager, til den angivne lokation."
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Tæl Lager"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "Lager er optalt"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr "Tæl de valgte lagervarer, og juster mængden i overensstemmelse."
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Ændr Lagerstatus"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "Lagerstatus ændret"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr "Ændre status for de valgte lagervarer."
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Flet Lager"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "Lager sammenlagt"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr "Flet Lagervarer"
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr "Fletningshandlingen kan ikke fortrydes"
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr "Sporingsoplysninger kan gå tabt ved sammenlægning af elementer"
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr "Leverandøroplysninger kan gå tabt ved sammenlægning af elementer"
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "Tildel lager til kunde"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "Lager tildelt kunden"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Slet Lagervare"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "Lagervare slettet"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr "Denne handling vil permanent slette de valgte lagervarer."
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Overordnet lager lokation"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr "Find Serienummer"
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr "Ingen matchende varer"
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr "Flere matchende varer"
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr "Ugyldigt svar fra server"
@@ -7294,15 +7295,15 @@ msgstr "Prissætning"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "Lager Sporing"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/de/messages.po b/src/frontend/src/locales/de/messages.po
index eec32b110a..5c822be01d 100644
--- a/src/frontend/src/locales/de/messages.po
+++ b/src/frontend/src/locales/de/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: de\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: German\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr "Abbrechen"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Aktionen"
@@ -135,16 +135,16 @@ msgstr "Nein"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "Bauauftrag"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Projektnummern"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Einkaufsbestellung"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Verkaufsauftrag"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Rückgabe Auftrag"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Verknüpftes Bild von diesem Teil entfernen?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "API-Version"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Plugins"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "Ändern"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Hinzufügen"
@@ -2874,8 +2874,8 @@ msgstr "Benutzer-Einstellungen"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Einstellungen"
@@ -2924,7 +2924,7 @@ msgstr "Abmelden"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Lager"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "Fertigung"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Einkauf"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Anhänge"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Kategorie"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Seriennummer"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Seriennummer"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Anzahl"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Losnummer"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Lieferant"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Lade..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr "Verkaufsanforderungen"
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr "Teil zur Bestellung hinzugefügt"
msgid "Select supplier part"
msgstr "Zulieferer-Teil auswählen"
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr "Lieferanten-Artikelnummer kopieren"
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "Neues Zulieferer-Teil"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr "Bestellung auswählen"
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "Neue Bestellung"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "Keine Teile ausgewählt"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "Teile hinzugefügt"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "Alle ausgewählten Teile wurden einer Bestellung hinzugefügt"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "Sie müssen mindestens einen Teil für die Bestellung auswählen"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "Lieferantenteil ist erforderlich"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "Menge ist erforderlich"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "Ungültige Teileauswahl"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "Bitte korrigieren Sie die Fehler in den ausgewählten Teilen"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr "Ablaufdatum festlegen"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "Verpackung anpassen"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Status ändern"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "Losnummern eingeben für empfangene Gegenstände"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Seriennummern"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr "Ablaufdatum eingeben für empfangene Gegenstände"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Angegebene Menge als Packungen anstatt einzelner Artikel hinzufügen"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Ausgangsmenge für diesen Lagerartikel eingeben"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Seriennummern für neue Lagerartikel eingeben (oder leer lassen)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Lagerbestand Status"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Lagerartikel hinzufügen"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "Teil zur Installation auswählen"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "Bestand-Transfer bestätigen"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Zum Standard-Lagerort verschieben"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Verschieben"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "Zurück"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Verschieben"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "Zurück"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Anzahl"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Bestand hinzufügen"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "Bestand hinzugefügt"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr "Menge der ausgewählten Bestandteile um einen bestimmten Betrag erhöhen"
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Bestand entfernen"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "Bestand entfernt"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr "Menge der ausgewählten Bestandteile um einen bestimmten Betrag reduzieren"
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Bestand verschieben"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "Bestand übertragen"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr "Ausgewählte Elemente an den angegebenen Ort übertragen."
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr "Lagerbestand zurückgeben"
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr "Lagerbestand zurückgegeben"
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Bestand zählen"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "Lagerbestand gezählt"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Bestandsstatus ändern"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "Bestandstatus geändert"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr "Status der ausgewählten Lagerartikel ändern."
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Bestand zusammenführen"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "Lagerbestand zusammengeführt"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr "Lagerbestand zusammenführen"
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr "Das Zusammenführen kann nicht rückgängig gemacht werden"
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr "Tracking-Informationen können beim Zusammenführen von Elementen verloren gehen"
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr "Lieferanteninformationen können beim Zusammenführen verloren gehen"
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "Lagerbestand einem Kunden zuweisen"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "Lagerbestand wurde Kunden zugewiesen"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Bestand löschen"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "Lagerbestand gelöscht"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr "Dieser Vorgang löscht die ausgewählten Lagerbestandteile unwiderruflich."
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Übergeordneter Lagerort"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr "Seriennummer finden"
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr "Keine passenden Elemente"
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr "Mehrere passende Elemente"
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr "Ungültige Antwort vom Server"
@@ -7294,15 +7295,15 @@ msgstr "Preise"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "Bestandsverfolgung"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/el/messages.po b/src/frontend/src/locales/el/messages.po
index 8f8aa4f566..f1aa2605f9 100644
--- a/src/frontend/src/locales/el/messages.po
+++ b/src/frontend/src/locales/el/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: el\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Greek\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr "Ακύρωση"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Ενέργειες"
@@ -135,16 +135,16 @@ msgstr "Όχι"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "Εντολή Κατασκευής"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Κωδικοί Έργων"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Εντολή Αγοράς"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Εντολή Πώλησης"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Εντολή Επιστροφής"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Αφαίρεση της σχετικής εικόνας από αυτό το στοιχείο;"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "Έκδοση API"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Plugins"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "Αλλαγή"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Προσθήκη"
@@ -2874,8 +2874,8 @@ msgstr "Ρυθμίσεις χρήστη"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Ρυθμίσεις συστήματος"
@@ -2924,7 +2924,7 @@ msgstr "Αποσύνδεση"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Απόθεμα"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "Κατασκευή"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Προμήθειες"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Συνημμένα"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Κατηγορία"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Σειριακός αριθμός"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Σειριακός αριθμός"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Ποσότητα"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Παραγωγική παρτίδα"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Προμηθευτής"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Φόρτωση..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr "Απαιτήσεις πωλήσεων"
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr "Το Προϊόν προστέθηκε στην παραγγελία α
msgid "Select supplier part"
msgstr "Επιλέξτε Προϊόν προμηθευτή"
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "Νέο Προϊόν προμηθευτή"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr "Επιλέξτε παραγγελία αγοράς"
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "Νέα παραγγελία αγοράς"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr "Προσθήκη στην επιλεγμένη παραγγελία αγοράς"
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "Δεν επιλέχθηκαν προϊόντα"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr "Δεν επιλέχθηκαν αγοραζόμενα Προϊόντα"
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "Τα Προϊόντα προστέθηκαν"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "Όλα τα επιλεγμένα Προϊόντα προστέθηκαν σε παραγγελία αγοράς"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "Πρέπει να επιλέξετε τουλάχιστον ένα Προϊόν για παραγγελία"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "Απαιτείται Προϊόν προμηθευτή"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "Απαιτείται ποσότητα"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "Μη έγκυρη επιλογή Προϊόντος"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "Παρακαλώ διορθώστε τα σφάλματα στα επιλεγμένα Προϊόντα"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr "Ποσότητα προς ολοκλήρωση"
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr "Ορισμός ημερομηνίας λήξης"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "Προσαρμογή συσκευασίας"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Αλλαγή κατάστασης"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "Εισαγάγετε κωδικό παρτίδας για τα παραληφθέντα είδη"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Σειριακοί αριθμοί"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr "Εισαγάγετε ημερομηνία λήξης για τα παραληφθέντα είδη"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr "Αφήστε κενό για χρήση της διεύθυνσης τη
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Προσθέστε την ποσότητα ως πακέτα αντί για μεμονωμένα είδη"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Εισαγάγετε αρχική ποσότητα για αυτό το είδος"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Εισαγάγετε σειριακούς αριθμούς για νέο απόθεμα (ή αφήστε κενό)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Κατάσταση αποθέματος"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Προσθήκη είδους αποθέματος"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "Επιλέξτε το Προϊόν προς εγκατάσταση"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "Επιβεβαίωση μεταφοράς αποθέματος"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Μετακίνηση στην προεπιλεγμένη τοποθεσία"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Μετακίνηση"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "Επιστροφή"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Μετακίνηση"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "Επιστροφή"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Καταμέτρηση"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Προσθήκη αποθέματος"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "Το απόθεμα προστέθηκε"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr "Αυξήστε την ποσότητα των επιλεγμένων ειδών αποθέματος κατά μια δεδομένη τιμή."
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Αφαίρεση αποθέματος"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "Το απόθεμα αφαιρέθηκε"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr "Μείωση της ποσότητας των επιλεγμένων ειδών αποθέματος κατά μια δεδομένη τιμή."
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Μεταφορά αποθέματος"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "Το απόθεμα μεταφέρθηκε"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr "Μεταφέρετε τα επιλεγμένα είδη στην καθορισμένη τοποθεσία."
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr "Επιστροφή αποθέματος"
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr "Το απόθεμα επιστράφηκε"
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr "Επιστροφή των επιλεγμένων ειδών στο απόθεμα, στην καθορισμένη τοποθεσία."
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Καταμέτρηση αποθέματος"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "Το απόθεμα καταμετρήθηκε"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr "Καταμετρήστε τα επιλεγμένα είδη αποθέματος και προσαρμόστε την ποσότητα ανάλογα."
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Αλλαγή κατάστασης αποθέματος"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "Η κατάσταση αποθέματος άλλαξε"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr "Αλλαγή της κατάστασης των επιλεγμένων ειδών αποθέματος."
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Συγχώνευση αποθέματος"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "Το απόθεμα συγχωνεύτηκε"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr "Συγχώνευση ειδών αποθέματος"
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr "Η ενέργεια συγχώνευσης δεν μπορεί να αναιρεθεί"
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr "Οι πληροφορίες ιχνηλάτησης μπορεί να χαθούν κατά τη συγχώνευση"
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr "Οι πληροφορίες προμηθευτή μπορεί να χαθούν κατά τη συγχώνευση"
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "Ανάθεση αποθέματος σε πελάτη"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "Το απόθεμα ανατέθηκε στον πελάτη"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Διαγραφή ειδών αποθέματος"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "Το απόθεμα διαγράφηκε"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr "Αυτή η ενέργεια θα διαγράψει μόνιμα τα επιλεγμένα είδη αποθέματος."
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Γονική τοποθεσία αποθέματος"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr "Εύρεση σειριακού αριθμού"
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr "Δεν βρέθηκαν αντίστοιχα είδη"
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr "Πολλαπλά αντίστοιχα είδη"
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr "Μη έγκυρη απόκριση από τον διακομιστή"
@@ -7294,15 +7295,15 @@ msgstr "Τιμολόγηση"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "Παρακολούθηση Αποθέματος"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/en/messages.po b/src/frontend/src/locales/en/messages.po
index 4d0fe8da76..0580d343e2 100644
--- a/src/frontend/src/locales/en/messages.po
+++ b/src/frontend/src/locales/en/messages.po
@@ -74,12 +74,12 @@ msgstr "Cancel"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Actions"
@@ -130,16 +130,16 @@ msgstr "No"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -323,7 +323,7 @@ msgstr "Build Order"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -381,7 +381,7 @@ msgid "Project Codes"
msgstr "Project Codes"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -394,7 +394,7 @@ msgstr "Purchase Order"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -427,7 +427,7 @@ msgstr "Sales Order"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -452,7 +452,7 @@ msgstr "Return Order"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -477,7 +477,7 @@ msgstr "Transfer Order"
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1472,7 +1472,7 @@ msgid "Remove the associated image from this item?"
msgstr "Remove the associated image from this item?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2071,7 +2071,7 @@ msgstr "API Version"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Plugins"
@@ -2514,7 +2514,7 @@ msgid "Change"
msgstr "Change"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Add"
@@ -2869,8 +2869,8 @@ msgstr "User Settings"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "System Settings"
@@ -2919,7 +2919,7 @@ msgstr "Logout"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2932,7 +2932,7 @@ msgstr "Stock"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2940,7 +2940,7 @@ msgstr "Manufacturing"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2952,7 +2952,7 @@ msgstr "Purchasing"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3088,7 +3088,7 @@ msgid "Attachments"
msgstr "Attachments"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3384,15 +3384,15 @@ msgstr "Category"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3413,7 +3413,7 @@ msgid "Serial Number"
msgstr "Serial Number"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3421,7 +3421,7 @@ msgstr "Serial Number"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3448,15 +3448,15 @@ msgstr "Quantity"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Batch"
@@ -3978,7 +3978,7 @@ msgid "Supplier"
msgstr "Supplier"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Loading..."
@@ -4124,13 +4124,13 @@ msgid "Sales Requirements"
msgstr "Sales Requirements"
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4175,64 +4175,64 @@ msgstr "Part added to purchase order"
msgid "Select supplier part"
msgstr "Select supplier part"
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr "Copy supplier part number"
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "New supplier part"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr "Select purchase order"
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "New purchase order"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr "Add to selected purchase order"
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "No parts selected"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr "No purchaseable parts selected"
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "Parts Added"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "All selected parts added to a purchase order"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "You must select at least one part to order"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "Supplier part is required"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "Quantity is required"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "Invalid part selection"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "Please correct the errors in the selected parts"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4816,7 +4816,7 @@ msgstr "Quantity to Complete"
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5099,12 +5099,12 @@ msgid "Set Expiry Date"
msgstr "Set Expiry Date"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "Adjust Packaging"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Change Status"
@@ -5148,7 +5148,7 @@ msgid "Enter batch code for received items"
msgstr "Enter batch code for received items"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Serial Numbers"
@@ -5167,7 +5167,7 @@ msgid "Enter an expiry date for received items"
msgstr "Enter an expiry date for received items"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5269,218 +5269,219 @@ msgstr "Leave blank to use the order address"
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Add given quantity as packs instead of individual items"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Enter initial quantity for this stock item"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Enter serial numbers for new stock (or leave blank)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Stock Status"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Add Stock Item"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "Select the part to install"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "Confirm Stock Transfer"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr "Confirm Stock Return"
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Move to default location"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Move"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "Return"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr "Merge into existing stock"
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Move"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "Return"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr "Merge returned items into existing stock items if possible"
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr "Stock transaction notes"
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Count"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Add Stock"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "Stock added"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr "Increase the quantity of the selected stock items by a given amount."
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Remove Stock"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "Stock removed"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr "Decrease the quantity of the selected stock items by a given amount."
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Transfer Stock"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "Stock transferred"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr "Transfer selected items to the specified location."
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr "Return Stock"
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr "Stock returned"
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr "Return selected items into stock, to the specified location."
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Count Stock"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "Stock counted"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr "Count the selected stock items, and adjust the quantity accordingly."
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Change Stock Status"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "Stock status changed"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr "Change the status of the selected stock items."
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr "Change Batch Code"
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr "Change batch code for the selected stock items"
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Merge Stock"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "Stock merged"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr "Merge Stock Items"
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr "Merge operation cannot be reversed"
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr "Tracking information may be lost when merging items"
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr "Supplier information may be lost when merging items"
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "Assign Stock to Customer"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "Stock assigned to customer"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Delete Stock Items"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "Stock deleted"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr "This operation will permanently delete the selected stock items."
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Parent stock location"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr "Find Serial Number"
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr "No matching items"
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr "Multiple matching items"
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr "Invalid response from server"
@@ -7289,15 +7290,15 @@ msgstr "Pricing"
msgid "Part Creation"
msgstr "Part Creation"
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr "Stock Expiry"
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr "Part Stocktake"
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7307,7 +7308,7 @@ msgstr "Stock Tracking"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr "External Build Orders"
diff --git a/src/frontend/src/locales/es/messages.po b/src/frontend/src/locales/es/messages.po
index 1424ab45b3..80607a7a02 100644
--- a/src/frontend/src/locales/es/messages.po
+++ b/src/frontend/src/locales/es/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: es\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Spanish\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr "Cancelar"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Acciones"
@@ -135,16 +135,16 @@ msgstr "No"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "Orden de construcción"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Códigos de proyecto"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Pedido de compra"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Orden de venta"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Orden de devolución"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "¿Eliminar la imagen asociada de este elemento?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "Versión API"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Complementos"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Añadir"
@@ -2874,8 +2874,8 @@ msgstr "Ajustes del usuario"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Ajustes del sistema"
@@ -2924,7 +2924,7 @@ msgstr "Cerrar sesión"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Stock"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "Fabricación"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Compras"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Archivos adjuntos"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Categoría"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Número de serie"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Número de serie"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Cantidad"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Lote"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Proveedor"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Cargando..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "Partes Agregadas"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr "Establecer Fecha de Vencimiento"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "Ajustar empaquetado"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Cambiar Estado"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "Introduzca el código de lote para los artículos recibidos"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Números de serie"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Agrega una cantidad dada en conjunto en lugar de artículos individuales"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Cantidad inicial de existencias que tendrá este artículo"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Introduzca números de serie para las nuevas existencias (o deje en blanco)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Estado de Existencias"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Añadir artículo de stock"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "Selecciona la pieza a instalar"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "Confirmar transferencia de existencias"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Mover a la ubicación predeterminada"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Mover"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "Devolver"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Mover"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "Devolver"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Contar"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Agregar existencias"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "Existencias añadidas"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Eliminar existencias"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "Existencias eliminadas"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Transferir existencias"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "Existencias transferidas"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Contar existencias"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "Existencias contadas"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Cambiar estado de existencias"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "Estado de existencias cambiado"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Juntar existencias"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "Existencias fusionadas"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "Asignar existencias a cliente"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "Existencias asignadas a cliente"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Eliminar existencias"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "Existencias eliminadas"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Ubicación del stock padre"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr "Precios"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "Seguimiento de existencias"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/es_MX/messages.po b/src/frontend/src/locales/es_MX/messages.po
index d86042f6e3..69742f313d 100644
--- a/src/frontend/src/locales/es_MX/messages.po
+++ b/src/frontend/src/locales/es_MX/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: es_MX\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Spanish, Mexico\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr "Cancelar"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Acciones"
@@ -135,16 +135,16 @@ msgstr "No"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Códigos de proyecto"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Pedido de compra"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Orden de venta"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Orden de devolución"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "¿Eliminar imagen asociada al artículo?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "Versión de API"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Complementos"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "Cambiar"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Agregar"
@@ -2874,8 +2874,8 @@ msgstr "Ajustes del usuario"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Ajustes del sistema"
@@ -2924,7 +2924,7 @@ msgstr "Cerrar sesión"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Existencias"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "Fabricación"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Compras"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Archivos adjuntos"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Categoría"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Número de serie"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Número de serie"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Cantidad"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Lote"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Proveedor"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Cargando..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr "Parte añadida a la orden de compra"
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "Nueva parte de proveedor"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "Nueva orden de compra"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr "Añadir a la orden de compra seleccionada"
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "No hay partes seleccionadas"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr "Ninguna pieza comprable seleccionada"
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "Partes añadidas"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "Todas las piezas seleccionadas añadidas a una orden de compra"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "Debe seleccionar al menos una parte para ordenar"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "La pieza del proveedor es necesaria"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "Cantidad requerida"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "Selección de pieza inválida"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "Por favor, corrija los errores en las partes seleccionadas"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr "Establecer la fecha de caducidad"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "Ajustar empaquetado"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Cambiar Estado"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "Introduzca el código de lote para los artículos recibidos"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Números de serie"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr "Introduzca una fecha de caducidad para los artículos recibidos"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Agrega una cantidad dada en conjunto en lugar de artículos individuales"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Cantidad inicial de existencias que tendrá este artículo"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Introduzca números de serie para las nuevas existencias (o deje en blanco)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Estado del stock"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Añadir artículo de stock"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "Selecciona la pieza a instalar"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "Confirmar transferencia de existencias"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Mover a la ubicación predeterminada"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Mover"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "Devolver"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Mover"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "Devolver"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Contar"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Agregar existencias"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "Existencias añadidas"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Eliminar existencias"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "Existencias eliminadas"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Transferir existencias"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "Existencias transferidas"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Contar existencias"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "Existencias contadas"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Cambiar estado de existencias"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "Estado de existencias cambiado"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Juntar existencias"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "Existencias fusionadas"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "Asignar existencias a cliente"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "Existencias asignadas a cliente"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Eliminar existencias"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "Existencias eliminadas"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Ubicación del stock padre"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr "Precios"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/et/messages.po b/src/frontend/src/locales/et/messages.po
index a927043ada..b81536ab30 100644
--- a/src/frontend/src/locales/et/messages.po
+++ b/src/frontend/src/locales/et/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: et\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Estonian\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr "Tühista"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Toimingud"
@@ -135,16 +135,16 @@ msgstr "Ei"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Projekti koodid"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Ostukorraldus"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Kas soovite eemaldada seotud pildi sellest üksusest?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "API versioon"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Pluginad"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "Muuda"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Lisa"
@@ -2874,8 +2874,8 @@ msgstr "Kasutaja seaded"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Süsteemi seaded"
@@ -2924,7 +2924,7 @@ msgstr "Logi välja"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Laoseis"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "Tootmine"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Ostmine"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Manused"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Kategooria"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Seerianumber"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Seerianumber"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Kogus"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Partii"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Tarnija"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Laadimine..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr "Müügi nõuded"
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Muuda staatust"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Seerianumbrid"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr "Sisesta saabunud ühikute aegumise kuupäevad"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Lisage antud kogus pakkidena individuaalsete esemete asemel"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Sisestage sellele laoseadmele algkogus"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Sisestage uued kaubanduslikud numbrikoodid (või jätke tühjaks)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Laoseis"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr ""
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr ""
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Liiguta"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Liiguta"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Kogus"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr ""
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr "Hind"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/fa/messages.po b/src/frontend/src/locales/fa/messages.po
index 922b9c851b..f4d505db73 100644
--- a/src/frontend/src/locales/fa/messages.po
+++ b/src/frontend/src/locales/fa/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: fa\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Persian\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr ""
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr ""
@@ -135,16 +135,16 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr ""
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr ""
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr ""
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr ""
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr ""
@@ -2874,8 +2874,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr ""
@@ -2924,7 +2924,7 @@ msgstr ""
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr ""
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr ""
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr ""
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr ""
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr ""
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr ""
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr ""
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr ""
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr ""
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr ""
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr ""
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr ""
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr ""
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr ""
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr ""
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr ""
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr ""
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr ""
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr ""
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/fi/messages.po b/src/frontend/src/locales/fi/messages.po
index c9a06014cc..0cb403dbe6 100644
--- a/src/frontend/src/locales/fi/messages.po
+++ b/src/frontend/src/locales/fi/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: fi\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Finnish\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr ""
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr ""
@@ -135,16 +135,16 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr ""
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr ""
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr ""
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr ""
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr ""
@@ -2874,8 +2874,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr ""
@@ -2924,7 +2924,7 @@ msgstr ""
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr ""
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr ""
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr ""
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr ""
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr ""
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr ""
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr ""
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr ""
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr ""
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr ""
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr ""
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr ""
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr ""
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr ""
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr ""
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr ""
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr ""
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr ""
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr ""
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/fr/messages.po b/src/frontend/src/locales/fr/messages.po
index acfcb8b0ca..d4cf70673f 100644
--- a/src/frontend/src/locales/fr/messages.po
+++ b/src/frontend/src/locales/fr/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: fr\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: French\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -79,12 +79,12 @@ msgstr "Annuler"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Actions"
@@ -135,16 +135,16 @@ msgstr "Non"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "Ordre de construction"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Codes du projet"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Commande d’achat"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Ventes"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Retour de commande"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Supprimer l'image associée de cet élément ?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "Version de l'API"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Extensions"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "Modifier"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Ajouter"
@@ -2874,8 +2874,8 @@ msgstr "Paramètres de l'utilisateur"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Les paramètres du système"
@@ -2924,7 +2924,7 @@ msgstr "Se déconnecter"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Stock"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "Fabrication"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Achat en cours"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Fichiers joints"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Catégorie"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Numéro de série"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Numéro de série"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Quantité"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Lot"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Fournisseur"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Chargement..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr "Conditions de vente"
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr "Pièce ajoutée à l'ordre de commande"
msgid "Select supplier part"
msgstr "Sélectionner une pièce du fournisseur"
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr "Copier le numéro de pièce du fournisseur"
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "Nouvelle pièce fournisseur"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr "Sélectionner un ordre de commande"
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "Nouvel ordre de commande"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr "Ajouter aux ordres de commande sélectionnés"
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "Aucune pièce sélectionnée"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr "Aucune pièce achetable sélectionnée"
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "Pièce ajoutée"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "Toutes les pièces sélectionnées ont été ajouté à l'ordre de commande"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "Vous devez sélectionner au moins une pièce à commander"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "Le fournisseur est requis"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "La quantité est requise"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "Sélection invalide"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "Veuillez corriger les erreurs dans la sélection des pièces"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr "Quantité à allouer"
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr "Indiquer une date d'expiration"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "Ajuster le conditionnement"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Changer le statut"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "Saisir le code de lot pour les articles reçus"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Numéros de Série"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr "Entrer une date d'expiration pour les articles reçus"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr "Laisser vide pour utiliser l'adresse de commande"
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Ajouter une quantité en paquet au lieu de pièces individuelles"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Entrez la quantité initiale pour cet article en stock"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Entrez les numéros de série pour le nouveau stock (ou laisser vide)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "État du stock"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Ajouter un article en stock"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "Sélectionnez la partie à installer"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "Confirmer le transfert des stock"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Déplacer vers l'emplacement par défaut"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Déplacer"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "Retour"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Déplacer"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "Retour"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Compter"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Ajouter du stock"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "Stock ajouté"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr "Augmenter le nombre des articles en stock sélectionnés d'une quantité donnée."
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Supprimer du stock"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "Stock retiré"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr "Réduire le nombre des articles en stock sélectionnés d'une quantité donnée."
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Transférer le stock"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "Stock transféré"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr "Transférer les articles sélectionnés vers l'endroit spécifié."
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr "Remettre en stock"
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr "Remis en stock"
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr "Remettre les articles sélectionnés en stock, à l'endroit spécifié."
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Compter le stock"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "Stock compté"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr "Compter les articles en stock sélectionnés et ajuster la quantité."
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Changer l'état du stock"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "Statut du stock changé"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr "Changer le status des articles en stock sélectionnés."
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Fusionner le stock"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "Stock fusionné"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr "Fusionner les articles en stock"
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr "L'opération de fusion ne permet pas de retour en arrière"
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr "Les informations de suivi pourraient être perdues lors de la fusion des articles"
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr "Les informations du fournisseur pourraient être perdues lors de la fusion des articles"
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "Lier un stock à un client"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "Stock lié au client"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Supprimer l'article du stock"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "Stock supprimé"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr "Cette opération va supprimer définitivement les articles en stock sélectionnés."
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Localisation Parente du stock"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr "Trouver le numéro de série"
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr "Pas d'article correspondant"
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr "Plusieurs articles correspondent"
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr "Réponse invalide du serveur"
@@ -7294,15 +7295,15 @@ msgstr "Tarifs"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "Suivi du stock"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/he/messages.po b/src/frontend/src/locales/he/messages.po
index 4518b54857..ca4e2766ff 100644
--- a/src/frontend/src/locales/he/messages.po
+++ b/src/frontend/src/locales/he/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: he\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Hebrew\n"
"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;\n"
@@ -79,12 +79,12 @@ msgstr "בטל"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr ""
@@ -135,16 +135,16 @@ msgstr "לא"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "קוד פרויקט"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "הזמנות רכש"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "הזמנת מכירה"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "החזרת הזמנה"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "האם להסיר את התמונה המשויכת מפריט זה?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "גרסת API"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "תוספים"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr ""
@@ -2874,8 +2874,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "הגדרות מערכת"
@@ -2924,7 +2924,7 @@ msgstr "התנתק"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "מלאי"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "רכישה"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr ""
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr ""
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "מספר סידורי"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "מספר סידורי"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "כמות"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr ""
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr ""
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr ""
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr ""
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr ""
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr ""
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr ""
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr ""
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr ""
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr ""
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr ""
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr ""
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr ""
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr ""
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr ""
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/hi/messages.po b/src/frontend/src/locales/hi/messages.po
index 9c3ac6b70a..f11aa246cb 100644
--- a/src/frontend/src/locales/hi/messages.po
+++ b/src/frontend/src/locales/hi/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: hi\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Hindi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr ""
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr ""
@@ -135,16 +135,16 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr ""
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr ""
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr ""
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr ""
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr ""
@@ -2874,8 +2874,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr ""
@@ -2924,7 +2924,7 @@ msgstr ""
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr ""
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr ""
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr ""
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr ""
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr ""
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr ""
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr ""
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr ""
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr ""
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr ""
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr ""
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr ""
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr ""
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr ""
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr ""
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr ""
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr ""
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr ""
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr ""
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/hu/messages.po b/src/frontend/src/locales/hu/messages.po
index 6ad134c988..62b2df3c38 100644
--- a/src/frontend/src/locales/hu/messages.po
+++ b/src/frontend/src/locales/hu/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: hu\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Hungarian\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr "Mégsem"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Műveletek"
@@ -135,16 +135,16 @@ msgstr "Nem"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "Gyártási utasítás"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Projektszámok"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Beszerzési rendelés"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Vevői rendelés"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Visszavétel"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Tételhez rendelt kép eltávolítása?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "API verzió"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Pluginok"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "Módosítás"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Hozzáadás"
@@ -2874,8 +2874,8 @@ msgstr "Felhasználói beállítások"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Rendszerbeállítások"
@@ -2924,7 +2924,7 @@ msgstr "Kijelentkezés"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Készlet"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "Gyártás"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Beszerzés"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Mellékletek"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Kategória"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Sorozatszám"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Sorozatszám"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Mennyiség"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Köteg"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Beszállító"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Betöltés..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr "Értékesítési igények"
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr "Alkatrész hozzáadva a beszerzési rendeléshez"
msgid "Select supplier part"
msgstr "Beszállítói alkatrész kiválasztása"
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr "Beszállítói alkatrész szám másolása"
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "Új beszállítói alkatrész"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr "Beszerzési rendelés kiválasztása"
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "Új beszerzési rendelés"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr "Hozzáadás a kiválasztott beszerzési rendeléshez"
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "Nincs kiválasztva alkatrész"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr "Nincs kiválasztva beszerezhető alkatrész"
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "Alkatrészek hozzáadva"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "Minden kiválasztott alkatrész beszerzési rendeléshez adva"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "Legalább egy alkatrész választása szükséges a rendeléshez"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "Beszállítói alkatrész szükséges"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "Mennyiség megadása kötelező"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "Érvénytelen alkatrész kiválasztás"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "Kérjük javítsa ki a hibákat a kiválasztott alkatrészeknél"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr "Teljesítendő mennyiség"
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr "Lejárati dátum beállítása"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "Csomagolás módosítása"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Állapot megváltoztatása"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "Gyártási szám megadása a fogadott tételekhez"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Sorozatszámok"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr "Lejárati dátum megadása a fogadott tételekhez"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr "Hagyja üresen a rendelési cím használatához"
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Mennyiség hozzáadása csomagolási egységenként egyedi tételek helyett"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Add meg a kezdeti mennyiséget ehhez a készlet tételhez"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Add meg az új készlet tételhez tartozó sorozatszámokat (vagy hagyd üresen)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Készlet állapota"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Új készlet tétel"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "Válassza ki a telepítendő alkatrészt"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "Mozgatás megerősítése"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Mozgatás az alapértelmezett helyre"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Áthelyezés"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "Visszavétel"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Áthelyezés"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "Visszavétel"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Mennyiség"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Készlethez ad"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "Raktárkészlet hozzáadva"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr "Kiválasztott készlettételek mennyiségének növelése adott értékkel."
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Készlet csökkentése"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "Készlet eltávolítva"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr "Kiválasztott készlettételek mennyiségének csökkentése adott értékkel."
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Készlet áthelyezése"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "Készlet áthelyezve"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr "Kiválasztott tétele mozgatása a meghatározott készlethelyre."
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr "Visszavételi készlet"
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr "Készlet visszavéve"
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr "Kiválasztott tételek visszavétele készletre a megadott helyre."
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Leltározás"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "Készlet számlálva"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr "Számolja meg a kiválasztott készlet tételeket és módosítsa a mennyiséget ennek megfelelően."
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Készlet állapot módosítása"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "Készlet státusz megváltozott"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr "A kiválasztott készlet tételek státuszának módosítása."
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Készlet összevonása"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "Készlet összevonva"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr "Készlet tételek összevonása"
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr "Az összevonási művelet nem visszafordítható"
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr "Nyomonkövetési információk elveszhetnek tételek összevonásakor"
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr "Beszállítói információk elveszhetnek tételek összevonásakor"
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "Készlet hozzárendelése ügyfélhez"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "Készlet hozzárendelve az ügyfélhez"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Készlet tétel törlése"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "Készlet törölve"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr "Ez a művelet véglegesen törli a kiválasztott készlet tételeket."
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Szülő készlet hely"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr "Sorozatszám keresése"
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr "Nincs egyező tétel"
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr "Több egyező tétel"
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr "Érvénytelen válasz a szervertől"
@@ -7294,15 +7295,15 @@ msgstr "Árazás"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "Készlettörténet"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/id/messages.po b/src/frontend/src/locales/id/messages.po
index 19c1ef2e55..9f33f07bf0 100644
--- a/src/frontend/src/locales/id/messages.po
+++ b/src/frontend/src/locales/id/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: id\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Indonesian\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -79,12 +79,12 @@ msgstr "Batal"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr ""
@@ -135,16 +135,16 @@ msgstr "Tidak"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr ""
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr ""
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "Versi API"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr ""
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Tambah"
@@ -2874,8 +2874,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Pengaturan Sistem"
@@ -2924,7 +2924,7 @@ msgstr ""
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Persediaan"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr ""
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr ""
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Nomor Seri"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Nomor Seri"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Jumlah"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr ""
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr ""
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Memuat..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr ""
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Nomor Seri"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr ""
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr ""
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr ""
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr ""
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr ""
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr ""
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr ""
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr ""
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr ""
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr ""
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/it/messages.po b/src/frontend/src/locales/it/messages.po
index 61754b8c66..b103d3ba2c 100644
--- a/src/frontend/src/locales/it/messages.po
+++ b/src/frontend/src/locales/it/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: it\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Italian\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr "Annulla"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Azioni"
@@ -135,16 +135,16 @@ msgstr "No"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "Ordine di Produzione"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Codici del progetto"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Ordine d'acquisto"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Ordine di Vendita"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Ordine di reso"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Rimuovi l'immagine associata all'articolo?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "Versione API"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Plugin"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "Cambiare"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Aggiungi"
@@ -2874,8 +2874,8 @@ msgstr "Impostazioni Utente"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Impostazioni di sistema"
@@ -2924,7 +2924,7 @@ msgstr "Disconnettiti"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Stock"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "Fabbricazione"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Acquisto"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Allegati"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Categoria"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Numero Seriale"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Numero Seriale"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Quantità"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Lotto"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Fornitore"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Caricamento..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr "Requisiti di vendita"
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr "Articolo aggiunto all'ordine di acquisto"
msgid "Select supplier part"
msgstr "Seleziona l'articolo del fornitore"
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr "Copia il numero articolo del fornitore"
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "Nuovo articolo fornitore"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr "Seleziona ordine d'acquisto"
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "Nuovo ordine d'acquisto"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr "Aggiungi all'ordine di acquisto selezionato"
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "Nessun articolo selezionato"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr "Nessun articolo acquistabile selezionato"
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "Articolo aggiunto"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "Tutte le parti selezionate aggiunte all'ordine di acquisto"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "Devi selezionare almeno un articolo da ordinare"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "L'articolo fornitore è richiesto"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "La quantità è richiesta"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "Selezione articolo invalida"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "Si prega di correggere gli errori negli articoli selezionati"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr "Quantità da completare"
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr "Impostare una Data di Scadenza"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "Regola Imballaggio"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Modifica Stato"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "Inserisci il codice lotto per gli articoli ricevuti"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Numeri di serie"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr "Inserisci una data di scadenza per gli articoli ricevuti"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr "Lascia vuoto per utilizzare l'indirizzo dell'ordine"
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Aggiungere la quantità data come pacchi invece di singoli articoli"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Inserisci quantità iniziale per questo articolo in giacenza"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Inserire i numeri di serie per la nuova giacenza (o lasciare vuoto)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Stato giacenza"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Aggiungi Elemento Magazzino"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "Selezionare l'articolo da installare"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "Conferma trasferimento"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Sposta nella posizione predefinita"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Sposta"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "Reso"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Sposta"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "Reso"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Conta"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Aggiungi Giacenza"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "Scorte aggiunte"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr "Aumenta la quantità degli articoli di magazzino selezionati di una data quantità."
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Rimuovi giacenza"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "Scorte rimosse"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr "Diminuisce la quantità degli articoli di magazzino selezionati di una data quantità."
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Trasferisci giacenza"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "Scorte trasferite"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr "Trasferisci gli elementi selezionati nella posizione specificata."
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr "Restituisci Elemento a Magazzino"
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr "Reso a magazzino effettuato"
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr "Restituisce gli articoli selezionati in magazzino, nella posizione specificata."
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Conteggio Giacenze"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "Scorte contate"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr "Contare gli articoli di magazzino selezionati e regolare la quantità di conseguenza."
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Modifica stato giacenze"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "Stato delle scorte cambiato"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr "Cambia lo stato degli articoli a magazzino selezionati."
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Unisci giacenze"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "Scorte unite"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr "Unisci gli articoli di magazzino"
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr "L'operazione di unione non è reversibile"
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr "Le informazioni di tracciamento potrebbero essere perse durante l'unione degli articoli"
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr "Le informazioni sul fornitore potrebbero essere perse durante l'unione degli articoli"
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "Assegnare la scorta al cliente"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "Scorte assegnate al cliente"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Cancella Elemento di Magazzino"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "Scorte cancellate"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr "Questa operazione eliminerà definitivamente gli articoli a magazzino selezionati."
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Posizione giacenza principale"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr "Trova Numero Di Serie"
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr "Nessun articolo corrispondente trovato"
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr "Più elementi corrispondenti trovati"
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr "Risposta non valida dal server"
@@ -7294,15 +7295,15 @@ msgstr "Prezzi"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "Monitoraggio delle scorte"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/ja/messages.po b/src/frontend/src/locales/ja/messages.po
index 55048611d1..c596857b4c 100644
--- a/src/frontend/src/locales/ja/messages.po
+++ b/src/frontend/src/locales/ja/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: ja\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Japanese\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -79,12 +79,12 @@ msgstr "キャンセル"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "アクション"
@@ -135,16 +135,16 @@ msgstr "いいえ"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "組立注文"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "プロジェクトコード"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "注文"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "セールスオーダー"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "リターンオーダー"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr "在庫移動指示"
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "このアイテムから関連画像を削除しますか?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "API バージョン"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "プラグイン"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "変更"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "追加"
@@ -2874,8 +2874,8 @@ msgstr "ユーザー設定"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "システム設定"
@@ -2924,7 +2924,7 @@ msgstr "ログアウト"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "在庫"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "製造"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "購買"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "添付ファイル"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "カテゴリ"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "シリアル番号"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "シリアル番号"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "数量"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "スクール機能"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "仕入先"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "読み込み中…"
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr "販売要件"
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr "注文書に追加された部品"
msgid "Select supplier part"
msgstr "サプライヤー部品の選択"
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr "サプライヤー部品番号をコピー"
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "新サプライヤー部品"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr "注文書の選択"
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "新規発注"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr "選択した注文書に追加する"
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "部品選択なし"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr "購入可能な部品が選択されていない"
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "部品が追加された"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "選択されたすべての部品が発注書に追加される"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "少なくとも1つの部品を選択して注文する必要があります。"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "サプライヤーの部品が必要"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "数量が必要です"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "無効な部品選択"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "選択した部品の誤りを訂正してください。"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr "完了数量"
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr "有効期限の設定"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "パッケージの調整"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "ステータスを変更"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "受領品のバッチコードを入力"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "シリアル番号"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr "受け取った商品の有効期限を入力してください。"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr "オーダーの住所を使用する場合は空欄のままにしてく
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "指定された数量を単品ではなくパックとして追加します。"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "この商品の初期数量を入力"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "新しい在庫のシリアル番号を入力(または空白のまま)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "在庫状況"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "在庫商品の追加"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "取り付ける部品の選択"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "株式譲渡の確認"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "デフォルトの場所に移動"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "移動"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "戻る"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "移動"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "戻る"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "カウント"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "在庫追加"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "在庫追加"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr "選択された在庫品の数量を、指定された数量だけ増やします。"
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "在庫の削除"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "在庫一掃"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr "選択された在庫品の数量を、指定された数量分だけ減らします。"
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "株式譲渡"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "株式譲渡"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr "選択されたアイテムを指定された場所に移動します。"
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr "在庫戻し"
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr "在庫が戻りました"
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr "選択された商品を、指定された場所へ在庫に戻してください。"
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "在庫数"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "在庫数"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr "選択された在庫品目を数え、それに応じて数量を調整してください。"
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "在庫状況の変更"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "在庫状況の変更"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr "選択された在庫品のステータスを変更します。"
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr "バッチコードを変更"
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr "選択した在庫品のバッチコードを変更します"
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "株式の併合"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "株式併合"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr "在庫品を合算する"
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr "合算操作は元に戻せません"
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr "在庫品を合算する際、追跡情報が失われる可能性があります。"
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr "在庫品を合算する際、サプライヤー情報が失われる可能性があります。"
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "顧客への在庫割り当て"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "顧客に割り当てられた在庫"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "在庫アイテムの削除"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "ストック削除"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr "この操作により、選択された在庫品目が完全に削除されます。"
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "親株式所在地"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr "シリアル番号を探す"
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr "該当する品目はありません"
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr "複数の品目が見つかりました"
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr "サーバーからの応答が無効です"
@@ -7294,15 +7295,15 @@ msgstr "価格"
msgid "Part Creation"
msgstr "部品作成"
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr "在庫期限切れ"
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr "部品棚卸し"
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "在庫管理"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr "外部ビルドオーダー"
diff --git a/src/frontend/src/locales/ko/messages.po b/src/frontend/src/locales/ko/messages.po
index fb1663e8b8..cda20b5483 100644
--- a/src/frontend/src/locales/ko/messages.po
+++ b/src/frontend/src/locales/ko/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: ko\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Korean\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -79,12 +79,12 @@ msgstr "취소"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "작업"
@@ -135,16 +135,16 @@ msgstr "아니요"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "생산 주문"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "프로젝트 코드 목록"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "발주서"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "판매 주문서"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "반품 주문"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "이 항목에 연결된 이미지를 제거하시겠습니까?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "API 버전"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "플러그인"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "변화"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "추가하다"
@@ -2874,8 +2874,8 @@ msgstr "사용자 설정"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "시스템 설정"
@@ -2924,7 +2924,7 @@ msgstr "로그아웃"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "재고"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "조작"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "구매"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "첨부파일"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "카테고리"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "시리얼 번호"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "시리얼 번호"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "수량"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "일괄"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "공급자"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "불러오는 중..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr "판매 요건"
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr "부품이 발주서에 추가되었습니다"
msgid "Select supplier part"
msgstr "협력업체 부품 선택"
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr "공급업체 부품 번호 복사"
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "새로운 공급업체 부품"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr "발주서 선택"
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "새 발주서"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr "선택한 발주서에 추가"
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "선택한 부품이 없습니다."
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr "구매 가능한 부품이 선택되지 않았습니다."
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "부품이 추가되었습니다"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "선택한 모든 부품이 발주서에 추가되었습니다"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "주문하려면 부품을 하나 이상 선택해야 합니다."
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "공급업체 부품이 필요합니다"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "수량이 필요합니다"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "잘못된 부품 선택"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "선택한 부분의 오류를 수정해주세요"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr "완료할 수량"
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr "만료일 설정"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "포장 조정"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "상태 변경"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "입고된 항목의 배치 코드를 입력하세요"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "일련번호"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr "입고된 항목의 만료일을 입력하세요"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr "주문 주소를 사용하려면 비워두세요."
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "개별 항목 대신 포장 단위로 수량을 추가합니다"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "이 재고 품목의 초기 수량을 입력하세요"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "새 재고의 시리얼 번호를 입력하세요. 비워 둘 수도 있습니다"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "재고현황"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "재고 품목 추가"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "설치할 부품 선택"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "재고 이전 확인"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "기본 위치로 이동"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "이동하다"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "반품"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "이동하다"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "반품"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "실사"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "재고 추가"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "재고 추가됨"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr "선택한 재고 품목의 수량을 지정한 만큼 늘립니다"
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "재고 차감"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "재고가 차감되었습니다"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr "선택한 재고 품목의 수량을 지정한 만큼 줄입니다"
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "재고 이전"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "재고양도"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr "선택한 항목을 지정한 위치로 이동합니다"
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr "재고 반환"
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr "재고가 반환되었습니다"
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr "선택한 항목을 지정한 위치의 재고로 반환합니다"
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "재고 수량"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "재고 계산"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr "선택한 재고 품목을 실사하고 수량을 그에 맞게 조정합니다"
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "재고현황 변경"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "재고 상태가 변경되었습니다."
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr "선택한 재고 품목의 상태를 변경합니다"
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr "배치 코드 변경"
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr "선택한 재고 품목의 배치 코드를 변경합니다"
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "재고 병합"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "재고 병합"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr "재고 품목 병합"
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr "병합 작업은 되돌릴 수 없습니다."
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr "항목을 병합하면 추적 정보가 손실될 수 있습니다."
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr "품목을 병합하면 공급업체 정보가 손실될 수 있습니다."
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "고객에게 재고 할당"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "고객에게 할당된 재고"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "재고 품목 삭제"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "재고가 삭제되었습니다."
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr "이 작업은 선택한 재고 품목을 영구적으로 삭제합니다"
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "모재 위치"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr "일련번호 찾기"
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr "일치하는 항목이 없습니다."
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr "일치하는 항목이 여러 개 있습니다"
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr "서버의 응답이 올바르지 않습니다"
@@ -7294,15 +7295,15 @@ msgstr "가격"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr "부품 재고 실사"
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "재고 추적"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/lt/messages.po b/src/frontend/src/locales/lt/messages.po
index 8cb1ece968..e40c7e6e23 100644
--- a/src/frontend/src/locales/lt/messages.po
+++ b/src/frontend/src/locales/lt/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: lt\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Lithuanian\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && (n%100>19 || n%100<11) ? 0 : (n%10>=2 && n%10<=9) && (n%100>19 || n%100<11) ? 1 : n%1!=0 ? 2: 3);\n"
@@ -79,12 +79,12 @@ msgstr ""
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr ""
@@ -135,16 +135,16 @@ msgstr "Ne"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr ""
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr ""
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr ""
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr ""
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr ""
@@ -2874,8 +2874,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr ""
@@ -2924,7 +2924,7 @@ msgstr ""
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr ""
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr ""
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr ""
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr ""
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr ""
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr ""
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr ""
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr ""
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr ""
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr ""
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr ""
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr ""
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr ""
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr ""
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr ""
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr ""
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr ""
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr ""
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr ""
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/lv/messages.po b/src/frontend/src/locales/lv/messages.po
index 32afbfaca1..32909d1ff3 100644
--- a/src/frontend/src/locales/lv/messages.po
+++ b/src/frontend/src/locales/lv/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: lv\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Latvian\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
@@ -79,12 +79,12 @@ msgstr ""
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr ""
@@ -135,16 +135,16 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr ""
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr ""
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr ""
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr ""
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr ""
@@ -2874,8 +2874,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr ""
@@ -2924,7 +2924,7 @@ msgstr ""
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr ""
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr ""
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr ""
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr ""
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr ""
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr ""
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr ""
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr ""
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr ""
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr ""
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr ""
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr ""
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr ""
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr ""
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr ""
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr ""
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr ""
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr ""
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr ""
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/nl/messages.po b/src/frontend/src/locales/nl/messages.po
index a23a804b8d..26d0dc61f1 100644
--- a/src/frontend/src/locales/nl/messages.po
+++ b/src/frontend/src/locales/nl/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: nl\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-23 06:29\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Dutch\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr "Annuleer"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Acties"
@@ -135,16 +135,16 @@ msgstr "Nee"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "Productieorder"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Project codes"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Inkooporder"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Verkooporder"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Retourorder"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "De bijbehorende afbeelding van dit item verwijderen?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "API versie"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Plug-ins"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "Wijzigen"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Toevoegen"
@@ -2874,8 +2874,8 @@ msgstr "Gebruiker instellingen"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Systeem instellingen"
@@ -2924,7 +2924,7 @@ msgstr "Uitloggen"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Voorraad"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "Productie"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Kopen"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Bijlagen"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Categorie"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Serienummer"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Serienummer"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Aantal"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Batch"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Leverancier"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Laden..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr "Verkoop eisen"
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr "Onderdeel aan inkooporder toegevoegd"
msgid "Select supplier part"
msgstr "Selecteer leveranciersdeel"
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr "Kopiëer leveranciersartikelnummer"
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "Nieuw leveranciers onderdeel"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr "Selecteer een bestelling"
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "Nieuwe inkooporder"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr "Toevoegen aan geselecteerde inkooporder"
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "Geen onderdelen geselecteerd"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr "Geen koopbare onderdelen geselecteerd"
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "Onderdelen toegevoegd"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "Alle geselecteerde onderdelen toegevoegd aan een inkooporder"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "U moet minstens één onderdeel selecteren om te bestellen"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "Leveranciersonderdeel is vereist"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "Hoeveelheid is vereist"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "Ongeldige onderdeel selectie"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "Corrigeer de fouten in de geselecteerde onderdelen"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr "Te voltooien hoeveelheid"
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr "Stel vervaldatum in"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "Verpakking aanpassen"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Status wijzigen"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "Voer batch code in voor ontvangen items"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Serienummers"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr "Voer een vervaldatum in voor ontvangen items"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr "Laat leeg om het besteladres te gebruiken"
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Opgegeven hoeveelheid als pakket toevoegen in plaats van individuele artikelen"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Voer de initiële hoeveelheid in voor dit voorraadartikel"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Voer serienummer in voor nieuwe voorraad (of laat het leeg)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Voorraad status"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Voorraad item toevoegen"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "Selecteer het onderdeel om te installeren"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "Bevestig voorraad overdracht"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Verplaats naar standaardlocatie"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Verplaatsen"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "Terug"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Verplaatsen"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "Terug"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Aantal"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Voorraad toevoegen"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "Voorraad toegevoegd"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr "Verhoog de hoeveelheid van de geselecteerde voorraadartikelen met een bepaald bedrag."
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Voorraad verwijderen"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "Voorraad verwijderd"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr "Verlaag de hoeveelheid van de geselecteerde voorraadartikelen met een bepaald bedrag."
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Voorraad verplaatsen "
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "Voorraadartikel verplaatst"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr "Verplaats de geselecteerde items naar de opgegeven locatie."
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr "Terug naar voorraad"
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr "Voorraad teruggestuurd"
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr "Retourneer geselecteerde items naar voorraad, naar de opgegeven locatie."
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Tel voorraad"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "Voorraad geteld"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr "Tel de geselecteerde voorraaditems, en pas de hoeveelheid overeenkomstig aan."
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Wijzig voorraad status"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "Voorraad status gewijzigd"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr "Verander de status van de geselecteerde voorraaditems."
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Voorraad samenvoegen"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "Voorraad samengevoegd"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr "Voorraad items samenvoegen"
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr "Samenvoeg bewerking kan niet worden teruggedraaid"
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr "Tracking informatie kan verloren gaan tijdens het samenvoegen van items"
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr "De informatie van de leverancier kan verloren gaan bij het samenvoegen van items"
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "Voorraad toewijzen aan klant"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "Voorraad toegewezen aan klant"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Voorraad items verwijderen"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "Voorraad verwijderd"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr "Deze bewerking zal de geselecteerde voorraaditems permanent verwijderen."
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Bovenliggende voorraad locatie"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr "Zoek serienummer"
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr "Geen overeenkomende items"
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr "Meerdere overeenkomende items"
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr "Ongeldige reactie van server"
@@ -7294,15 +7295,15 @@ msgstr "Prijzen"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "Voorraad bijhouden"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/no/messages.po b/src/frontend/src/locales/no/messages.po
index 2e3f4042c5..ddd704ed84 100644
--- a/src/frontend/src/locales/no/messages.po
+++ b/src/frontend/src/locales/no/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: no\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Norwegian\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr "Avbryt"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Handlinger"
@@ -135,16 +135,16 @@ msgstr "Nei"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Prosjektkoder"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Innkjøpsordre"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Salgsordre"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Returordre"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr ""
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "API-versjon"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Utvidelser"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "Endre"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Legg til"
@@ -2874,8 +2874,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Systeminnstillinger"
@@ -2924,7 +2924,7 @@ msgstr "Logg ut"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Lagerbeholdning"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Innkjøp"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Vedlegg"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Kategori"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Serienummer"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Serienummer"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Antall"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr ""
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Leverandør"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr ""
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr ""
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Serienumre"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Legg til gitt mengde som pakker i stedet for enkeltprodukter"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Angi innledende antall for denne lagervaren"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Angi serienumre for ny lagerbeholdning (eller la stå tom)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr ""
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr ""
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr ""
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr ""
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Tell"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Overfør lager"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Tell beholdning"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr ""
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr "Prising"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "Sporing av lager"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/pl/messages.po b/src/frontend/src/locales/pl/messages.po
index f9c71c32e7..02ce6e483d 100644
--- a/src/frontend/src/locales/pl/messages.po
+++ b/src/frontend/src/locales/pl/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: pl\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Polish\n"
"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
@@ -79,12 +79,12 @@ msgstr "Anuluj"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Akcje"
@@ -135,16 +135,16 @@ msgstr "Nie"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Kody projektu"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Zlecenie zakupu"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Zlecenie sprzedaży"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Zwrot zamówienia"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Usunąć powiązany obrazek z tego elementu?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "Wersja API"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Wtyczki"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "Zmień"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Dodaj"
@@ -2874,8 +2874,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Ustawienia systemowe"
@@ -2924,7 +2924,7 @@ msgstr "Wyloguj się"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Stan"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Zakupy"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr ""
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr ""
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Numer seryjny"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Numer seryjny"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Ilość"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr ""
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr ""
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Ładowanie..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "Dostosuj opakowanie"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Zmień status"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Numery seryjne"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Dodaj podaną ilość jako paczkę zamiast poszczególnych produktów"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Wprowadź początkową ilość dla tego towaru"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Wprowadź numery seryjne dla nowego stanu (lub pozostaw puste)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Dodaj element magazynowy"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Przenieś do domyślnej lokalizacji"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Przenieś"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Przenieś"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Ilość"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Dodaj stan"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Usuń stan"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Przenieś stan"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Policz stan"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Zmień status stanu magazynowego"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr ""
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr "Cennik"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/pt/messages.po b/src/frontend/src/locales/pt/messages.po
index c03dafc731..f3f15c6516 100644
--- a/src/frontend/src/locales/pt/messages.po
+++ b/src/frontend/src/locales/pt/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: pt\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Portuguese\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr "Cancelar"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Ações"
@@ -135,16 +135,16 @@ msgstr "Não"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "Ordem de Produção"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Códigos do Projeto"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Pedido de Compra"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Pedido de Venda"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Pedido de Devolução"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Remover a imagem associada a este item?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2077,7 +2077,7 @@ msgstr "Versão da API"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Extensões"
@@ -2520,7 +2520,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Adicionar"
@@ -2875,8 +2875,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Definições de Sistema"
@@ -2925,7 +2925,7 @@ msgstr "Encerrar sessão"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2938,7 +2938,7 @@ msgstr "Estoque"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2946,7 +2946,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2958,7 +2958,7 @@ msgstr "Comprando"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3094,7 +3094,7 @@ msgid "Attachments"
msgstr "Anexos"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3390,15 +3390,15 @@ msgstr "Categoria"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3419,7 +3419,7 @@ msgid "Serial Number"
msgstr "Número de Série"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3427,7 +3427,7 @@ msgstr "Número de Série"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3454,15 +3454,15 @@ msgstr "Quantidade"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Lote"
@@ -3984,7 +3984,7 @@ msgid "Supplier"
msgstr "Fornecedor"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "A carregar..."
@@ -4130,13 +4130,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4181,64 +4181,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4822,7 +4822,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5105,12 +5105,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Alterar Estado"
@@ -5154,7 +5154,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Números de Série"
@@ -5173,7 +5173,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5275,218 +5275,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Adicionar quantidade dada como pacotes em vez de itens individuais"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Digite a quantidade inicial para este item de estoque"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Insira os números de série para novo estoque (ou deixe em branco)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Estado do Estoque"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Adicionar item de Estoque"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Mover para o local padrão"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Mover"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Mover"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Contar"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Adicionar Estoque"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Remover Estoque"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Transferir Estoque"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Contar Estoque"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Alterar estado do Estoque"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Mesclar Estoque"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Excluir Itens de Estoque"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Localização parente de Estoque"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7295,15 +7296,15 @@ msgstr "Preços"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7313,7 +7314,7 @@ msgstr "Rastreamento de Estoque"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/pt_BR/messages.po b/src/frontend/src/locales/pt_BR/messages.po
index 2feb679aad..1a29f76381 100644
--- a/src/frontend/src/locales/pt_BR/messages.po
+++ b/src/frontend/src/locales/pt_BR/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: pt\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-21 21:20\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Portuguese, Brazilian\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr "Cancelar"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Ações"
@@ -135,16 +135,16 @@ msgstr "Não"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "Pedido de produção"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Códigos de projeto"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Pedido de compra"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Pedido de venda"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Pedido de devolução"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr "Transferencia de estoque"
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Remover imagem associada a este item?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "Versão da API"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Extensões"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "Alterar"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Adicionar"
@@ -2874,8 +2874,8 @@ msgstr "Configurações de usuário"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Configurações do sistema"
@@ -2924,7 +2924,7 @@ msgstr "Sair"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Estoque"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "Produção"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Compras"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Anexos"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Categoria"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Número de série"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Número de série"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Quantidade"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Lote"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Fornecedor"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Carregando..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr "Requisitos de vendas"
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr "Peça adicionada a pedido de compra"
msgid "Select supplier part"
msgstr "Selecionar fornecedor da peça"
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr "Copiar número da peça do fornecedor"
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "Nova peça de fornecedor"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr "Selecionar pedido"
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "Novo pedido de compra"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr "Adicionar ao pedido de compra selecionado"
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "Nenhuma peça selecionada"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr "Nenhuma peça selecionada para compra"
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "Peças adicionadas"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "Todas as peças selecionadas adicionadas a um pedido de compra"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "Você deve selecionar pelo menos uma peça para o pedido"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "Uma peça do fornecedor é obrigatória"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "A quantidade é obrigatória"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "Seleção de peça inválida"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "Por favor, corrija os erros nas peças selecionadas"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr "Quantidade a completar"
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr "Definir data de validade"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "Ajustar pacotes"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Alterar status"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "Digite o código do lote para itens de estoque recebidos"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Números de série"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr "Insira uma data de expiração para os itens recebidos"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr "Deixe em branco para usar o endereço do pedido"
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Adicionar quantidade dada como pacotes e não itens individuais"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Inserir quantidade inicial deste item de estoque"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Insira o número de série para novo estoque (ou deixe em branco)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Status do estoque"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Adicionar item do estoque"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "Selecione a peça para instalar"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "Confirmar transferência de estoque"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr "Confirmar devolução de estoque"
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Mover para o local padrão"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Mover"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "Voltar"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr "Mesclar com o estoque existente"
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Mover"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "Voltar"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr "Mesclar itens devolvidos com itens de estoque existentes, se possível"
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr "Notas da transação de estoque"
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Contar"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Adicionar estoque"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "Estoque adicionado"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr "Aumentar a quantidade dos itens de estoque selecionados em um valor determinado."
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Remover estoque"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "Estoque removido"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr "Diminuir a quantidade dos itens de estoque selecionados em um valor determinado."
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Transferir estoque"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "Estoque transferido"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr "Transferir os itens selecionados para o local especificado."
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr "Devolver estoque"
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr "Estoque devolvido"
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr "Devolver os itens selecionados ao estoque, no local especificado."
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Contar estoque"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "Estoque contado"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr "Contar os itens de estoque selecionados e ajustar a quantidade conforme necessário."
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Mudar status do estoque"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "Status do estoque alterado"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr "Alterar o status dos itens de estoque selecionados."
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr "Alterar código de lote"
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr "Alterar código de lote dos itens de estoque selecionados"
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Mesclar estoque"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "Estoque mesclado"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr "Mesclar itens de estoque"
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr "A operação de mesclagem não pode ser revertida"
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr "Informações de rastreamento podem ser perdidas ao mesclar itens"
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr "Informações de fornecedor podem ser perdidas ao mesclar itens"
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "Atribuir estoque ao cliente"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "Estoque atribuído ao cliente"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Excluir item de estoque"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "Estoque excluído"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr "Esta operação excluirá permanentemente os itens de estoque selecionados."
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Local de estoque pai"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr "Encontrar número de série"
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr "Nenhum item correspondente"
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr "Vários itens correspondentes"
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr "Resposta inválida do servidor"
@@ -7294,15 +7295,15 @@ msgstr "Preços"
msgid "Part Creation"
msgstr "Criação de peça"
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr "Validade do estoque"
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr "Inventário da peça"
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "Rastreamento de estoque"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr "Pedidos de produção externos"
diff --git a/src/frontend/src/locales/ro/messages.po b/src/frontend/src/locales/ro/messages.po
index 28e73a719b..13a13cfb9c 100644
--- a/src/frontend/src/locales/ro/messages.po
+++ b/src/frontend/src/locales/ro/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: ro\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Romanian\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100>0 && n%100<20)) ? 1 : 2);\n"
@@ -79,12 +79,12 @@ msgstr "Anulează"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Acțiuni"
@@ -135,16 +135,16 @@ msgstr "Nu"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Coduri Proiecte"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Comandă de achiziție"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Comandă de Vânzare"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Returnează Comanda"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Eliminați imaginea asociată de la acest articol?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "Versiune API"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Plugin-uri"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr ""
@@ -2874,8 +2874,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr ""
@@ -2924,7 +2924,7 @@ msgstr ""
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Stoc"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "Producție"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Achiziţie"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr ""
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr ""
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr ""
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr ""
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr ""
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr ""
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr ""
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr ""
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "Introduceți codul lotului pentru articolele primite"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr ""
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr ""
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr ""
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr ""
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr ""
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr ""
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr ""
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr ""
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr ""
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr ""
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr ""
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/ru/messages.po b/src/frontend/src/locales/ru/messages.po
index cf815bd4ce..096bda3b1f 100644
--- a/src/frontend/src/locales/ru/messages.po
+++ b/src/frontend/src/locales/ru/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: ru\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Russian\n"
"Plural-Forms: nplurals=4; plural=((n%10==1 && n%100!=11) ? 0 : ((n%10 >= 2 && n%10 <=4 && (n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || (n%10 >= 5 && n%10 <=9)) || (n%100 >= 11 && n%100 <= 14)) ? 2 : 3));\n"
@@ -79,12 +79,12 @@ msgstr "Отменить"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Действия"
@@ -135,16 +135,16 @@ msgstr "Нет"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "Заказ на сборку"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Коды проекта"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Заказ на закупку"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Заказ на продажу"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Заказ на возврат"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Удалить связанное изображение?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "Версия API"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Плагины"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "Редактировать"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Добавить"
@@ -2874,8 +2874,8 @@ msgstr "Пользовательские настройки"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Системные настройки"
@@ -2924,7 +2924,7 @@ msgstr "Выход"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Склад"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "Производство"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Закупки"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Вложения"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Категория"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Серийный номер"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Серийный номер"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Количество"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Партия"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Поставщик"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Загрузка..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr "Требования продаж"
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr "Детали добавлены в заказ на закупку"
msgid "Select supplier part"
msgstr "Выберите деталь поставщика"
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr "Скопировать номер детали поставщика"
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "Создать деталь поставщика"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr "Выберите заказ на закупку"
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "Создать заказ на закупку"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr "Добавить в выбранный заказ на закупку"
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "Не выбраны детали"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr "Не выбраны детали, которые можно закупить"
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "Детали добавлены"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "Все выбранные детали добавлены в заказ на закупку"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "Необходимо выбрать хотя бы одну деталь для закупки"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "Необходимо указать деталь поставщика"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "Необходимо указать количество"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "Неправильный выбор деталей"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "Исправьте ошибки в выбранных деталях"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr "Количество для завершения"
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr "Задать срок годности"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "Настройка упаковки"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Изменить статус"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "Введите код партии для полученных запасов"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Серийные номера"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr "Введите дату истечения срока годности полученных элементов"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr "Оставьте поле пустым, чтобы использова
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Ввести количество упаковок вместо количества отдельных элементов"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Введите начальное количество этой детали на складе"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Введите серийные номера для нового склада (или оставьте пустым)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Состояние складской позиции"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Создать складскую позицию"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "Выберите часть для установки"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "Подтвердить перемещение запаса"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Переместить в местоположение по умолчанию"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Переместить"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "Возврат"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Переместить"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "Возврат"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Количество"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Увеличить склад"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "Запас добавлен"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr "Увеличить количество выбранных складских позиций на указанную величину."
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Уменьшить склад"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "Запас удален"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr "Уменьшить количество выбранных складских позиций на указанную величину."
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Переместить склад"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "Запас перемещен"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr "Переместить выбранные позиции в указанное место хранения."
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr "Возврат запасов"
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr "Запасы возвращены"
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr "Вернуть выбранные позиции на склад, в указанное место хранения."
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Подсчёт склада"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "Запас посчитан"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr "Произвести инвентаризацию выбранных складских позиций и скорректировать количество соответствующим образом."
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Изменить статус запасов"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "Состояние запаса изменено"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr "Изменить статус выбранных складских позиций."
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Объединить склад"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "Запасы объединены"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr "Объединить складские позиции"
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr "Операция объединения не может быть отменена"
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr "При объединении позиций информация об отслеживании может быть потеряна"
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr "При объединении может быть потеряна информация о поставщиках"
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "Передать запас клиенту"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "Запас передан клиенту"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Удалить складскую позицию"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "Запас удален"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr "Эта операция необратимо удалит выбранные складские позиции."
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Расположение основного склада"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr "Поиск по серийному номеру"
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr "Нет подходящих элементов"
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr "Несколько подходящих элементов"
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr "Неверный ответ сервера"
@@ -7294,15 +7295,15 @@ msgstr "Цены"
msgid "Part Creation"
msgstr "Создание детали"
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr "Срок хранения"
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "Движение остатков"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/sk/messages.po b/src/frontend/src/locales/sk/messages.po
index 2124406073..5618159819 100644
--- a/src/frontend/src/locales/sk/messages.po
+++ b/src/frontend/src/locales/sk/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: sk\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Slovak\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 3;\n"
@@ -79,12 +79,12 @@ msgstr ""
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr ""
@@ -135,16 +135,16 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr ""
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr ""
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr ""
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr ""
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr ""
@@ -2874,8 +2874,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr ""
@@ -2924,7 +2924,7 @@ msgstr ""
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr ""
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr ""
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr ""
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr ""
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr ""
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr ""
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr ""
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr ""
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr ""
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr ""
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr ""
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr ""
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr ""
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr ""
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr ""
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr ""
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr ""
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr ""
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr ""
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/sl/messages.po b/src/frontend/src/locales/sl/messages.po
index 40b5dd66dd..56fbe913c6 100644
--- a/src/frontend/src/locales/sl/messages.po
+++ b/src/frontend/src/locales/sl/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: sl\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Slovenian\n"
"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;\n"
@@ -79,12 +79,12 @@ msgstr "Prekliči"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Dejanja"
@@ -135,16 +135,16 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr ""
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr ""
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr ""
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr ""
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr ""
@@ -2874,8 +2874,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr ""
@@ -2924,7 +2924,7 @@ msgstr ""
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr ""
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr ""
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr ""
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr ""
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr ""
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr ""
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr ""
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr ""
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr ""
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr ""
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr ""
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr ""
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr ""
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr ""
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr ""
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr ""
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr ""
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr ""
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr ""
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/sr/messages.po b/src/frontend/src/locales/sr/messages.po
index 13593bf877..6376a9aea9 100644
--- a/src/frontend/src/locales/sr/messages.po
+++ b/src/frontend/src/locales/sr/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: sr\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Serbian (Latin)\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
@@ -79,12 +79,12 @@ msgstr "Poništi"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Akcije"
@@ -135,16 +135,16 @@ msgstr "Ne"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "Nalog za izradu"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Kodovi projekta"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Narudžbenica"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Nalog za prodaju"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Nalog za povrat"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Ukloniti sliku sa ovog predmeta?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "API Verzija"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Ekstenzije"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Dodaj"
@@ -2874,8 +2874,8 @@ msgstr "Korisnička podešavanja"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Sistemska podešavanja"
@@ -2924,7 +2924,7 @@ msgstr "Odjavljivanje"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Zalihe"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "Proizvodnja"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Kupovina"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Prilozi"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Kategorija"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Serijski broj"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Serijski broj"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Količina"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Serija"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Dobavljač"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Učitavanje"
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr "Deo dodat u nalog za kupovinu"
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "Novi deo dobavljača"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "Novi nalog za kupovinu"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr "Dodaj u izabrani nalog za kupovinu"
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "Nema izabranih delova"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr "Nema izabranih delova koji se mogu kupiti"
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "Delovi dodati"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "Svi izabrani delovi su dodati nalogu za kupovinu"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "Morate izabrati bar jedan deo za naručivanje"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "Deo dobavljača je neophodan"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "Količina je neophodna"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "Nevažeći izbor dela"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "Molimo ispravite greške u izabranim delovima"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "Doradi pakovanje"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Promeni status"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "Unesi kod serije za primljene stavke"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Serijski brojevi"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Dodaj primljenu količinu kao pakovanje umesto kao individualnu stavku"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Unesi početnu količinu za ovu stavku zalihe"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Unesi serijske brojeve za novu zalihu (ili ostavi nepopunjeno)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Status zalihe"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Dodaj stavku zalihe"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "Izaberi deo za instalaciju"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "Potvrdi transfer zalihe"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Premesti na podrazumevanu lokaciju"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Premesti"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "Vrati"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Premesti"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "Vrati"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Računaj"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Dodaj zalihu"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "Zaliha dodata"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Ukloni zalihu"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "Zaliha uklonjena"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Prebaci zalihu"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "Zaliha prebačena"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Prebroj zalihe"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "Zaliha prebrojena"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Promeni status zalihe"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "Status zalihe izmenjen"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Spoji zalihe"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "Zalihe spojene"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "Dodeli zalihu mušteriji"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "Zaliha dodeljena mušteriji"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Izbriši stavku zalihe"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "Zaliha izbrisana"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Lokacija roditeljske zalihe"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr "Cene"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "Praćenje zaliha"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/sv/messages.po b/src/frontend/src/locales/sv/messages.po
index 232e43fe2c..b7025132bd 100644
--- a/src/frontend/src/locales/sv/messages.po
+++ b/src/frontend/src/locales/sv/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: sv\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Swedish\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr "Avbryt"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Åtgärder"
@@ -135,16 +135,16 @@ msgstr "Nej"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Projektkoder"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Inköpsorder"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Försäljningsorder"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Returorder"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Vill du ta bort den associerade bilden från denna artikel?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "API Version"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Plugins"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "Ändra"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Lägg till"
@@ -2874,8 +2874,8 @@ msgstr "Användarinställningar"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Systeminställningar"
@@ -2924,7 +2924,7 @@ msgstr "Logga ut"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Lagersaldo"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Inköp"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Bilagor"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Kategori"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Serienummer"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Serienummer"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Antal"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr ""
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Leverantör"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Laddar..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "Inga delar valda"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "Delar tillagda"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Ändra status"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Serienummer"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr ""
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr ""
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr ""
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr ""
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr ""
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Flytta"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Flytta"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr ""
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Sammanfoga lager"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Ta bort lagerartikel"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Överordnad lagerplats"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr "Prissättning"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/th/messages.po b/src/frontend/src/locales/th/messages.po
index 9780d66034..ae5d714516 100644
--- a/src/frontend/src/locales/th/messages.po
+++ b/src/frontend/src/locales/th/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: th\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Thai\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -79,12 +79,12 @@ msgstr ""
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr ""
@@ -135,16 +135,16 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr ""
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr ""
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr ""
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr ""
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr ""
@@ -2874,8 +2874,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr ""
@@ -2924,7 +2924,7 @@ msgstr ""
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr ""
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr ""
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr ""
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr ""
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr ""
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr ""
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr ""
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr ""
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr ""
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr ""
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr ""
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr ""
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr ""
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr ""
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr ""
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr ""
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr ""
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr ""
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr ""
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/tr/messages.po b/src/frontend/src/locales/tr/messages.po
index 2c5623022a..7a6d41feea 100644
--- a/src/frontend/src/locales/tr/messages.po
+++ b/src/frontend/src/locales/tr/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: tr\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Turkish\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,12 +79,12 @@ msgstr "Vazgeç"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Eylemler"
@@ -135,16 +135,16 @@ msgstr "Hayır"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "Üretim Emri"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Proje Kodları"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Satın Alma Siparişi"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Satış Siparişi"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "İade Emri"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr "Aktarım Emri"
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Bu ögeyle ilişkilendirilmiş görsel kaldırılsın mı?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "API Sürümü"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Eklentiler"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "Değiştir"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Ekle"
@@ -2874,8 +2874,8 @@ msgstr "Kullanıcı Ayarları"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Sistem Ayarları"
@@ -2924,7 +2924,7 @@ msgstr "Çıkış"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Stok"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "Üretim"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Satın Alma"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Ekler"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Kategori"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Seri Numarası"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Seri Numarası"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Miktar"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Parti"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Tedarikçi"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Yükleniyor..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr "Satış Gereksinimleri"
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr "Parça, satın alma siparişine eklendi"
msgid "Select supplier part"
msgstr "Tedarikçi parçası seç"
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr "Tedarikçi parça numarasını kopyala"
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "Yeni tedarikçi parçası"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr "Satın alma siparişi seç"
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "Yeni satın alma siparişi"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr "Seçili satın alma siparişine ekle"
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "Hiç parça seçilmedi"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr "Hiç satın alınabilir parça seçilmedi"
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "Parçalar Eklendi"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "Seçilen tüm parçalar bir satın alma siparişine eklendi"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "Sipariş etmek için en az bir parça seçilmelidir"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "Tedarikçi parçası gereklidir"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "Miktar gereklidir"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "Geçersiz parça seçimi"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "Lütfen seçilen parçalardaki hataları düzeltin"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr "Tamamlanacak Miktar"
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr "Son Kullanma Tarihi Belirle"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "Paketlemeyi Ayarla"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Durumu Değiştir"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "Teslim alınan ögeler için parti kodu gir"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Seri Numaraları"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr "Teslim alınan ögeler için bir geçerlilik tarihi gir"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr "Sipariş adresini kullanmak için boş bırakın"
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Verilen miktarı tekli ögeler yerine paketler olarak ekle"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Bu stok kalemi için başlangıç miktarını girin"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Yeni stok için seri numaralarını girin (veya boş bırakın)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Stok Durumu"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Stok Kalemi Ekle"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "Takılacak parçayı seç"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "Stok Transferini Onayla"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr "Stok İadesini Onayla"
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Varsayılan konuma taşı"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Taşı"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "Geri Dön"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr "Mevcut stokla birleştir"
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Taşı"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "Geri Dön"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr "Mümkünse iade edilen kalemleri mevcut stok kalemleri ile birleştir"
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr "Stok işlem notları"
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Say"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Stok Ekle"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "Stok Eklendi"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr "Seçilen stok kalemlerinin miktarını belirtilen miktarda artır."
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Stok Kaldır"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "Stok Kaldırıldı"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr "Seçilen stok kalemlerinin miktarını belirtilen miktarda azalt."
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Stoku Aktar"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "Stok Transfer Edildi"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr "Seçilen kalemleri belirtilen konuma aktar."
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr "Stock İade Et"
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr "Stok iade edildi"
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr "Seçilen kalemleri belirtilen konumdaki stoka iade et."
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Stoku Say"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "Stok Sayıldı"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr "Seçilen stok kalemlerini say ve miktarı ona göre ayarla."
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Stok Durumunu Değiştir"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "Stok Durumu Değişti"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr "Seçilen stok kalemlerinin durumunu değiştir."
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr "Parti Kodunu Değiştir"
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr "Seçilen stok kalemlerinin parti kodunu değiştir"
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Stoku Birleştir"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "Stok Birleştirildi"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr "Stok Kalemlerini Birleştir"
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr "Birleştirme işlemi geri alınamaz"
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr "Kalemleri birleştirirken takip bilgileri kaybolabilir"
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr "Kalemleri birleştirirken tedarikçi bilgileri kaybolabilir"
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "Stoku Müşteriye Ata"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "Stok Müşteriye Atandı"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Stok Kalemlerini Sil"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "Stok Silindi"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr "Bu işlem seçilen stok kalemlerini kalıcı olarak silecektir."
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Üst stok konumu"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr "Seri Numarası Bul"
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr "Eşleşen ürün bulunamadı"
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr "Birden fazla eşleşen öge"
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr "Sunucudan geçersiz yanıt"
@@ -7294,15 +7295,15 @@ msgstr "Fiyatlandırma"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "Stok İzleme"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/uk/messages.po b/src/frontend/src/locales/uk/messages.po
index c04d82a4a1..f94f35a495 100644
--- a/src/frontend/src/locales/uk/messages.po
+++ b/src/frontend/src/locales/uk/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: uk\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Ukrainian\n"
"Plural-Forms: nplurals=4; plural=((n%10==1 && n%100!=11) ? 0 : ((n%10 >= 2 && n%10 <=4 && (n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || (n%10 >= 5 && n%10 <=9)) || (n%100 >= 11 && n%100 <= 14)) ? 2 : 3));\n"
@@ -79,12 +79,12 @@ msgstr "Скасувати"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Дії"
@@ -135,16 +135,16 @@ msgstr "Ні"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Коди проєкту"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Замовлення на купівлю"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Замовлення на купівлю"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Видалити пов'язане зображення з цього елемента?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "Версія API"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Плагіни"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Додати"
@@ -2874,8 +2874,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Налаштування системи"
@@ -2924,7 +2924,7 @@ msgstr "Вихід"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "В наявності"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "Виробництво"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Вкладення"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Категорія"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Серійний номер"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Серійний номер"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Кількість"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "Пакетно"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Постачальник"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Завантаження..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "Деталі додано"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "Усі вибрані частини додані до Замовлення на купівлю"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "Ви повинні вибрати принаймні один елемент для замовлення"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr ""
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "Введіть Номер серії збірки для отриманих елементів"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr ""
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr ""
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr ""
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr ""
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Стан залишків"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Додати елемент складу"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Перемістити в типове розташування"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Перемістити"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Перемістити"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Кількість"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Додати запаси"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "Додано елемент складу"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Видалити елемент складу"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "Видалено елемент складу"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Переміщення запасів"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Кількість запасів"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr ""
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr ""
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr ""
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr ""
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/vi/messages.po b/src/frontend/src/locales/vi/messages.po
index 4799c182d9..36732973bf 100644
--- a/src/frontend/src/locales/vi/messages.po
+++ b/src/frontend/src/locales/vi/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: vi\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Vietnamese\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -79,12 +79,12 @@ msgstr "Hủy bỏ"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "Chức năng"
@@ -135,16 +135,16 @@ msgstr "Không"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "Xây dựng đơn hàng"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "Mã dự án"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "Đơn đặt mua"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "Đơn đặt bán"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "Đơn hàng trả lại"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "Xóa hình liên quan khỏi mục này?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "Phiên bản API"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "Plugins"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr ""
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "Thêm"
@@ -2874,8 +2874,8 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "Thiết lập hệ thống"
@@ -2924,7 +2924,7 @@ msgstr "Đăng xuất"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "Kho hàng"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr ""
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "Mua sắm"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "Đính kèm"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "Danh mục"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "Số sê-ri"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "Số sê-ri"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "Số lượng"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr ""
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "Nhà cung cấp"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "Đang tải..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr ""
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr ""
msgid "Select supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr ""
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr ""
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "Điều chỉnh bao bì"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "Thay đổi trạng thái"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "Số sê-ri"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr ""
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr ""
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "Thêm số lượng đã có theo gói thay vì các mục đơn lẻ"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "Nhập số lượng khởi đầu cho kho hàng này"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "Điền số sê-ri cho kho mới (hoặc để trống)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "Trạng thái kho"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "Thêm mặt hàng trong kho"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr ""
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr ""
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "Đến vị trí mặc định"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "Di chuyển"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr ""
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "Di chuyển"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr ""
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "Đếm"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "Thêm kho"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr ""
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "Xoá kho"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr ""
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr ""
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "Chuyển kho"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr ""
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr ""
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr ""
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr ""
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "Kiểm kê"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr ""
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr ""
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "Đổi trạng thái kho"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr ""
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr ""
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr ""
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "Gộp kho"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr ""
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr ""
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr ""
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr ""
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr ""
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr ""
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "Xóa mặt hàng trong kho"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr ""
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr ""
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "Vị trí kho lớn"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr ""
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr ""
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr ""
@@ -7294,15 +7295,15 @@ msgstr "Giá bán"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "Theo dõi tồn kho"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/locales/zh_Hans/messages.po b/src/frontend/src/locales/zh_Hans/messages.po
index 50ff343b1d..635cfbd5f5 100644
--- a/src/frontend/src/locales/zh_Hans/messages.po
+++ b/src/frontend/src/locales/zh_Hans/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: zh\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -79,12 +79,12 @@ msgstr "取消"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "操作"
@@ -135,16 +135,16 @@ msgstr "否"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "生产订单"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "项目编码"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "采购订单"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "销售订单"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "退货订单"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "删除与此项关联的图片?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "API 版本"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "插件"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "更改"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "添加"
@@ -2874,8 +2874,8 @@ msgstr "用户设置"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "系统设置"
@@ -2924,7 +2924,7 @@ msgstr "登出"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "库存"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "生产"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "采购"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "附件"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "类别"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "序列号"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "序列号"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "数量"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "批次"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "供应商"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "正在加载..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr "销售需求"
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr "零件已添加到采购订单中"
msgid "Select supplier part"
msgstr "选择供应商零件"
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr "复制供应商零件编号"
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "新增供应商零件"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr "选择采购订单"
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "新建采购订单"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr "添加到已选的采购订单中"
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "没有选定零件"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr "未选择可购买的零件"
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "零件已添加"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "所有选中的零件添加到采购订单中"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "您必须至少选择一个零件才能下单"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "供应商零件为必填项"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "数量为必填项"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "无效的零件选择"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "请修正所选零件中的错误"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr "待完成数量"
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr "设置到期日期"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "调整封包"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "更改状态"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "输入接收项目的批号"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "序列号"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr "输入接收项目的到期日期"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr "留空则使用订单地址"
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "将给定的数量添加为包,而不是单个项目"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "输入此库存项的初始数量"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "输入新库存的序列号(或留空)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "库存状态"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "编辑库存项"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "选择要安装的零件"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "确认库存转移"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "移动到默认位置"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "移动"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "退货"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "移动"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "退货"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "总计"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "添加库存"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "库存已添加"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr "按指定数量增加选定库存物料的存量。"
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "移除库存"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "库存已移除"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr "按指定数量减少选定库存物料的存量。"
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "转移库存"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "库存已转移"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr "将选定物料转移至指定位置。"
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr "退回库存"
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr "库存已退回"
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr "将选定物料退回库存至指定位置。"
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "库存数量"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "库存计数"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr "统计选定库存物料数量并按需调整。"
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "更改库存状态"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "库存状态已改变"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr "变更选定库存物料的状态。"
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr "修改批号"
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr "变更选定库存物料的批号"
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "合并库存"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "库存已合并"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr "合并库存物料"
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr "合并操作不可逆"
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr "合并操作可能导致追溯信息丢失"
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr "合并操作可能导致供应商信息丢失"
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "将库存分配给客户"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "库存已分配给客户"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "删除库存项"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "库存已删除"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr "此操作将永久删除选定的库存物料。"
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "上级库存地点"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr "查找序列号"
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr "未找到匹配项"
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr "存在多个匹配项"
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr "服务器返回无效响应"
@@ -7294,15 +7295,15 @@ msgstr "定价"
msgid "Part Creation"
msgstr "零件创建"
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr "库存到期"
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr "零件盘点"
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "库存跟踪"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr "外部生产订单"
diff --git a/src/frontend/src/locales/zh_Hant/messages.po b/src/frontend/src/locales/zh_Hant/messages.po
index 1eaca693fa..1e69c1fbd5 100644
--- a/src/frontend/src/locales/zh_Hant/messages.po
+++ b/src/frontend/src/locales/zh_Hant/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Language: zh\n"
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-06-20 13:53\n"
+"PO-Revision-Date: 2026-06-24 14:28\n"
"Last-Translator: \n"
"Language-Team: Chinese Traditional\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -79,12 +79,12 @@ msgstr "取消"
#: lib/components/RowActions.tsx:136
#: src/components/nav/NavigationDrawer.tsx:190
#: src/forms/PurchaseOrderForms.tsx:919
-#: src/forms/StockForms.tsx:843
-#: src/forms/StockForms.tsx:891
-#: src/forms/StockForms.tsx:957
-#: src/forms/StockForms.tsx:1003
-#: src/forms/StockForms.tsx:1044
-#: src/forms/StockForms.tsx:1160
+#: src/forms/StockForms.tsx:870
+#: src/forms/StockForms.tsx:918
+#: src/forms/StockForms.tsx:984
+#: src/forms/StockForms.tsx:1030
+#: src/forms/StockForms.tsx:1071
+#: src/forms/StockForms.tsx:1187
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:976
msgid "Actions"
msgstr "操作"
@@ -135,16 +135,16 @@ msgstr "否"
#: src/forms/PurchaseOrderForms.tsx:915
#: src/forms/ReturnOrderForms.tsx:246
#: src/forms/SalesOrderForms.tsx:436
-#: src/forms/StockForms.tsx:370
-#: src/forms/StockForms.tsx:838
-#: src/forms/StockForms.tsx:886
-#: src/forms/StockForms.tsx:952
-#: src/forms/StockForms.tsx:998
-#: src/forms/StockForms.tsx:1039
-#: src/forms/StockForms.tsx:1088
-#: src/forms/StockForms.tsx:1156
-#: src/forms/StockForms.tsx:1204
-#: src/forms/StockForms.tsx:1248
+#: src/forms/StockForms.tsx:378
+#: src/forms/StockForms.tsx:865
+#: src/forms/StockForms.tsx:913
+#: src/forms/StockForms.tsx:979
+#: src/forms/StockForms.tsx:1025
+#: src/forms/StockForms.tsx:1066
+#: src/forms/StockForms.tsx:1115
+#: src/forms/StockForms.tsx:1183
+#: src/forms/StockForms.tsx:1231
+#: src/forms/StockForms.tsx:1275
#: src/forms/TransferOrderForms.tsx:234
#: src/pages/build/BuildDetail.tsx:260
#: src/pages/part/PartDetail.tsx:1166
@@ -328,7 +328,7 @@ msgstr "生產訂單"
#: lib/enums/ModelInformation.tsx:122
#: lib/enums/Roles.tsx:35
#: src/defaults/actions.tsx:184
-#: src/pages/Index/Settings/SystemSettings.tsx:315
+#: src/pages/Index/Settings/SystemSettings.tsx:316
#: src/pages/build/BuildIndex.tsx:87
#: src/pages/part/PartDetail.tsx:780
#: src/pages/sales/SalesOrderDetail.tsx:437
@@ -386,7 +386,7 @@ msgid "Project Codes"
msgstr "項目編碼"
#: lib/enums/ModelInformation.tsx:160
-#: src/components/wizards/OrderPartsWizard.tsx:341
+#: src/components/wizards/OrderPartsWizard.tsx:346
#: src/pages/part/pricing/PurchaseHistoryPanel.tsx:33
#: src/pages/purchasing/PurchaseOrderDetail.tsx:577
#: src/pages/stock/StockDetail.tsx:363
@@ -399,7 +399,7 @@ msgstr "採購訂單"
#: lib/enums/ModelInformation.tsx:161
#: lib/enums/Roles.tsx:41
#: src/defaults/actions.tsx:133
-#: src/pages/Index/Settings/SystemSettings.tsx:342
+#: src/pages/Index/Settings/SystemSettings.tsx:343
#: src/pages/company/CompanyDetail.tsx:210
#: src/pages/company/SupplierPartDetail.tsx:274
#: src/pages/part/PartDetail.tsx:751
@@ -432,7 +432,7 @@ msgstr "銷售訂單"
#: lib/enums/ModelInformation.tsx:177
#: lib/enums/Roles.tsx:47
#: src/defaults/actions.tsx:143
-#: src/pages/Index/Settings/SystemSettings.tsx:360
+#: src/pages/Index/Settings/SystemSettings.tsx:361
#: src/pages/company/CompanyDetail.tsx:230
#: src/pages/part/PartDetail.tsx:763
#: src/pages/sales/SalesIndex.tsx:107
@@ -457,7 +457,7 @@ msgstr "退貨訂單"
#: lib/enums/ModelInformation.tsx:197
#: lib/enums/Roles.tsx:43
#: src/defaults/actions.tsx:165
-#: src/pages/Index/Settings/SystemSettings.tsx:372
+#: src/pages/Index/Settings/SystemSettings.tsx:373
#: src/pages/company/CompanyDetail.tsx:237
#: src/pages/part/PartDetail.tsx:770
#: src/pages/sales/SalesIndex.tsx:147
@@ -482,7 +482,7 @@ msgstr ""
#: lib/enums/ModelInformation.tsx:213
#: lib/enums/Roles.tsx:45
#: src/defaults/actions.tsx:154
-#: src/pages/Index/Settings/SystemSettings.tsx:385
+#: src/pages/Index/Settings/SystemSettings.tsx:386
#: src/pages/part/PartDetail.tsx:787
#: src/pages/stock/LocationDetail.tsx:249
msgid "Transfer Orders"
@@ -1477,7 +1477,7 @@ msgid "Remove the associated image from this item?"
msgstr "刪除與此項關聯的圖片?"
#: src/components/details/DetailsImage.tsx:82
-#: src/forms/StockForms.tsx:956
+#: src/forms/StockForms.tsx:983
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:326
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:417
#: src/pages/Index/Settings/AccountSettings/MFASettings.tsx:898
@@ -2076,7 +2076,7 @@ msgstr "API 版本"
#: src/defaults/actions.tsx:232
#: src/pages/Index/Settings/AdminCenter/Index.tsx:233
#: src/pages/Index/Settings/AdminCenter/PluginManagementPanel.tsx:58
-#: src/pages/Index/Settings/SystemSettings.tsx:399
+#: src/pages/Index/Settings/SystemSettings.tsx:400
msgid "Plugins"
msgstr "插件"
@@ -2519,7 +2519,7 @@ msgid "Change"
msgstr "變更"
#: src/components/items/RoleTable.tsx:150
-#: src/forms/StockForms.tsx:1002
+#: src/forms/StockForms.tsx:1029
#: src/tables/stock/StockItemTestResultTable.tsx:369
msgid "Add"
msgstr "添加"
@@ -2874,8 +2874,8 @@ msgstr "使用者設定"
#: src/components/nav/NavigationDrawer.tsx:146
#: src/components/nav/SettingsHeader.tsx:41
#: src/defaults/actions.tsx:193
-#: src/pages/Index/Settings/SystemSettings.tsx:418
-#: src/pages/Index/Settings/SystemSettings.tsx:423
+#: src/pages/Index/Settings/SystemSettings.tsx:419
+#: src/pages/Index/Settings/SystemSettings.tsx:424
msgid "System Settings"
msgstr "系統設置"
@@ -2924,7 +2924,7 @@ msgstr "登出"
#: src/components/render/Part.tsx:36
#: src/components/wizards/ImportPartWizard.tsx:808
#: src/defaults/links.tsx:47
-#: src/forms/StockForms.tsx:841
+#: src/forms/StockForms.tsx:868
#: src/pages/Index/Settings/SystemSettings.tsx:260
#: src/pages/part/PartDetail.tsx:663
#: src/pages/stock/LocationDetail.tsx:481
@@ -2937,7 +2937,7 @@ msgstr "庫存"
#: src/components/nav/NavigationDrawer.tsx:84
#: src/defaults/links.tsx:57
-#: src/pages/Index/Settings/SystemSettings.tsx:310
+#: src/pages/Index/Settings/SystemSettings.tsx:311
#: src/pages/build/BuildDetail.tsx:816
#: src/pages/build/BuildIndex.tsx:121
msgid "Manufacturing"
@@ -2945,7 +2945,7 @@ msgstr "製造"
#: src/components/nav/NavigationDrawer.tsx:91
#: src/defaults/links.tsx:63
-#: src/pages/Index/Settings/SystemSettings.tsx:338
+#: src/pages/Index/Settings/SystemSettings.tsx:339
#: src/pages/company/ManufacturerDetail.tsx:9
#: src/pages/company/ManufacturerPartDetail.tsx:274
#: src/pages/company/SupplierDetail.tsx:9
@@ -2957,7 +2957,7 @@ msgstr "採購中"
#: src/components/nav/NavigationDrawer.tsx:98
#: src/defaults/links.tsx:69
-#: src/pages/Index/Settings/SystemSettings.tsx:355
+#: src/pages/Index/Settings/SystemSettings.tsx:356
#: src/pages/company/CustomerDetail.tsx:9
#: src/pages/sales/ReturnOrderDetail.tsx:575
#: src/pages/sales/SalesIndex.tsx:211
@@ -3093,7 +3093,7 @@ msgid "Attachments"
msgstr "附件"
#: src/components/panels/NotesPanel.tsx:27
-#: src/forms/StockForms.tsx:911
+#: src/forms/StockForms.tsx:938
#: src/tables/part/PartTestResultTable.tsx:214
#: src/tables/stock/StockTrackingTable.tsx:279
msgid "Notes"
@@ -3389,15 +3389,15 @@ msgstr "類別"
#: src/components/render/Stock.tsx:132
#: src/forms/BuildForms.tsx:849
#: src/forms/PurchaseOrderForms.tsx:709
-#: src/forms/StockForms.tsx:839
-#: src/forms/StockForms.tsx:887
-#: src/forms/StockForms.tsx:953
-#: src/forms/StockForms.tsx:999
-#: src/forms/StockForms.tsx:1040
-#: src/forms/StockForms.tsx:1089
-#: src/forms/StockForms.tsx:1157
-#: src/forms/StockForms.tsx:1205
-#: src/forms/StockForms.tsx:1249
+#: src/forms/StockForms.tsx:866
+#: src/forms/StockForms.tsx:914
+#: src/forms/StockForms.tsx:980
+#: src/forms/StockForms.tsx:1026
+#: src/forms/StockForms.tsx:1067
+#: src/forms/StockForms.tsx:1116
+#: src/forms/StockForms.tsx:1184
+#: src/forms/StockForms.tsx:1232
+#: src/forms/StockForms.tsx:1276
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:88
#: src/pages/core/UserDetail.tsx:158
#: src/pages/stock/StockDetail.tsx:309
@@ -3418,7 +3418,7 @@ msgid "Serial Number"
msgstr "序列號"
#: src/components/render/Stock.tsx:104
-#: src/components/wizards/OrderPartsWizard.tsx:380
+#: src/components/wizards/OrderPartsWizard.tsx:385
#: src/forms/BomForms.tsx:42
#: src/forms/BuildForms.tsx:266
#: src/forms/BuildForms.tsx:687
@@ -3426,7 +3426,7 @@ msgstr "序列號"
#: src/forms/PurchaseOrderForms.tsx:918
#: src/forms/ReturnOrderForms.tsx:247
#: src/forms/SalesOrderForms.tsx:439
-#: src/forms/StockForms.tsx:889
+#: src/forms/StockForms.tsx:916
#: src/forms/TransferOrderForms.tsx:237
#: src/pages/build/BuildIndex.tsx:47
#: src/pages/part/PartStockHistoryDetail.tsx:61
@@ -3453,15 +3453,15 @@ msgstr "數量"
#: src/forms/BuildForms.tsx:371
#: src/forms/BuildForms.tsx:453
#: src/forms/BuildForms.tsx:527
-#: src/forms/StockForms.tsx:840
-#: src/forms/StockForms.tsx:888
-#: src/forms/StockForms.tsx:954
-#: src/forms/StockForms.tsx:1000
-#: src/forms/StockForms.tsx:1041
-#: src/forms/StockForms.tsx:1090
-#: src/forms/StockForms.tsx:1158
-#: src/forms/StockForms.tsx:1206
-#: src/forms/StockForms.tsx:1250
+#: src/forms/StockForms.tsx:867
+#: src/forms/StockForms.tsx:915
+#: src/forms/StockForms.tsx:981
+#: src/forms/StockForms.tsx:1027
+#: src/forms/StockForms.tsx:1068
+#: src/forms/StockForms.tsx:1117
+#: src/forms/StockForms.tsx:1185
+#: src/forms/StockForms.tsx:1233
+#: src/forms/StockForms.tsx:1277
#: src/tables/build/BuildLineTable.tsx:95
msgid "Batch"
msgstr "批次"
@@ -3983,7 +3983,7 @@ msgid "Supplier"
msgstr "供應商"
#: src/components/wizards/ImportPartWizard.tsx:221
-#: src/forms/StockForms.tsx:645
+#: src/forms/StockForms.tsx:655
msgid "Loading..."
msgstr "正在加載..."
@@ -4129,13 +4129,13 @@ msgid "Sales Requirements"
msgstr "銷售需求"
#: src/components/wizards/OrderPartsWizard.tsx:129
-#: src/forms/StockForms.tsx:955
-#: src/forms/StockForms.tsx:1001
-#: src/forms/StockForms.tsx:1042
-#: src/forms/StockForms.tsx:1091
-#: src/forms/StockForms.tsx:1159
-#: src/forms/StockForms.tsx:1207
-#: src/forms/StockForms.tsx:1251
+#: src/forms/StockForms.tsx:982
+#: src/forms/StockForms.tsx:1028
+#: src/forms/StockForms.tsx:1069
+#: src/forms/StockForms.tsx:1118
+#: src/forms/StockForms.tsx:1186
+#: src/forms/StockForms.tsx:1234
+#: src/forms/StockForms.tsx:1278
#: src/pages/company/SupplierPartDetail.tsx:195
#: src/pages/company/SupplierPartDetail.tsx:392
#: src/pages/part/PartDetail.tsx:395
@@ -4180,64 +4180,64 @@ msgstr "零件已新增至採購訂單"
msgid "Select supplier part"
msgstr "選擇供應商零件"
-#: src/components/wizards/OrderPartsWizard.tsx:326
+#: src/components/wizards/OrderPartsWizard.tsx:331
msgid "Copy supplier part number"
msgstr "複製供應商零件號碼"
-#: src/components/wizards/OrderPartsWizard.tsx:329
+#: src/components/wizards/OrderPartsWizard.tsx:334
msgid "New supplier part"
msgstr "新增供應商零件"
-#: src/components/wizards/OrderPartsWizard.tsx:353
+#: src/components/wizards/OrderPartsWizard.tsx:358
msgid "Select purchase order"
msgstr "選擇採購訂單"
-#: src/components/wizards/OrderPartsWizard.tsx:367
+#: src/components/wizards/OrderPartsWizard.tsx:372
msgid "New purchase order"
msgstr "新增採購訂單"
-#: src/components/wizards/OrderPartsWizard.tsx:423
+#: src/components/wizards/OrderPartsWizard.tsx:428
msgid "Add to selected purchase order"
msgstr "新增至選定的採購訂單"
-#: src/components/wizards/OrderPartsWizard.tsx:440
-#: src/components/wizards/OrderPartsWizard.tsx:578
+#: src/components/wizards/OrderPartsWizard.tsx:445
+#: src/components/wizards/OrderPartsWizard.tsx:583
msgid "No parts selected"
msgstr "未選擇任何零件"
-#: src/components/wizards/OrderPartsWizard.tsx:441
+#: src/components/wizards/OrderPartsWizard.tsx:446
msgid "No purchaseable parts selected"
msgstr "未選擇可採購的零件"
-#: src/components/wizards/OrderPartsWizard.tsx:477
+#: src/components/wizards/OrderPartsWizard.tsx:482
msgid "Parts Added"
msgstr "已新增零件"
-#: src/components/wizards/OrderPartsWizard.tsx:478
+#: src/components/wizards/OrderPartsWizard.tsx:483
msgid "All selected parts added to a purchase order"
msgstr "所有選定的零件已新增至採購訂單"
-#: src/components/wizards/OrderPartsWizard.tsx:579
+#: src/components/wizards/OrderPartsWizard.tsx:584
msgid "You must select at least one part to order"
msgstr "您必須至少選擇一個零件進行訂購"
-#: src/components/wizards/OrderPartsWizard.tsx:590
+#: src/components/wizards/OrderPartsWizard.tsx:595
msgid "Supplier part is required"
msgstr "供應商零件為必填項目"
-#: src/components/wizards/OrderPartsWizard.tsx:594
+#: src/components/wizards/OrderPartsWizard.tsx:599
msgid "Quantity is required"
msgstr "數量為必填項目"
-#: src/components/wizards/OrderPartsWizard.tsx:607
+#: src/components/wizards/OrderPartsWizard.tsx:612
msgid "Invalid part selection"
msgstr "無效的零件選擇"
-#: src/components/wizards/OrderPartsWizard.tsx:609
+#: src/components/wizards/OrderPartsWizard.tsx:614
msgid "Please correct the errors in the selected parts"
msgstr "請修正選定零件中的錯誤"
-#: src/components/wizards/OrderPartsWizard.tsx:620
+#: src/components/wizards/OrderPartsWizard.tsx:625
#: src/tables/build/BuildLineTable.tsx:885
#: src/tables/part/PartTable.tsx:417
#: src/tables/sales/SalesOrderLineItemTable.tsx:417
@@ -4821,7 +4821,7 @@ msgstr "要完成的數量"
#: src/forms/PurchaseOrderForms.tsx:834
#: src/forms/ReturnOrderForms.tsx:201
#: src/forms/ReturnOrderForms.tsx:248
-#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:780
#: src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx:87
#: src/pages/build/BuildDetail.tsx:282
#: src/pages/core/UserDetail.tsx:151
@@ -5104,12 +5104,12 @@ msgid "Set Expiry Date"
msgstr "設定到期日"
#: src/forms/PurchaseOrderForms.tsx:641
-#: src/forms/StockForms.tsx:740
+#: src/forms/StockForms.tsx:750
msgid "Adjust Packaging"
msgstr "調整封包"
#: src/forms/PurchaseOrderForms.tsx:650
-#: src/forms/StockForms.tsx:731
+#: src/forms/StockForms.tsx:741
#: src/hooks/UseStockAdjustActions.tsx:152
msgid "Change Status"
msgstr "更改狀態"
@@ -5153,7 +5153,7 @@ msgid "Enter batch code for received items"
msgstr "輸入收貨項目的批次代碼"
#: src/forms/PurchaseOrderForms.tsx:789
-#: src/forms/StockForms.tsx:224
+#: src/forms/StockForms.tsx:232
msgid "Serial Numbers"
msgstr "序列號"
@@ -5172,7 +5172,7 @@ msgid "Enter an expiry date for received items"
msgstr "輸入收貨項目的到期日"
#: src/forms/PurchaseOrderForms.tsx:820
-#: src/forms/StockForms.tsx:775
+#: src/forms/StockForms.tsx:796
#: src/pages/company/SupplierPartDetail.tsx:177
#: src/pages/company/SupplierPartDetail.tsx:244
#: src/pages/stock/StockDetail.tsx:430
@@ -5274,218 +5274,219 @@ msgstr "留空以使用訂單地址"
#~ msgid "Stock item updated"
#~ msgstr "Stock item updated"
-#: src/forms/StockForms.tsx:202
+#: src/forms/StockForms.tsx:210
msgid "Add given quantity as packs instead of individual items"
msgstr "將給定的數量添加為包,而不是單個項目"
-#: src/forms/StockForms.tsx:216
+#: src/forms/StockForms.tsx:224
msgid "Enter initial quantity for this stock item"
msgstr "輸入此庫存項的初始數量"
-#: src/forms/StockForms.tsx:226
+#: src/forms/StockForms.tsx:234
msgid "Enter serial numbers for new stock (or leave blank)"
msgstr "輸入新庫存的序列號(或留空)"
-#: src/forms/StockForms.tsx:247
+#: src/forms/StockForms.tsx:255
msgid "Stock Status"
msgstr "庫存狀態"
-#: src/forms/StockForms.tsx:326
+#: src/forms/StockForms.tsx:334
#: src/pages/stock/StockDetail.tsx:754
#: src/tables/stock/StockItemTable.tsx:426
#: src/tables/stock/StockItemTable.tsx:475
msgid "Add Stock Item"
msgstr "編輯庫存項"
-#: src/forms/StockForms.tsx:371
+#: src/forms/StockForms.tsx:379
msgid "Select the part to install"
msgstr "選擇要安裝的零件"
-#: src/forms/StockForms.tsx:506
+#: src/forms/StockForms.tsx:514
msgid "Confirm Stock Transfer"
msgstr "確認庫存轉移"
-#: src/forms/StockForms.tsx:707
+#: src/forms/StockForms.tsx:717
msgid "Confirm Stock Return"
msgstr ""
-#: src/forms/StockForms.tsx:719
+#: src/forms/StockForms.tsx:729
msgid "Move to default location"
msgstr "移動到默認位置"
-#: src/forms/StockForms.tsx:842
-msgid "Move"
-msgstr "移動"
-
-#: src/forms/StockForms.tsx:890
-msgid "Return"
-msgstr "退貨"
-
-#: src/forms/StockForms.tsx:905
+#: src/forms/StockForms.tsx:759
+#: src/forms/StockForms.tsx:932
msgid "Merge into existing stock"
msgstr ""
-#: src/forms/StockForms.tsx:906
+#: src/forms/StockForms.tsx:869
+msgid "Move"
+msgstr "移動"
+
+#: src/forms/StockForms.tsx:917
+msgid "Return"
+msgstr "退貨"
+
+#: src/forms/StockForms.tsx:933
msgid "Merge returned items into existing stock items if possible"
msgstr ""
-#: src/forms/StockForms.tsx:912
+#: src/forms/StockForms.tsx:939
msgid "Stock transaction notes"
msgstr ""
-#: src/forms/StockForms.tsx:1043
+#: src/forms/StockForms.tsx:1070
#: src/pages/Index/Scan.tsx:180
msgid "Count"
msgstr "總計"
-#: src/forms/StockForms.tsx:1356
+#: src/forms/StockForms.tsx:1383
#: src/hooks/UseStockAdjustActions.tsx:112
msgid "Add Stock"
msgstr "添加庫存"
-#: src/forms/StockForms.tsx:1357
+#: src/forms/StockForms.tsx:1384
msgid "Stock added"
msgstr "庫存已新增"
-#: src/forms/StockForms.tsx:1360
+#: src/forms/StockForms.tsx:1387
msgid "Increase the quantity of the selected stock items by a given amount."
msgstr "增加選定庫存項目的數量。"
-#: src/forms/StockForms.tsx:1371
+#: src/forms/StockForms.tsx:1398
#: src/hooks/UseStockAdjustActions.tsx:122
msgid "Remove Stock"
msgstr "移除庫存"
-#: src/forms/StockForms.tsx:1372
+#: src/forms/StockForms.tsx:1399
msgid "Stock removed"
msgstr "庫存已移除"
-#: src/forms/StockForms.tsx:1375
+#: src/forms/StockForms.tsx:1402
msgid "Decrease the quantity of the selected stock items by a given amount."
msgstr "減少選定庫存項目的數量。"
-#: src/forms/StockForms.tsx:1386
+#: src/forms/StockForms.tsx:1424
#: src/hooks/UseStockAdjustActions.tsx:132
msgid "Transfer Stock"
msgstr "轉移庫存"
-#: src/forms/StockForms.tsx:1387
+#: src/forms/StockForms.tsx:1425
msgid "Stock transferred"
msgstr "庫存已轉移"
-#: src/forms/StockForms.tsx:1390
+#: src/forms/StockForms.tsx:1428
msgid "Transfer selected items to the specified location."
msgstr "將選定項目轉移到指定位置。"
-#: src/forms/StockForms.tsx:1401
+#: src/forms/StockForms.tsx:1439
#: src/hooks/UseStockAdjustActions.tsx:182
msgid "Return Stock"
msgstr "退回庫存"
-#: src/forms/StockForms.tsx:1402
+#: src/forms/StockForms.tsx:1440
msgid "Stock returned"
msgstr "庫存已退回"
-#: src/forms/StockForms.tsx:1405
+#: src/forms/StockForms.tsx:1443
msgid "Return selected items into stock, to the specified location."
msgstr "將選定項目退回庫存,至指定位置。"
-#: src/forms/StockForms.tsx:1416
+#: src/forms/StockForms.tsx:1454
#: src/hooks/UseStockAdjustActions.tsx:102
msgid "Count Stock"
msgstr "庫存數量"
-#: src/forms/StockForms.tsx:1417
+#: src/forms/StockForms.tsx:1455
msgid "Stock counted"
msgstr "庫存已盤點"
-#: src/forms/StockForms.tsx:1420
+#: src/forms/StockForms.tsx:1458
msgid "Count the selected stock items, and adjust the quantity accordingly."
msgstr "盤點選定的庫存項目,並相應地調整數量。"
-#: src/forms/StockForms.tsx:1431
+#: src/forms/StockForms.tsx:1469
msgid "Change Stock Status"
msgstr "更改庫存狀態"
-#: src/forms/StockForms.tsx:1432
+#: src/forms/StockForms.tsx:1470
msgid "Stock status changed"
msgstr "庫存狀態已變更"
-#: src/forms/StockForms.tsx:1435
+#: src/forms/StockForms.tsx:1473
msgid "Change the status of the selected stock items."
msgstr "變更選定庫存項目的狀態。"
-#: src/forms/StockForms.tsx:1458
+#: src/forms/StockForms.tsx:1496
#: src/hooks/UseStockAdjustActions.tsx:162
msgid "Change Batch Code"
msgstr "變更批次代碼"
-#: src/forms/StockForms.tsx:1461
+#: src/forms/StockForms.tsx:1499
msgid "Change batch code for the selected stock items"
msgstr "變更選定庫存項目的批次代碼"
-#: src/forms/StockForms.tsx:1478
+#: src/forms/StockForms.tsx:1516
#: src/hooks/UseStockAdjustActions.tsx:142
msgid "Merge Stock"
msgstr "合併庫存"
-#: src/forms/StockForms.tsx:1479
+#: src/forms/StockForms.tsx:1517
msgid "Stock merged"
msgstr "庫存已合併"
-#: src/forms/StockForms.tsx:1481
+#: src/forms/StockForms.tsx:1519
msgid "Merge Stock Items"
msgstr "合併庫存項目"
-#: src/forms/StockForms.tsx:1483
+#: src/forms/StockForms.tsx:1521
msgid "Merge operation cannot be reversed"
msgstr "合併操作無法還原"
-#: src/forms/StockForms.tsx:1484
+#: src/forms/StockForms.tsx:1522
msgid "Tracking information may be lost when merging items"
msgstr "合併項目時可能會遺失追蹤資訊"
-#: src/forms/StockForms.tsx:1485
+#: src/forms/StockForms.tsx:1523
msgid "Supplier information may be lost when merging items"
msgstr "合併項目時可能會遺失供應商資訊"
-#: src/forms/StockForms.tsx:1503
+#: src/forms/StockForms.tsx:1541
msgid "Assign Stock to Customer"
msgstr "將庫存分配給客戶"
-#: src/forms/StockForms.tsx:1504
+#: src/forms/StockForms.tsx:1542
msgid "Stock assigned to customer"
msgstr "庫存已分配給客戶"
-#: src/forms/StockForms.tsx:1514
+#: src/forms/StockForms.tsx:1552
msgid "Delete Stock Items"
msgstr "刪除庫存項"
-#: src/forms/StockForms.tsx:1515
+#: src/forms/StockForms.tsx:1553
msgid "Stock deleted"
msgstr "庫存已刪除"
-#: src/forms/StockForms.tsx:1518
+#: src/forms/StockForms.tsx:1556
msgid "This operation will permanently delete the selected stock items."
msgstr "此操作將永久刪除選定的庫存項目。"
-#: src/forms/StockForms.tsx:1527
+#: src/forms/StockForms.tsx:1565
msgid "Parent stock location"
msgstr "上級庫存地點"
-#: src/forms/StockForms.tsx:1654
+#: src/forms/StockForms.tsx:1692
msgid "Find Serial Number"
msgstr "尋找序號"
-#: src/forms/StockForms.tsx:1665
+#: src/forms/StockForms.tsx:1703
msgid "No matching items"
msgstr "沒有符合的項目"
-#: src/forms/StockForms.tsx:1671
+#: src/forms/StockForms.tsx:1709
msgid "Multiple matching items"
msgstr "多個符合的項目"
-#: src/forms/StockForms.tsx:1680
+#: src/forms/StockForms.tsx:1718
msgid "Invalid response from server"
msgstr "伺服器回應無效"
@@ -7294,15 +7295,15 @@ msgstr "定價"
msgid "Part Creation"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:280
+#: src/pages/Index/Settings/SystemSettings.tsx:281
msgid "Stock Expiry"
msgstr ""
-#: src/pages/Index/Settings/SystemSettings.tsx:289
+#: src/pages/Index/Settings/SystemSettings.tsx:290
msgid "Part Stocktake"
msgstr "零件盤點"
-#: src/pages/Index/Settings/SystemSettings.tsx:299
+#: src/pages/Index/Settings/SystemSettings.tsx:300
#: src/pages/part/PartStockHistoryDetail.tsx:296
#: src/pages/stock/StockDetail.tsx:554
msgid "Stock Tracking"
@@ -7312,7 +7313,7 @@ msgstr "庫存跟蹤"
#~ msgid "Switch to User Setting"
#~ msgstr "Switch to User Setting"
-#: src/pages/Index/Settings/SystemSettings.tsx:327
+#: src/pages/Index/Settings/SystemSettings.tsx:328
msgid "External Build Orders"
msgstr ""
diff --git a/src/frontend/src/pages/Index/Settings/SystemSettings.tsx b/src/frontend/src/pages/Index/Settings/SystemSettings.tsx
index c272fddaed..f342daccb5 100644
--- a/src/frontend/src/pages/Index/Settings/SystemSettings.tsx
+++ b/src/frontend/src/pages/Index/Settings/SystemSettings.tsx
@@ -273,6 +273,7 @@ export default function SystemSettings() {
'STOCK_SHOW_INSTALLED_ITEMS',
'STOCK_ENFORCE_BOM_INSTALLATION',
'STOCK_ALLOW_OUT_OF_STOCK_TRANSFER',
+ 'STOCK_MERGE_ON_TRANSFER',
'TEST_STATION_DATA'
]}
/>
diff --git a/src/frontend/src/pages/part/PartDetail.tsx b/src/frontend/src/pages/part/PartDetail.tsx
index af83e85522..38194069b6 100644
--- a/src/frontend/src/pages/part/PartDetail.tsx
+++ b/src/frontend/src/pages/part/PartDetail.tsx
@@ -218,7 +218,10 @@ export default function PartDetail() {
// Fetch information on parts which are revisions of *this* part
const partRevisionQuery = useQuery({
refetchOnMount: true,
- enabled: revisionsEnabled && !!part && !!part.revision_count,
+ enabled:
+ revisionsEnabled &&
+ !!part &&
+ (!!part.revision_count || !!part.revision_of),
queryKey: ['part_revisions', part.pk, part.revision_count],
queryFn: async () =>
api
@@ -227,7 +230,23 @@ export default function PartDetail() {
revision_of: part.pk
}
})
- .then((response) => response.data)
+ .then(async (response) => {
+ let data = response.data;
+
+ // If the part is also a revision, fetch upstream revision information too
+ if (!!part.revision_of) {
+ await api
+ .get(apiUrl(ApiEndpoints.part_list), {
+ params: {
+ revision_of: part.revision_of
+ }
+ })
+ .then((response) => {
+ data = [...data, ...response.data];
+ });
+ }
+ return data;
+ })
});
const partRevisionOptions: any[] = useMemo(() => {
diff --git a/src/frontend/src/pages/stock/StockDetail.tsx b/src/frontend/src/pages/stock/StockDetail.tsx
index 5d73866074..fa4bb80fa9 100644
--- a/src/frontend/src/pages/stock/StockDetail.tsx
+++ b/src/frontend/src/pages/stock/StockDetail.tsx
@@ -431,17 +431,24 @@ export default function StockDetail() {
hidden: !stockitem.packaging
},
{
- type: 'text',
+ type: 'date',
+ name: 'creation_date',
+ icon: 'calendar',
+ label: t`Created`,
+ hidden: !stockitem.creation_date
+ },
+ {
+ type: 'date',
name: 'updated',
icon: 'calendar',
label: t`Last Updated`
},
{
- type: 'text',
- name: 'stocktake',
+ type: 'date',
+ name: 'stocktake_date',
icon: 'calendar',
label: t`Last Stocktake`,
- hidden: !stockitem.stocktake
+ hidden: !stockitem.stocktake_date
}
];
diff --git a/src/frontend/src/tables/ColumnRenderers.tsx b/src/frontend/src/tables/ColumnRenderers.tsx
index b2d4eb4f81..f4c8e9a65b 100644
--- a/src/frontend/src/tables/ColumnRenderers.tsx
+++ b/src/frontend/src/tables/ColumnRenderers.tsx
@@ -94,6 +94,13 @@ export function PartColumn(props: PartColumnProps): TableColumn {
sortable: true,
switchable: false,
minWidth: '175px',
+ copyable: (record: any) => {
+ const part = resolveItem(
+ record,
+ props.part ?? props.accessor ?? 'part_detail'
+ );
+ return part?.full_name ?? part?.name ?? '';
+ },
render: (record: any) => {
const part = resolveItem(
record,
@@ -156,7 +163,7 @@ export function StockColumn(props: StockColumnProps): TableColumn {
text = `# ${stock_item.serial}`;
}
- if (record.is_building) {
+ if (stock_item.is_building) {
color = 'blue';
extra.push(
{t`This stock item is in production`}
);
- } else if (record.sales_order) {
+ } else if (stock_item.sales_order) {
extra.push(
{t`This stock item has been assigned to a sales order`}
);
- } else if (record.customer) {
+ } else if (stock_item.customer) {
extra.push(
{t`This stock item has been assigned to a customer`}
);
- } else if (record.belongs_to) {
+ } else if (stock_item.belongs_to) {
extra.push(
{t`This stock item is installed in another stock item`}
);
- } else if (record.consumed_by) {
+ } else if (stock_item.consumed_by) {
extra.push(
{t`This stock item has been consumed by a build order`}
);
- } else if (!record.in_stock) {
+ } else if (!stock_item.in_stock) {
extra.push(
{t`This stock item has expired`}
);
- } else if (record.stale) {
+ } else if (stock_item.stale) {
extra.push(
{t`This stock item is stale`}
);
}
- if (record.in_stock) {
+ if (stock_item.in_stock) {
if (allocated > 0) {
if (allocated > quantity) {
color = 'red';
@@ -267,7 +274,7 @@ export function StockColumn(props: StockColumnProps): TableColumn {
}
}
- if (!record.in_stock) {
+ if (!stock_item.in_stock) {
color = 'red';
}
diff --git a/src/frontend/src/tables/TableHoverCard.tsx b/src/frontend/src/tables/TableHoverCard.tsx
index 363af61133..913c6ced9b 100644
--- a/src/frontend/src/tables/TableHoverCard.tsx
+++ b/src/frontend/src/tables/TableHoverCard.tsx
@@ -68,7 +68,7 @@ export function TableHoverCard({
zIndex={zIndex}
>
-
+
{value}
{t`No stock available`}
)
}
@@ -447,7 +448,9 @@ export default function BuildLineTable({
extra={extra}
value={
- {formatDecimal(record.requiredQuantity)}
+
+ {formatDecimal(record.requiredQuantity)}
+
{record?.part_detail?.units && (
[{record.part_detail.units}]
)}
diff --git a/src/frontend/src/tables/part/PartTable.tsx b/src/frontend/src/tables/part/PartTable.tsx
index 583bdacac2..715529ddf0 100644
--- a/src/frontend/src/tables/part/PartTable.tsx
+++ b/src/frontend/src/tables/part/PartTable.tsx
@@ -181,7 +181,9 @@ function partTableColumns(): TableColumn[] {
- {text}
+
+ {text}
+
{record.units && (
[{record.units}]
diff --git a/src/frontend/src/tables/settings/ProjectCodeTable.tsx b/src/frontend/src/tables/settings/ProjectCodeTable.tsx
index d6cdddf9e8..e20e3210ed 100644
--- a/src/frontend/src/tables/settings/ProjectCodeTable.tsx
+++ b/src/frontend/src/tables/settings/ProjectCodeTable.tsx
@@ -11,6 +11,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints';
import { UserRoles } from '@lib/enums/Roles';
import { apiUrl } from '@lib/functions/Api';
import useTable from '@lib/hooks/UseTable';
+import type { TableFilter } from '@lib/index';
import type { TableColumn } from '@lib/types/Tables';
import { projectCodeFields } from '../../forms/CommonForms';
import {
@@ -19,7 +20,11 @@ import {
useEditApiFormModal
} from '../../hooks/UseForm';
import { useUserState } from '../../states/UserState';
-import { DescriptionColumn, ResponsibleColumn } from '../ColumnRenderers';
+import {
+ BooleanColumn,
+ DescriptionColumn,
+ ResponsibleColumn
+} from '../ColumnRenderers';
import { InvenTreeTable } from '../InvenTreeTable';
/**
@@ -37,6 +42,9 @@ export default function ProjectCodeTable() {
sortable: true
},
DescriptionColumn({}),
+ BooleanColumn({
+ accessor: 'active'
+ }),
ResponsibleColumn({})
];
}, []);
@@ -89,6 +97,17 @@ export default function ProjectCodeTable() {
[user]
);
+ const tableFilters: TableFilter[] = useMemo(() => {
+ return [
+ {
+ name: 'active',
+ label: t`Active`,
+ description: t`Show active items`,
+ type: 'boolean'
+ }
+ ];
+ }, []);
+
const tableActions = useMemo(() => {
return [
diff --git a/src/frontend/src/tables/stock/StockItemTable.tsx b/src/frontend/src/tables/stock/StockItemTable.tsx
index d6d4aa1472..3191ce97ed 100644
--- a/src/frontend/src/tables/stock/StockItemTable.tsx
+++ b/src/frontend/src/tables/stock/StockItemTable.tsx
@@ -86,6 +86,7 @@ function stockItemTableColumns({
'allocated',
'consumed',
'installed',
+ 'in_stock',
'sent_to_customer'
]
}),
diff --git a/src/frontend/yarn.lock b/src/frontend/yarn.lock
index 0612b6ef65..fbb2ec10ab 100644
--- a/src/frontend/yarn.lock
+++ b/src/frontend/yarn.lock
@@ -600,289 +600,140 @@
resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz#5e13fac887f08c44f76b0ccaf3370eb00fec9bb6"
integrity sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==
-"@esbuild/aix-ppc64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz#80fcbe36130e58b7670511e888b8e88a259ed76c"
- integrity sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==
+"@esbuild/aix-ppc64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.28.1.tgz#7a01a8d2ec2fbb2dac78adad09b0fa781e4082be"
+ integrity sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==
-"@esbuild/aix-ppc64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.28.0.tgz#7a289c158e29cbf59ea0afc83cc80f06d1c89402"
- integrity sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==
+"@esbuild/android-arm64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.28.1.tgz#b540a27d14e4afd058496a4dbec4d3f414db110a"
+ integrity sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==
-"@esbuild/android-arm64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz#8aa4965f8d0a7982dc21734bf6601323a66da752"
- integrity sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==
+"@esbuild/android-arm@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.28.1.tgz#704bd297de6d762de54eabbeafbf55f6756abe2f"
+ integrity sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==
-"@esbuild/android-arm64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.28.0.tgz#b8828d9edfa3a92660644eb8de6e4f3c203d7b17"
- integrity sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==
+"@esbuild/android-x64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.28.1.tgz#d1cb166d34b0fbf0fe8ab460a5594f24a378701e"
+ integrity sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==
-"@esbuild/android-arm@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.12.tgz#300712101f7f50f1d2627a162e6e09b109b6767a"
- integrity sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==
+"@esbuild/darwin-arm64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.28.1.tgz#1034b26457fc886368fe61bbd09f653f6afa8e54"
+ integrity sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==
-"@esbuild/android-arm@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.28.0.tgz#5ec1847605e05b5dbe5df90db9ff7e3e4c58dca7"
- integrity sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==
+"@esbuild/darwin-x64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.28.1.tgz#65556a432a1e4d72032d8218c1932fcca1a49772"
+ integrity sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==
-"@esbuild/android-x64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.12.tgz#87dfb27161202bdc958ef48bb61b09c758faee16"
- integrity sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==
+"@esbuild/freebsd-arm64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.1.tgz#2e61e0592f9030d7e3dae18ee25ebc535918aef6"
+ integrity sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==
-"@esbuild/android-x64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.28.0.tgz#390642175b88ef82bad4cce03f8ab13fe9b1912e"
- integrity sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==
+"@esbuild/freebsd-x64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.28.1.tgz#c95ec289959ef8079c4dca817a1e2c4be66b9bd3"
+ integrity sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==
-"@esbuild/darwin-arm64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz#79197898ec1ff745d21c071e1c7cc3c802f0c1fd"
- integrity sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==
+"@esbuild/linux-arm64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.28.1.tgz#40b22175dda06182f3ee8141186c5ff304c4a717"
+ integrity sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==
-"@esbuild/darwin-arm64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.28.0.tgz#ae45325960d5950cd6951e4f97396f4e1ff7d8d3"
- integrity sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==
+"@esbuild/linux-arm@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.28.1.tgz#c09a0f67917592ac0de892a9be4d3814debd2a6c"
+ integrity sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==
-"@esbuild/darwin-x64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz#146400a8562133f45c4d2eadcf37ddd09718079e"
- integrity sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==
+"@esbuild/linux-ia32@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.28.1.tgz#a580f9c676797833891e519fc7a1337c8afd8db3"
+ integrity sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==
-"@esbuild/darwin-x64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.28.0.tgz#c079247d589b6b99449659d94f06951b84bff2e4"
- integrity sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==
+"@esbuild/linux-loong64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.28.1.tgz#46452cf321dc7f9e91c2fa780a56bb56e79cd68b"
+ integrity sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==
-"@esbuild/freebsd-arm64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz#1c5f9ba7206e158fd2b24c59fa2d2c8bb47ca0fe"
- integrity sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==
+"@esbuild/linux-mips64el@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.28.1.tgz#4211b3184dd6608f53dcb22e39f5d34ee08852c8"
+ integrity sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==
-"@esbuild/freebsd-arm64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.0.tgz#45c456215a486593c94900297202dc11c880a37a"
- integrity sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==
+"@esbuild/linux-ppc64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.28.1.tgz#697857c2a61cb9b0b6bb6652e40c1dc5e1ca8e5d"
+ integrity sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==
-"@esbuild/freebsd-x64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz#ea631f4a36beaac4b9279fa0fcc6ca29eaeeb2b3"
- integrity sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==
+"@esbuild/linux-riscv64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.28.1.tgz#d192943eb146a40ac4c6497d0cf7be35b986bf08"
+ integrity sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==
-"@esbuild/freebsd-x64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.28.0.tgz#0399494c1c85e4388e9b7040bd60d48f2a5b0d2c"
- integrity sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==
+"@esbuild/linux-s390x@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.28.1.tgz#acea0356da0e0ebc08f97cf7b9c2e401e1e648dc"
+ integrity sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==
-"@esbuild/linux-arm64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz#e1066bce58394f1b1141deec8557a5f0a22f5977"
- integrity sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==
+"@esbuild/linux-x64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.28.1.tgz#6f0c3ce0cb64c534b70c4c45ecb2c16d34e35dfd"
+ integrity sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==
-"@esbuild/linux-arm64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.28.0.tgz#d6d9f09ef0de54116bf459a4d53cac7e0952fe39"
- integrity sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==
+"@esbuild/netbsd-arm64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.1.tgz#8bcd77077a0dce3378b574fedb26d2a253b73d36"
+ integrity sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==
-"@esbuild/linux-arm@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz#452cd66b20932d08bdc53a8b61c0e30baf4348b9"
- integrity sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==
+"@esbuild/netbsd-x64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.28.1.tgz#e7fb2a01e99c830c94e6623cd9fefb4c8fb58347"
+ integrity sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==
-"@esbuild/linux-arm@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.28.0.tgz#7b42ffa84c288ae94fdc431c1b28a89e3c3b9278"
- integrity sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==
+"@esbuild/openbsd-arm64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.1.tgz#c52909372db8b86e2c55e05a8940033b5660a3b2"
+ integrity sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==
-"@esbuild/linux-ia32@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz#b24f8acc45bcf54192c7f2f3be1b53e6551eafe0"
- integrity sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==
+"@esbuild/openbsd-x64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.28.1.tgz#c427b9be5a64c262ff9a7eb70b5fbbaadf446c6c"
+ integrity sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==
-"@esbuild/linux-ia32@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.28.0.tgz#deb15d112ed8dd605346b6b953d23a21ff81253f"
- integrity sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==
+"@esbuild/openharmony-arm64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.1.tgz#dc9b147baca2e6c4b3c85571741ef4860a489097"
+ integrity sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==
-"@esbuild/linux-loong64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz#f9cfffa7fc8322571fbc4c8b3268caf15bd81ad0"
- integrity sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==
+"@esbuild/sunos-x64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.28.1.tgz#ce866d12df13c15e4c99f073a3d466f6e0649b3a"
+ integrity sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==
-"@esbuild/linux-loong64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.28.0.tgz#81fb89d07eecc79b157dea61033757726fce0ca4"
- integrity sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==
+"@esbuild/win32-arm64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.28.1.tgz#7468e3692d01d629d5941e5d83817bb80f9e39b4"
+ integrity sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==
-"@esbuild/linux-mips64el@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz#575a14bd74644ffab891adc7d7e60d275296f2cd"
- integrity sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==
+"@esbuild/win32-ia32@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.28.1.tgz#a5bc0063fb2bcab6d0ed63f2a1537958bc269ec6"
+ integrity sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==
-"@esbuild/linux-mips64el@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.28.0.tgz#d0e42691b3ff7af9fb2217b70fc01f343bdb62bb"
- integrity sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==
-
-"@esbuild/linux-ppc64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz#75b99c70a95fbd5f7739d7692befe60601591869"
- integrity sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==
-
-"@esbuild/linux-ppc64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.28.0.tgz#389f3e5e98f17d477c467cc87136e1a076eead87"
- integrity sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==
-
-"@esbuild/linux-riscv64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz#2e3259440321a44e79ddf7535c325057da875cd6"
- integrity sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==
-
-"@esbuild/linux-riscv64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.28.0.tgz#763bd60d59b242be12da1e67d5729f3024c605fa"
- integrity sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==
-
-"@esbuild/linux-s390x@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz#17676cabbfe5928da5b2a0d6df5d58cd08db2663"
- integrity sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==
-
-"@esbuild/linux-s390x@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.28.0.tgz#aac6061634872e4677de693bce8030d73b1fd055"
- integrity sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==
-
-"@esbuild/linux-x64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz#0583775685ca82066d04c3507f09524d3cd7a306"
- integrity sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==
-
-"@esbuild/linux-x64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.28.0.tgz#4f2917747188fe77632bcec65b2d84b422419779"
- integrity sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==
-
-"@esbuild/netbsd-arm64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz#f04c4049cb2e252fe96b16fed90f70746b13f4a4"
- integrity sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==
-
-"@esbuild/netbsd-arm64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.0.tgz#814df0ae57a0c386814491b8397eeba82094a947"
- integrity sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==
-
-"@esbuild/netbsd-x64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz#77da0d0a0d826d7c921eea3d40292548b258a076"
- integrity sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==
-
-"@esbuild/netbsd-x64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.28.0.tgz#e01bdf7e60fa1a08e46d46d960b0d9bb8ac210af"
- integrity sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==
-
-"@esbuild/openbsd-arm64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz#6296f5867aedef28a81b22ab2009c786a952dccd"
- integrity sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==
-
-"@esbuild/openbsd-arm64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.0.tgz#4a15c36aacca68d2d5a4c90b710c06759f4c1ffa"
- integrity sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==
-
-"@esbuild/openbsd-x64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz#f8d23303360e27b16cf065b23bbff43c14142679"
- integrity sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==
-
-"@esbuild/openbsd-x64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.28.0.tgz#475e6101498a8ecce3008d7c388111d7a27c17bd"
- integrity sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==
-
-"@esbuild/openharmony-arm64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz#49e0b768744a3924be0d7fd97dd6ce9b2923d88d"
- integrity sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==
-
-"@esbuild/openharmony-arm64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.0.tgz#cfdc3957f0b7a69f1bde129aad17fcc2f6fa033e"
- integrity sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==
-
-"@esbuild/sunos-x64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz#a6ed7d6778d67e528c81fb165b23f4911b9b13d6"
- integrity sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==
-
-"@esbuild/sunos-x64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.28.0.tgz#a013c856fecacd1c3aec985c8afe1d1cb017497d"
- integrity sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==
-
-"@esbuild/win32-arm64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz#9ac14c378e1b653af17d08e7d3ce34caef587323"
- integrity sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==
-
-"@esbuild/win32-arm64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.28.0.tgz#eae05e0f35271cad3898b43168d3e9a3bbaf47e5"
- integrity sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==
-
-"@esbuild/win32-ia32@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz#918942dcbbb35cc14fca39afb91b5e6a3d127267"
- integrity sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==
-
-"@esbuild/win32-ia32@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.28.0.tgz#06161ebc5bf75c08d69feb3c6b22560515913998"
- integrity sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==
-
-"@esbuild/win32-x64@0.25.12":
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz#9bdad8176be7811ad148d1f8772359041f46c6c5"
- integrity sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==
-
-"@esbuild/win32-x64@0.28.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.28.0.tgz#04d90d5752b4ce65d2b6ac25eba08ff7624fe07c"
- integrity sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==
-
-"@flakiness/flakiness-report@^0.34.0":
- version "0.34.0"
- resolved "https://registry.yarnpkg.com/@flakiness/flakiness-report/-/flakiness-report-0.34.0.tgz#e15f79129479befd12b15e6890fde09be8b95db4"
- integrity sha512-37SRIky7mnMhV9Go/VO3pwo5r0ZQ5h/rTYmQBWdIyty2ZGylEUdbxZ+Yz2wCJwlmVeK9V8VWm0pInAjxUJ/x5g==
+"@esbuild/win32-x64@0.28.1":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.28.1.tgz#10064ee44f4347b90c9a02b446bbf80a91632b12"
+ integrity sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==
"@flakiness/playwright@^1.13.0":
- version "1.13.0"
- resolved "https://registry.yarnpkg.com/@flakiness/playwright/-/playwright-1.13.0.tgz#d03fe74294452ad0ec479d7b1bb42b7fea973b28"
- integrity sha512-9bT6zkFIcsXwU5OsowIu4HXTPcEe8TVk8I538LJbkZpKIX7RMoUNU3StxK97hYN3P22VONO5yllHJAf3bD13+g==
- dependencies:
- "@flakiness/flakiness-report" "^0.34.0"
- "@flakiness/sdk" "^3.3.1"
-
-"@flakiness/sdk@^3.3.1":
- version "3.3.1"
- resolved "https://registry.yarnpkg.com/@flakiness/sdk/-/sdk-3.3.1.tgz#dfb1b6d62f3ff3ff9f4a1e573761227ae3e6a3a2"
- integrity sha512-LrV+g246Oo9MSpVKU9bY/UHOYglwcqr0e4I6Vz0RGhHtOyrR2xZRCVzsM4crItDvNbIW4/9AJSRwQ5nptCykvw==
- dependencies:
- debug "^4.4.3"
- open "^10.2.0"
- stable-hash "^0.0.6"
- which "^6.0.1"
- zod "^4.3.5"
+ version "1.15.0"
+ resolved "https://registry.yarnpkg.com/@flakiness/playwright/-/playwright-1.15.0.tgz#fa1f3049032982ad5967655da298bb05d611cc06"
+ integrity sha512-t7/q+MhYwN3FYXtymQIB4Z+W8n1Y80CspF8J9gOCS7PFp190YXat3pzleWRWVchsDlYqXCAXyeTLuDct/4/npA==
"@floating-ui/core@^1.7.5":
version "1.7.5"
@@ -1420,130 +1271,130 @@
estree-walker "^2.0.2"
picomatch "^4.0.2"
-"@rollup/rollup-android-arm-eabi@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.61.1.tgz#ce83f259581a4f5e6255d92902249f0366a15dd3"
- integrity sha512-JnBB8MdXj45cajvTuO5FmPlvFVJRQgvrz1uSEl3NwqFnReAPGwb8EanbGi4z2nRaqLzjJSv5/JmycoTKlRZxHA==
+"@rollup/rollup-android-arm-eabi@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz#5e9849b661c2229cf967a08dbe2dbbe9e8c991e5"
+ integrity sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg==
-"@rollup/rollup-android-arm64@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.61.1.tgz#1a763329ffbc2a19057128ac266a1a46782a5f17"
- integrity sha512-Jx2g7iSjw4AOT0HDPHM9RV3GNjRXwybWtSFZiZAYUTjUwjVrYIwq3kBf+LnhqJlzXFAqTAh2F7IGI+O568exPw==
+"@rollup/rollup-android-arm64@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.2.tgz#5b0699ee5dd484b222c9ed74aff43c91ea8b17f8"
+ integrity sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw==
-"@rollup/rollup-darwin-arm64@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.61.1.tgz#ff9cffe102d29e052f49e5017fd036142f9bb7ef"
- integrity sha512-0F1L/Z3Eqv8mT2n3dCpeO8GcTvHvVqkP5/t6DMsn0KzhYVcg+s7Ncl5DS8qjKYEeio6Az0Gt6nyBORay5qIlCA==
+"@rollup/rollup-darwin-arm64@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.62.2.tgz#8bc52c9d7a3ce8d0533c351a9c935de781daa06f"
+ integrity sha512-v39RCCvj4He82I9sFmk+M1VZ0PLM9sfsLVikjfx2hYBNALhrrOR2D3JjQA6AhlaSOgcR+RzrKY7e1+bT6SUO/A==
-"@rollup/rollup-darwin-x64@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.61.1.tgz#1ef1e8f5bd16865d8d2f377a58e7622820b3dda3"
- integrity sha512-qLttcH871ujY4YcVfUSShhOw+CsoTatYz8gRbHO7Bb92QH059/P0y5do1KMs41fY0BpD2x4AJH/gID0zFiqVKQ==
+"@rollup/rollup-darwin-x64@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.62.2.tgz#ba2ef3e8fb310f0af35588f270cfa5aa96e48764"
+ integrity sha512-yl0y2vq3S3lHeuXhEdss6TWfKW8vkujImO12tn4ZkG/4oghr09LvdYm2RElVjokTQiUvDUGXLGsYeLqUMCKpGA==
-"@rollup/rollup-freebsd-arm64@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.61.1.tgz#cb7d041010788213879f663d3100c4320c0910d9"
- integrity sha512-fUI4RapGE0Oh3mb8mgfvC1O2nU1RpDZUKnDQm3xB1Ipg7C2wTs5Kstz7G2uWK99a8S2yTMq8/P4uycwNa0nJyw==
+"@rollup/rollup-freebsd-arm64@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.62.2.tgz#93b10bdbfe8ada226b8bc0c02ef6b7f544474d96"
+ integrity sha512-tT4pvt4qXD+vEoezupCWi+a1F0vvDiksiHc+PxRlYTOH1I6/X4id9jPxTP+Fg+545euaFT1jJVs4CEdHZAU1vw==
-"@rollup/rollup-freebsd-x64@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.61.1.tgz#25d4b4d7e52bb1a144fd130209732e5d0518251a"
- integrity sha512-H5YrdvJaDtI/U9/emrD4b++xkvp3y/JvOe4rizHbxvkyMfRS/CiRYdji+Pl8D0brEaNFWUh1drQxgAGIl6Xudw==
+"@rollup/rollup-freebsd-x64@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.62.2.tgz#3e8aa38ef3c9c300946871e3fdbb0c30e0a20f86"
+ integrity sha512-6nU5F2wCW+qvCBhTn1pdIU3bzsIoF7EUwsCDRxilWGprQR6yd508YnH9+OKFCwpfS8pjZqDUmnCAr7exax0XCg==
-"@rollup/rollup-linux-arm-gnueabihf@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.61.1.tgz#9569a8dd884a22950df4461de8b26c750390531c"
- integrity sha512-Q8CBCCQtDFrYtXoeUXSrnFXKOnyUhx6bz+SkL6A0E7V8kAiCJ5pamq1WtbfpVGhR5TSpXY6ak3avmDc5fHTyJA==
+"@rollup/rollup-linux-arm-gnueabihf@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.62.2.tgz#1d7994384bb0ad1bc41921b506e1642d4f9d7fc3"
+ integrity sha512-n1GJHPOvpIfhi3TmrCeh6S6URt9BFCt0KQE3qvexyGCTAKpR4Lg+eWvNZEqu7epxwus/8ElT3hacYEucm49SZg==
-"@rollup/rollup-linux-arm-musleabihf@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.61.1.tgz#33d0080b8cce62df8c3e6240875abf0d6c125cda"
- integrity sha512-nwnhk1581l0FBVellGcVCAT0Oi06onEA3WB53sf01VO3I0UPBkMH9sXONYME2K0ovXcNayJfNtHfm6mpJElatQ==
+"@rollup/rollup-linux-arm-musleabihf@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.62.2.tgz#a6540f47cf844a56b80ca9ff95d2acdfb2cef97b"
+ integrity sha512-JqgflS8wEB+UXV/vS1RpRbifGBeN4D5lz8D8oOFbFZw4vedvdOgCFAjfBmIMdW3yL10XpQQ0Ambepw6MXrhOnA==
-"@rollup/rollup-linux-arm64-gnu@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.61.1.tgz#9c66a9b4d1746595680eec691e136f8efcfe3d78"
- integrity sha512-x5Xr49hwt3hdW75UOZm3395YwwzPyauktslv29KpWL/T+vVAzoT3azLcTWv0eMciBNrx+DYjH4paehHoLpPvpg==
+"@rollup/rollup-linux-arm64-gnu@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.62.2.tgz#404f2045651840cbf48da91ba6d0f490f0bc2cbf"
+ integrity sha512-wnFJkogWvN4jm/hQRF2UBaeUmk20j5+DmHvoyWii2b8HJDyvz1MF2OU/6ynXt2KR63rbZLWkFpoytpdc/yBuSA==
-"@rollup/rollup-linux-arm64-musl@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.61.1.tgz#e37aa97039af9dbb76a324148db06c6266acc9a0"
- integrity sha512-unMS3H73DpaoPyyEVPjGKleM/s0mkmsauTENpw4INQY8y4+IuLNjkueQ5QCtC0D3N38Y38yhAU8OoZ20S2Tm6w==
+"@rollup/rollup-linux-arm64-musl@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.62.2.tgz#a3404ffddf7b474b48c99b9c893b6247bb765ba5"
+ integrity sha512-HVu2bp0zhvJ8xHEV9+UUs7S90VadmBSY3LcIMvozbPo4AuMGDWlz3ymHLHZPX4hR67TKTt8Qp5PJ5RBg/i+RMQ==
-"@rollup/rollup-linux-loong64-gnu@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.61.1.tgz#22951f5686b653968619d21a02b2572d5cbe51dc"
- integrity sha512-zNZzGRnAhwjFEYmvphJRV5XaQGjs62cCmeYYHUT//NbvEnHauw+I85nGG+SiVg5ld4GX8D1IbKIX+ozITQnhMQ==
+"@rollup/rollup-linux-loong64-gnu@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.62.2.tgz#e8aac6d549b377945e349882f199b7c8eb75ca38"
+ integrity sha512-mQqqAV8QaoSgr9I2fKDLY2BAVvmKjWoGiu/cSYQonsLvtqwEn1E4QYfnCOcp5zoEqNhsDYin1s6jx/VJmrxlZg==
-"@rollup/rollup-linux-loong64-musl@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.61.1.tgz#778c983d0050792d85a62e2c74009fff821e5606"
- integrity sha512-LdpWGL8X209B2SIvWjqlc8VZgM6PKfontSerGepuldQmHYrAOtnMCXeJkxXGbC+PPZVOuu5czJo7fNV6aeW8rQ==
+"@rollup/rollup-linux-loong64-musl@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.62.2.tgz#6e2e44ea50310b3a582078a915e5feb879c820d4"
+ integrity sha512-IxKLoxCQ2IWi6bT2akyDUBGsOImDKB+sPp4EsTmwFQ/fMwpCKm8uLSSgP/Kx/QYUgKis6SEZ5/Nlhup0DIA0PQ==
-"@rollup/rollup-linux-ppc64-gnu@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.61.1.tgz#74f34764b688a6081c8f75e155b58d2cdb39112f"
- integrity sha512-EC5kTtNaNGOmbMGqar8dvJy6y/hg99GAwjfBz++pxZhQATXGcRjd6c5en5wcbru0vkRmiMGsQKdMJOOf6sza4g==
+"@rollup/rollup-linux-ppc64-gnu@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.62.2.tgz#6898302da6d77a0537cde64b2b4c6b60659bd110"
+ integrity sha512-Mk5ha2RQSgyFfmYYLkBpPnUk8D8FriBxesO1u9O75X0mHgXL1UQcH5Itl2lurWL2tj0RxV9b9tJgipac0hRY9A==
-"@rollup/rollup-linux-ppc64-musl@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.61.1.tgz#821ccda4531dcdb42e56adddc178907615a6da07"
- integrity sha512-8hiwp6D4acEcNK78I4rP0/XtS1sknWIAMJBPdR4l6zUtyTm5KiTDr5bXmWt4foY7nAN7AThDHgkLIEZOWKbzWw==
+"@rollup/rollup-linux-ppc64-musl@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.62.2.tgz#333717c95dd5a66bef8f63e7ef8a9fd845fd18d0"
+ integrity sha512-CjvEnqJL/0/TQ3TXX3OPIJ/kmBellrWd4heXUmHeJlTnmwjKpSJzoehLaL6Xk0ZnMHBu9dZuFADNOrtjF4v+2w==
-"@rollup/rollup-linux-riscv64-gnu@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.61.1.tgz#849fa5c6b43fc6c4d257671fcebd701fe6947bd6"
- integrity sha512-10dh/h/BqA7DuMPWSxkR8uks18FRwnwOEqr5zOTEl+NOwP/OMzKX8OFR/Of9xxDA7D5qef1Nzar5WDD2kCCr1g==
+"@rollup/rollup-linux-riscv64-gnu@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.62.2.tgz#81bc06ba380352004d01f4826eb7cdccefa05bad"
+ integrity sha512-1SiZbzwdkaDURsew/tSOrooKiYy7EQGT6m8ufavAi9NEyQb/6VuIxFXAL1fqa4iZe3g4NbNk4P7J32z2tw5Mgg==
-"@rollup/rollup-linux-riscv64-musl@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.61.1.tgz#80a8711af6c316ce448b93294c4a0891c2ddacbe"
- integrity sha512-YKJ5lg35DP17gcAOggnihe+APw9HLyj1Xn7gsmGumBJAUDa6NGXNixJzmkWLhcK9TOuuyQjdamzvJefkO7qHZQ==
+"@rollup/rollup-linux-riscv64-musl@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.62.2.tgz#95a7cd39de21389ad6788a5284eaaa738e29ca4c"
+ integrity sha512-nQts12zJ3NQRoE6uYljOH89v7szzLDvG2JD/vsX+vGXU8w/At1GowTZ5/7qeFQ8m7L55rpR8Okugnuo5bgjy2Q==
-"@rollup/rollup-linux-s390x-gnu@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.61.1.tgz#90acba54363c128b73dbb310642b977b5e6b9daa"
- integrity sha512-Mlil5G2Jj6a7B3LWGctg+XPL9vdXYuzCtNXfxOQ0nPjc2m6ueUktocPGH9bnAM0bNRKb/bAWTujUU7IJQdQA+g==
+"@rollup/rollup-linux-s390x-gnu@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.62.2.tgz#06e6db2ec1bc48b5374c7923ef83c2eb024b2452"
+ integrity sha512-E9/ll019jhPIJgpzfZoIkBGhcz+kKNgVWYRY0zr9srBdPPFVpvOKW8VaJKUbeK+eZXyQF9ltME+Kk6affeaPgg==
-"@rollup/rollup-linux-x64-gnu@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.61.1.tgz#32085c3f532c59269824ed9239e13f5acbe182b9"
- integrity sha512-bVWIOIk6pV01p4CdUbPP7CJ/434z+OooYjDuFcR+44N35YvKUC66G8MGnvcWx5mWKW3g61J+t74l3Kj15Kwn2Q==
+"@rollup/rollup-linux-x64-gnu@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.62.2.tgz#5dc818988285e09e88790c6462def72413df2da3"
+ integrity sha512-5BqxR/pshjey51iliyzTD5Xi3EN0aLmQ2lZ3lvefVV9c82BvrLo2/6OT55iifpWBufs6kdwWbuOKS841DrmK9A==
-"@rollup/rollup-linux-x64-musl@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.61.1.tgz#becf0e9e29d77e7d04de841bda635e9f73b89dfb"
- integrity sha512-qy5pBvZbqNFheBz61R1rzsezjm0J7O2oNGoWtGoY89SZYLUfxAJTBAqDChqAIdB4rCiIbi9nF7yZ83GnNiLwSw==
+"@rollup/rollup-linux-x64-musl@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.62.2.tgz#2080f4a93349e9afd34be6fc1a37e01fc8bfc80f"
+ integrity sha512-uNN83XxQrRAh/w0/pmAfibcwyb6YWt4gP+dpnQKPVJshAloQ785ii8CT8ZCIxkGg9opVsvAlGhFitSm6D1Jjpg==
-"@rollup/rollup-openbsd-x64@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.61.1.tgz#d8478e23a575745f0febbde0867a133cf29fe164"
- integrity sha512-E83TXjI4zm0+5f2qO+UOudaCYIhYwpJ5jq6YCZNIZ+6CbfhKrkAGezeiASBL9ElxAxFsRS9ZhESv8mfnj6TKeg==
+"@rollup/rollup-openbsd-x64@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.62.2.tgz#21d64a8acb66221724b923e51af5333df1af044b"
+ integrity sha512-srjEIxSH3LRnJN6THczDHWQplqEMFiAJrTab0msUryh9kwNpkICf3Ea6q6MN/2cZwRFUNx5w+h6Hpi4QuHS6Zg==
-"@rollup/rollup-openharmony-arm64@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.61.1.tgz#b367bc49355b7ec2508cbad970721ac78b41bf0c"
- integrity sha512-fbWnKqVkjrJN38vNe3ahkbk6iejS/3b0Nt7EEtPpE6RBacZcGXNKbzfHN3GUUlXOPghUg0j6XUGrtjX9z1sIvA==
+"@rollup/rollup-openharmony-arm64@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.62.2.tgz#8e0fcd9d02141e337b4c5b5cff576cb9a76b1ba0"
+ integrity sha512-8hOJnxgbyObnCm5AlRA3A931xX19xq80RjVTKgJOvEKWqJruP/Uf12IbAOaDjjEXYRewwHLfmF0YRIdK3OwKWA==
-"@rollup/rollup-win32-arm64-msvc@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.61.1.tgz#d7be3478b45d6434d13cbe62cce29c4fb6366948"
- integrity sha512-ArMl38iVAbk0New1ogihQNY6iphLi4ZaRsa037gUzv5yeKPY8TD3Dmy4x2RNC1VztU/uqm+G+/RwFrSka3Oy2g==
+"@rollup/rollup-win32-arm64-msvc@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.62.2.tgz#bdb4cc4efd58efe808203347f0f5463f0ea16e52"
+ integrity sha512-mmF4AY1i0hG/bLWUctUq59gtmgaSIRa3cu/A3JFRp/sCNEme2bgDEiDS22P9FbnJB8NJNF4jPJiSP5RHQpUTDg==
-"@rollup/rollup-win32-ia32-msvc@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.61.1.tgz#7ec5801739cae3bf119f419b77a10cb0dc49f40f"
- integrity sha512-0mYtjHS9ucAbcATycCNK9IGBk/cCe/ma7EmSLGZdsxnOA8cjRIyU04wDpVAD9NiOfLUR9KTxdiO53uOkherqjQ==
+"@rollup/rollup-win32-ia32-msvc@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.62.2.tgz#dbaebde5afd24eae0eefe915d901632e7cb59860"
+ integrity sha512-DZgkknc6jhHrk46V25vbAM0zZkyP0nSDkJB8/dRkLTxv470dOmWDqGoEJl/9A0dFfS7yE3REOwNDxpHwSLSt0Q==
-"@rollup/rollup-win32-x64-gnu@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.61.1.tgz#94a83572bf151772d945ffd4777ded305cd8c346"
- integrity sha512-gK1iCEPfpoSG9wfBihXxvBMi8ZfcWffYkEsC/Eih+iFENTaewvNcrEQ69lIOWYO5pePHKLHHO7nq5AILGO/HQQ==
+"@rollup/rollup-win32-x64-gnu@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.62.2.tgz#84109e85fea5f8f1353499f96578fdc2a0e8b138"
+ integrity sha512-T6xr6ucWSFto+VGajA8YH26LdpHRuP4YLHEKAtCWvJDOlnmWcDZVCI2Jmjr+IFHDlt2zRaTAKE4tfjTaWLgJBg==
-"@rollup/rollup-win32-x64-msvc@4.61.1":
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.61.1.tgz#cb98a579ab6eec9940bda7a736df5e2b94eb0a27"
- integrity sha512-X+zaP2x+j4RXGfbp/seSoRHWnPxzApilDszisZxbYH5C/jTxFhCtDNdPGZb9lJyYPs24wGxruPF7Y+sIXt9Gzw==
+"@rollup/rollup-win32-x64-msvc@4.62.2":
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.62.2.tgz#3671ce3f9b928d5c01f879792d5c0b60ae14d4ad"
+ integrity sha512-BfzEnDJOt9T8M989/lA37EcJgat01wLRnoi5dQf3QzOH7jzpqTAzdDbVfRljVr5r+jzKqpbHeyOfAaXxAd0PAA==
"@sentry-internal/browser-utils@10.57.0":
version "10.57.0"
@@ -2065,13 +1916,6 @@ archy@^1.0.0:
resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
-argparse@^1.0.7:
- version "1.0.10"
- resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
- integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
- dependencies:
- sprintf-js "~1.0.2"
-
argparse@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -2093,9 +1937,9 @@ attr-accept@^2.2.4:
integrity sha512-0bDNnY/u6pPwHDMoF0FieU354oBi0a8rD9FcsLwzcGWbc8KS8KPIi7y+s13OlVY+gMWc/9xEMUgNE6Qm8ZllYQ==
axios@^1.17.0:
- version "1.17.0"
- resolved "https://registry.yarnpkg.com/axios/-/axios-1.17.0.tgz#ae5a1164a4f719942cd73c67e6a3f62d3ccb8f2b"
- integrity sha512-J8SwNxprqqpbfenehxWYXE7CW+wM1BB4w3+N+g+/Wx40xM4rsLrfPmHHxSWIxJLYDgSY/HqlFPIYb2/S3rxafw==
+ version "1.18.1"
+ resolved "https://registry.yarnpkg.com/axios/-/axios-1.18.1.tgz#d63f9863bcd8938815c86f9e2abd380189d96dfe"
+ integrity sha512-3nTvFlvpn9Zu/RkHUqtc7/+al4UpRW5az71ap5zccp6e8RAYEzhMTecX8Dz1wWDYrPpUoB1HAQEGEAEvUr7S9g==
dependencies:
follow-redirects "^1.16.0"
form-data "^4.0.5"
@@ -2122,9 +1966,9 @@ base64-js@^1.3.1:
integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
baseline-browser-mapping@^2.10.12:
- version "2.10.35"
- resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.35.tgz#f0f2232e0de2d2f82cc491bcf830b05ed05937c6"
- integrity sha512-honAfLBde0HAFLdNyBEfuuENkF6zR+ozxqxa/2zJKHBe1qzLqyTSeRKpdPEHAP03rlDGyQOPnCSxnVpVqQo9Mg==
+ version "2.10.38"
+ resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.38.tgz#c84d093c4bf7325c5053c279d90f153c66526042"
+ integrity sha512-31/02mVB4yuQU6adKk5SlY6m+mxDwUq5KZkyYgnLrrKl7TEm1+3PyDtDBz2kOv/wxZz41GHsvV1A/u6RmiyBvw==
before-after-hook@^4.0.0:
version "4.0.0"
@@ -2178,13 +2022,6 @@ buffer@^5.5.0:
base64-js "^1.3.1"
ieee754 "^1.1.13"
-bundle-name@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-4.1.0.tgz#f3b96b34160d6431a19d7688135af7cfb8797889"
- integrity sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==
- dependencies:
- run-applescript "^7.0.0"
-
cac@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/cac/-/cac-7.0.0.tgz#7dda83da2268f75f840ab89ac3bcc36c120a78da"
@@ -2229,9 +2066,9 @@ camelize@^1.0.0:
integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==
caniuse-lite@^1.0.30001782:
- version "1.0.30001797"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001797.tgz#1332709e1439f01ff92085dd17001e0a45897ec0"
- integrity sha512-l8xKG+gwAIExZGl9FrF7KUwuOmk6wbEPC9Xoy/RtnWv1XG0Q4LFlagaLpUv3Kiza3W/wm27zy0yWJEieYKAP6w==
+ version "1.0.30001799"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001799.tgz#5c909138c27f1a61219d3e092071c1cc7d32dc55"
+ integrity sha512-hG1bReV+OUU+MOqK4t/ZWI0tZOyz3rqS9XuhOUz1cIcbwBKjOyJEJuw9ER5JuNyqxNk8u/JUVbGibBOL1yrjFw==
chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.0:
version "4.1.2"
@@ -2533,7 +2370,7 @@ dayjs@^1.11.21:
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.21.tgz#57f87562e62de76f3c704bd2b8d522fc33068eb2"
integrity sha512-98IT+HOahAisibz/yjKbzuOBwYcjJ7BCLPzARyHiyEBmRz4fatF+KPJszEHXsGYjUG234aH/cOjW1wwTbKUZlA==
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.4.0, debug@^4.4.3:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.4.0:
version "4.4.3"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
@@ -2565,19 +2402,6 @@ deepmerge@^4.2.2:
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
-default-browser-id@^5.0.0:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-5.0.1.tgz#f7a7ccb8f5104bf8e0f71ba3b1ccfa5eafdb21e8"
- integrity sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==
-
-default-browser@^5.2.1:
- version "5.5.0"
- resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-5.5.0.tgz#2792e886f2422894545947cc80e1a444496c5976"
- integrity sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw==
- dependencies:
- bundle-name "^4.1.0"
- default-browser-id "^5.0.0"
-
default-require-extensions@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-3.0.1.tgz#bfae00feeaeada68c2ae256c62540f60b80625bd"
@@ -2592,11 +2416,6 @@ defaults@^1.0.3:
dependencies:
clone "^1.0.2"
-define-lazy-prop@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f"
- integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==
-
delayed-stream@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -2648,9 +2467,9 @@ easymde@^2.21.0:
marked "^4.1.0"
electron-to-chromium@^1.5.328:
- version "1.5.370"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.370.tgz#47dbc6565e5f13991a483e10cddff4bf0933de96"
- integrity sha512-D5tSHJReAb/Kf3Hu9F/GO4lJuSWzEWHwvQ/kKSUP7pimNgvxkSKj+gUQhHpKKACwrin7rS3byU7IxreF56rl5g==
+ version "1.5.375"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.375.tgz#54a9a616dc2b3765e7263d98d14c2135408954d9"
+ integrity sha512-ZWP5eB4BVPW/ZYo9252hQZHZ5XavtsTgpbhcmMmRwymavC5AsLWQWBPaKMeNd2LW0KGby5HPXvj7+sr4ta5j/Q==
embla-carousel-react@^8.6.0:
version "8.6.0"
@@ -2729,69 +2548,37 @@ es6-error@^4.0.1:
resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
-esbuild@^0.25.0, esbuild@^0.25.1:
- version "0.25.12"
- resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.12.tgz#97a1d041f4ab00c2fce2f838d2b9969a2d2a97a5"
- integrity sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==
+esbuild@^0.25.1, esbuild@^0.27.0, esbuild@^0.28, "esbuild@npm:esbuild@>=0.17.6 <0.29.0":
+ version "0.28.1"
+ resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.28.1.tgz#ef45b4634c9c9d97a296aea4114a5f9840f95578"
+ integrity sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==
optionalDependencies:
- "@esbuild/aix-ppc64" "0.25.12"
- "@esbuild/android-arm" "0.25.12"
- "@esbuild/android-arm64" "0.25.12"
- "@esbuild/android-x64" "0.25.12"
- "@esbuild/darwin-arm64" "0.25.12"
- "@esbuild/darwin-x64" "0.25.12"
- "@esbuild/freebsd-arm64" "0.25.12"
- "@esbuild/freebsd-x64" "0.25.12"
- "@esbuild/linux-arm" "0.25.12"
- "@esbuild/linux-arm64" "0.25.12"
- "@esbuild/linux-ia32" "0.25.12"
- "@esbuild/linux-loong64" "0.25.12"
- "@esbuild/linux-mips64el" "0.25.12"
- "@esbuild/linux-ppc64" "0.25.12"
- "@esbuild/linux-riscv64" "0.25.12"
- "@esbuild/linux-s390x" "0.25.12"
- "@esbuild/linux-x64" "0.25.12"
- "@esbuild/netbsd-arm64" "0.25.12"
- "@esbuild/netbsd-x64" "0.25.12"
- "@esbuild/openbsd-arm64" "0.25.12"
- "@esbuild/openbsd-x64" "0.25.12"
- "@esbuild/openharmony-arm64" "0.25.12"
- "@esbuild/sunos-x64" "0.25.12"
- "@esbuild/win32-arm64" "0.25.12"
- "@esbuild/win32-ia32" "0.25.12"
- "@esbuild/win32-x64" "0.25.12"
-
-"esbuild@npm:esbuild@>=0.17.6 <0.29.0":
- version "0.28.0"
- resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.28.0.tgz#5dee347ffb3e3874212a35a69836b077b1ce6d96"
- integrity sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==
- optionalDependencies:
- "@esbuild/aix-ppc64" "0.28.0"
- "@esbuild/android-arm" "0.28.0"
- "@esbuild/android-arm64" "0.28.0"
- "@esbuild/android-x64" "0.28.0"
- "@esbuild/darwin-arm64" "0.28.0"
- "@esbuild/darwin-x64" "0.28.0"
- "@esbuild/freebsd-arm64" "0.28.0"
- "@esbuild/freebsd-x64" "0.28.0"
- "@esbuild/linux-arm" "0.28.0"
- "@esbuild/linux-arm64" "0.28.0"
- "@esbuild/linux-ia32" "0.28.0"
- "@esbuild/linux-loong64" "0.28.0"
- "@esbuild/linux-mips64el" "0.28.0"
- "@esbuild/linux-ppc64" "0.28.0"
- "@esbuild/linux-riscv64" "0.28.0"
- "@esbuild/linux-s390x" "0.28.0"
- "@esbuild/linux-x64" "0.28.0"
- "@esbuild/netbsd-arm64" "0.28.0"
- "@esbuild/netbsd-x64" "0.28.0"
- "@esbuild/openbsd-arm64" "0.28.0"
- "@esbuild/openbsd-x64" "0.28.0"
- "@esbuild/openharmony-arm64" "0.28.0"
- "@esbuild/sunos-x64" "0.28.0"
- "@esbuild/win32-arm64" "0.28.0"
- "@esbuild/win32-ia32" "0.28.0"
- "@esbuild/win32-x64" "0.28.0"
+ "@esbuild/aix-ppc64" "0.28.1"
+ "@esbuild/android-arm" "0.28.1"
+ "@esbuild/android-arm64" "0.28.1"
+ "@esbuild/android-x64" "0.28.1"
+ "@esbuild/darwin-arm64" "0.28.1"
+ "@esbuild/darwin-x64" "0.28.1"
+ "@esbuild/freebsd-arm64" "0.28.1"
+ "@esbuild/freebsd-x64" "0.28.1"
+ "@esbuild/linux-arm" "0.28.1"
+ "@esbuild/linux-arm64" "0.28.1"
+ "@esbuild/linux-ia32" "0.28.1"
+ "@esbuild/linux-loong64" "0.28.1"
+ "@esbuild/linux-mips64el" "0.28.1"
+ "@esbuild/linux-ppc64" "0.28.1"
+ "@esbuild/linux-riscv64" "0.28.1"
+ "@esbuild/linux-s390x" "0.28.1"
+ "@esbuild/linux-x64" "0.28.1"
+ "@esbuild/netbsd-arm64" "0.28.1"
+ "@esbuild/netbsd-x64" "0.28.1"
+ "@esbuild/openbsd-arm64" "0.28.1"
+ "@esbuild/openbsd-x64" "0.28.1"
+ "@esbuild/openharmony-arm64" "0.28.1"
+ "@esbuild/sunos-x64" "0.28.1"
+ "@esbuild/win32-arm64" "0.28.1"
+ "@esbuild/win32-ia32" "0.28.1"
+ "@esbuild/win32-x64" "0.28.1"
escalade@^3.2.0:
version "3.2.0"
@@ -2822,11 +2609,6 @@ espree@^11.2.0:
acorn-jsx "^5.3.2"
eslint-visitor-keys "^5.0.1"
-esprima@^4.0.0:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
- integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
estree-walker@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
@@ -2860,7 +2642,7 @@ fast-equals@^4.0.3:
resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-4.0.3.tgz#72884cc805ec3c6679b99875f6b7654f39f0e8c7"
integrity sha512-G3BSX9cfKttjr+2o1O22tYMLq0DPluZnYtq1rXumE1SpL/F/SLIfHx08WYQoWSIpeMYf8sRbJ8++71+v6Pnxfg==
-fdir@^6.4.3, fdir@^6.4.4, fdir@^6.5.0:
+fdir@^6.4.3, fdir@^6.5.0:
version "6.5.0"
resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350"
integrity sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==
@@ -3181,11 +2963,6 @@ is-core-module@^2.16.1:
dependencies:
hasown "^2.0.3"
-is-docker@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200"
- integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==
-
is-extglob@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -3203,13 +2980,6 @@ is-glob@^4.0.1, is-glob@~4.0.1:
dependencies:
is-extglob "^2.1.1"
-is-inside-container@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4"
- integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==
- dependencies:
- is-docker "^3.0.0"
-
is-interactive@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
@@ -3245,23 +3015,11 @@ is-windows@^1.0.2:
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-is-wsl@^3.1.0:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-3.1.1.tgz#327897b26832a3eb117da6c27492d04ca132594f"
- integrity sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==
- dependencies:
- is-inside-container "^1.0.0"
-
isexe@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-isexe@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/isexe/-/isexe-4.0.0.tgz#48f6576af8e87a18feb796b7ed5e2e5903b43dca"
- integrity sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==
-
istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
version "3.2.2"
resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
@@ -3366,15 +3124,7 @@ js-sha256@^0.10.1:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-js-yaml@^3.13.1:
- version "3.14.2"
- resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.2.tgz#77485ce1dd7f33c061fd1b16ecea23b55fcb04b0"
- integrity sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==
- dependencies:
- argparse "^1.0.7"
- esprima "^4.0.0"
-
-js-yaml@^4.1.0:
+js-yaml@^3.13.1, js-yaml@^4, js-yaml@^4.1.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.2.0.tgz#2bd9e85682dd91bd469afb809d816043b3d49524"
integrity sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==
@@ -3628,9 +3378,9 @@ ms@^2.1.3:
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
nanoid@^3.3.12:
- version "3.3.12"
- resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.12.tgz#ab3d912e217a6d0a514f00a72a16543a28982c05"
- integrity sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==
+ version "3.3.15"
+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.15.tgz#36c490fad8c6e86c824c940dfdde999b69ed4316"
+ integrity sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==
node-preload@^0.2.1:
version "0.2.1"
@@ -3704,16 +3454,6 @@ onetime@^5.1.0:
dependencies:
mimic-fn "^2.1.0"
-open@^10.2.0:
- version "10.2.0"
- resolved "https://registry.yarnpkg.com/open/-/open-10.2.0.tgz#b9d855be007620e80b6fb05fac98141fe62db73c"
- integrity sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==
- dependencies:
- default-browser "^5.2.1"
- define-lazy-prop "^3.0.0"
- is-inside-container "^1.0.0"
- wsl-utils "^0.1.0"
-
ora@^5.1.0:
version "5.4.1"
resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
@@ -3928,7 +3668,7 @@ postcss-value-parser@^4.0.2:
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
-postcss@^8.5.3:
+postcss@^8.5.6:
version "8.5.15"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.15.tgz#d1eaf677a324e9ec02196da2d3fecf4a0b9a735c"
integrity sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==
@@ -4297,45 +4037,40 @@ rollup-plugin-license@^3.7.1:
spdx-expression-validate "^2.0.0"
spdx-satisfies "^5.0.1"
-rollup@^4.34.9, rollup@^4.61.1:
- version "4.61.1"
- resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.61.1.tgz#4a053204912e9083e51cb3a0bf02ffdc397264fb"
- integrity sha512-I4KW6iuRpuu2uHBLraZ1wNZe0DP7lnRha+VJ9tNaYVaVgKhW0aI3h4RYnoRPeql0flHm/Co55b7snEDcOfOJrA==
+rollup@^4.43.0, rollup@^4.61.1:
+ version "4.62.2"
+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.62.2.tgz#d90fc4cb811f071303c890b779595634f35f9541"
+ integrity sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==
dependencies:
"@types/estree" "1.0.9"
optionalDependencies:
- "@rollup/rollup-android-arm-eabi" "4.61.1"
- "@rollup/rollup-android-arm64" "4.61.1"
- "@rollup/rollup-darwin-arm64" "4.61.1"
- "@rollup/rollup-darwin-x64" "4.61.1"
- "@rollup/rollup-freebsd-arm64" "4.61.1"
- "@rollup/rollup-freebsd-x64" "4.61.1"
- "@rollup/rollup-linux-arm-gnueabihf" "4.61.1"
- "@rollup/rollup-linux-arm-musleabihf" "4.61.1"
- "@rollup/rollup-linux-arm64-gnu" "4.61.1"
- "@rollup/rollup-linux-arm64-musl" "4.61.1"
- "@rollup/rollup-linux-loong64-gnu" "4.61.1"
- "@rollup/rollup-linux-loong64-musl" "4.61.1"
- "@rollup/rollup-linux-ppc64-gnu" "4.61.1"
- "@rollup/rollup-linux-ppc64-musl" "4.61.1"
- "@rollup/rollup-linux-riscv64-gnu" "4.61.1"
- "@rollup/rollup-linux-riscv64-musl" "4.61.1"
- "@rollup/rollup-linux-s390x-gnu" "4.61.1"
- "@rollup/rollup-linux-x64-gnu" "4.61.1"
- "@rollup/rollup-linux-x64-musl" "4.61.1"
- "@rollup/rollup-openbsd-x64" "4.61.1"
- "@rollup/rollup-openharmony-arm64" "4.61.1"
- "@rollup/rollup-win32-arm64-msvc" "4.61.1"
- "@rollup/rollup-win32-ia32-msvc" "4.61.1"
- "@rollup/rollup-win32-x64-gnu" "4.61.1"
- "@rollup/rollup-win32-x64-msvc" "4.61.1"
+ "@rollup/rollup-android-arm-eabi" "4.62.2"
+ "@rollup/rollup-android-arm64" "4.62.2"
+ "@rollup/rollup-darwin-arm64" "4.62.2"
+ "@rollup/rollup-darwin-x64" "4.62.2"
+ "@rollup/rollup-freebsd-arm64" "4.62.2"
+ "@rollup/rollup-freebsd-x64" "4.62.2"
+ "@rollup/rollup-linux-arm-gnueabihf" "4.62.2"
+ "@rollup/rollup-linux-arm-musleabihf" "4.62.2"
+ "@rollup/rollup-linux-arm64-gnu" "4.62.2"
+ "@rollup/rollup-linux-arm64-musl" "4.62.2"
+ "@rollup/rollup-linux-loong64-gnu" "4.62.2"
+ "@rollup/rollup-linux-loong64-musl" "4.62.2"
+ "@rollup/rollup-linux-ppc64-gnu" "4.62.2"
+ "@rollup/rollup-linux-ppc64-musl" "4.62.2"
+ "@rollup/rollup-linux-riscv64-gnu" "4.62.2"
+ "@rollup/rollup-linux-riscv64-musl" "4.62.2"
+ "@rollup/rollup-linux-s390x-gnu" "4.62.2"
+ "@rollup/rollup-linux-x64-gnu" "4.62.2"
+ "@rollup/rollup-linux-x64-musl" "4.62.2"
+ "@rollup/rollup-openbsd-x64" "4.62.2"
+ "@rollup/rollup-openharmony-arm64" "4.62.2"
+ "@rollup/rollup-win32-arm64-msvc" "4.62.2"
+ "@rollup/rollup-win32-ia32-msvc" "4.62.2"
+ "@rollup/rollup-win32-x64-gnu" "4.62.2"
+ "@rollup/rollup-win32-x64-msvc" "4.62.2"
fsevents "~2.3.2"
-run-applescript@^7.0.0:
- version "7.1.0"
- resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-7.1.0.tgz#2e9e54c4664ec3106c5b5630e249d3d6595c4911"
- integrity sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==
-
safe-buffer@~5.2.0:
version "5.2.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
@@ -4352,9 +4087,9 @@ semver@^6.0.0, semver@^6.3.1:
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
semver@^7.5.3, semver@^7.5.4:
- version "7.8.3"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.8.3.tgz#c350de61c2a1ddbc96d7fae3e5b6fcf92d477fbe"
- integrity sha512-wnilbGyMxzbY7dNOl7jpKbLSjcfeweJWU5j4+u5qW+6/wuGD9KzIGOyZnQVSBM9E7DtWaaH3CyHkppYrKYoxwg==
+ version "7.8.4"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.8.4.tgz#c73eceebae0616934be8dff28a7fd70757c8e696"
+ integrity sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==
set-blocking@^2.0.0:
version "2.0.0"
@@ -4469,16 +4204,6 @@ spdx-satisfies@^5.0.1:
spdx-expression-parse "^3.0.0"
spdx-ranges "^2.0.0"
-sprintf-js@~1.0.2:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
- integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
-
-stable-hash@^0.0.6:
- version "0.0.6"
- resolved "https://registry.yarnpkg.com/stable-hash/-/stable-hash-0.0.6.tgz#7dd2cb7c71c2526b0d089b6bf0d1fcef38a6f97e"
- integrity sha512-0afH4mobqTybYZsXImQRLOjHV4gvOW+92HdUIax9t7a8d9v54KWykEuMVIcXhD9BCi+w3kS4x7O6fmZQ3JlG/g==
-
string-width@^4.1.0, string-width@^4.2.0:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -4587,7 +4312,7 @@ tiny-invariant@^1.3.3:
dependencies:
esm "^3.2.25"
-tinyglobby@^0.2.13:
+tinyglobby@^0.2.15:
version "0.2.17"
resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.17.tgz#562a9a6c9eb2b3b123d39719f9af5bb44fcd7631"
integrity sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==
@@ -4821,17 +4546,17 @@ vite-plugin-istanbul@^9.0.1:
source-map "^0.7.6"
test-exclude "^8.0.0"
-"vite@^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0", vite@^6.4.2, vite@^8.0.0:
- version "6.4.3"
- resolved "https://registry.yarnpkg.com/vite/-/vite-6.4.3.tgz#85a164db7ce706f2a776812efa2b340f1721858e"
- integrity sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A==
+"vite@^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0", vite@^7, vite@^7.0.0, vite@^8.0.0:
+ version "7.3.5"
+ resolved "https://registry.yarnpkg.com/vite/-/vite-7.3.5.tgz#90c2d0b7b94a224e7e7dcf22d2912ff0b5291165"
+ integrity sha512-KuOaNhcnGFN2zIPGA7wRmzF+lJA1sea7rHq17aiJ++9lzY1WWG6Jpwqwe1KNbRVPIqHmr8GLYx7jbrQcN/7/ww==
dependencies:
- esbuild "^0.25.0"
- fdir "^6.4.4"
- picomatch "^4.0.2"
- postcss "^8.5.3"
- rollup "^4.34.9"
- tinyglobby "^0.2.13"
+ esbuild "^0.27.0"
+ fdir "^6.5.0"
+ picomatch "^4.0.3"
+ postcss "^8.5.6"
+ rollup "^4.43.0"
+ tinyglobby "^0.2.15"
optionalDependencies:
fsevents "~2.3.3"
@@ -4869,13 +4594,6 @@ which@^2.0.1:
dependencies:
isexe "^2.0.0"
-which@^6.0.1:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/which/-/which-6.0.1.tgz#021642443a198fb93b784a5606721cb18cfcbfce"
- integrity sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==
- dependencies:
- isexe "^4.0.0"
-
wrap-ansi@^6.2.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
@@ -4895,13 +4613,6 @@ write-file-atomic@^3.0.0:
signal-exit "^3.0.2"
typedarray-to-buffer "^3.1.5"
-wsl-utils@^0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/wsl-utils/-/wsl-utils-0.1.0.tgz#8783d4df671d4d50365be2ee4c71917a0557baab"
- integrity sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==
- dependencies:
- is-wsl "^3.1.0"
-
y18n@^4.0.0:
version "4.0.3"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
@@ -4952,11 +4663,6 @@ zod@^3.22.4:
resolved "https://registry.yarnpkg.com/zod/-/zod-3.25.76.tgz#26841c3f6fd22a6a2760e7ccb719179768471e34"
integrity sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==
-zod@^4.3.5:
- version "4.4.3"
- resolved "https://registry.yarnpkg.com/zod/-/zod-4.4.3.tgz#b680f172885d18bbebf21a834ea25e55a1bbf356"
- integrity sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==
-
zustand@^5.0.14:
version "5.0.14"
resolved "https://registry.yarnpkg.com/zustand/-/zustand-5.0.14.tgz#18216c24fcb980cf36898f9c57520e67b1f77855"