Neil Beukes 4cfefc18c1 Allow stock transfer to merge into existing stock (optional) #6951 (#12022) ... * 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>		2026-06-25 00:24:33 +10:00
..
api	Transfer Order (#11281)	2026-05-22 17:08:40 +10:00
app	Update to /api/barcode/po-recieve/ error messages (#11369)	2026-05-31 18:45:23 +10:00
assets	[UI] Tree improvements (#12204)	2026-06-19 15:33:12 +10:00
barcodes	Barcode scan tweaks (#10992)	2025-12-11 16:19:47 +11:00
concepts	Report locale updates (#12208)	2026-06-20 11:00:12 +10:00
develop	Small docs changes (formatting) (#12073)	2026-06-03 12:01:43 +10:00
javascripts	feat(docs): add architecture/roadmap (#9624)	2025-06-13 11:28:02 +10:00
manufacturing	[Feature] SalesOrder Auto-Allocate (#12000)	2026-05-26 23:21:06 +10:00
part	[docs] Update documentation (#11997)	2026-05-24 10:05:06 +10:00
plugins	extend barcode scans API (#12233)	2026-06-24 10:45:26 +10:00
project	docs: rename ressouce details (#12005)	2026-05-26 13:07:04 +10:00
purchasing	[docs] Docs updates (#10678)	2025-10-26 17:16:59 +11:00
releases	[plugin] Auto issue orders (#9565)	2025-06-03 17:07:12 +10:00
report	Report locale updates (#12208)	2026-06-20 11:00:12 +10:00
sales	[Feature] SalesOrder Auto-Allocate (#12000)	2026-05-26 23:21:06 +10:00
settings	Allow stock transfer to merge into existing stock (optional) #6951 (#12022)	2026-06-25 00:24:33 +10:00
start	!feat(backend): bump minimum python version (#12223)	2026-06-24 17:42:35 +10:00
stock	Count to location (#12019)	2026-05-27 23:41:40 +10:00
stylesheets	Render API docs (#6463)	2024-03-02 11:28:37 +11:00
webfonts	Documentation integration (#4653)	2023-04-22 22:40:29 +10:00
__init__.py	Fixes for docs building (#4659)	2023-04-22 23:35:25 +10:00
demo.md	Invoke docs (#8373)	2024-10-27 10:51:51 +11:00
faq.md	Small docs changes (formatting) (#12073)	2026-06-03 12:01:43 +10:00
hooks.py	!feat(backend): bump minimum python version (#12223)	2026-06-24 17:42:35 +10:00
index.md	Docs refactor (#9545)	2025-04-22 08:18:32 +10:00
privacy.md	Documentation integration (#4653)	2023-04-22 22:40:29 +10:00
security.md	sqlite limitation docs (#12003)	2026-05-26 07:03:38 +10:00
troubleshooting.md	Docs updates (#10912)	2025-11-26 21:27:13 +11:00