diff --git a/docs/docs/settings/global.md b/docs/docs/settings/global.md index 752ef1b910..f27e4b50df 100644 --- a/docs/docs/settings/global.md +++ b/docs/docs/settings/global.md @@ -224,6 +224,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/src/backend/InvenTree/InvenTree/api_version.py b/src/backend/InvenTree/InvenTree/api_version.py index 82d1c6dba3..5aeaa4e535 100644 --- a/src/backend/InvenTree/InvenTree/api_version.py +++ b/src/backend/InvenTree/InvenTree/api_version.py @@ -1,11 +1,16 @@ """InvenTree API version information.""" # InvenTree API version -INVENTREE_API_VERSION = 497 +INVENTREE_API_VERSION = 498 """Increment this API version number whenever there is a significant change to the API that any clients need to know about.""" INVENTREE_API_TEXT = """ +v498 -> 2026-06-01 : 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; + v497 -> 2026-05-27 : https://github.com/inventree/InvenTree/pull/12019 - Adds "location" field to StockCount API endpoint