inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-08-19 11:39:50 +00:00
Code Activity

Allow stock transfer to merge into existing stock (optional) #6951 (#12022)

Browse Source 
* working on merge transfer

* fix history when merging

* update messaging, add 'added' line in history

* reworked history logic

* removed old transfer logic

* remove formatting changes from vite file

* Bumped API version, added entry in docs for new global setting

* removed the tracking item overwrite, Use existing tracking event from transfer

* run pre-commit checks

---------

Co-authored-by: Matthias Mair <code@mjmair.com>
This commit is contained in:
Neil Beukes
2026-06-25 00:24:33 +10:00
committed by GitHub
co-authored by Matthias Mair
parent fa55917659
commit 4cfefc18c1
9 changed files with 366 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/docs/settings/global.md
+1
View File
@@ -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