13255 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Oliver	df2f7d195a	Merge pull request #2827 from SchrodingersGat/variant-stock ... Allocation quantity functions include variants	2022-04-14 12:26:17 +10:00
Oliver	41959eaaba	Merge pull request #2826 from SchrodingersGat/can-build ... Show "can build" detail even for template parts	2022-04-14 12:07:18 +10:00
Oliver	35aa5f25be	Allocation quantity functions include variants ... - For calculation of total "available_stock", variants are included - Update the allocation quantity functions to also include variants - Otherwise, the calculations are "out of sync"	2022-04-14 11:54:30 +10:00
Oliver	bcbfc9c292	Show "can build" detail even for template parts	2022-04-14 11:40:22 +10:00
Oliver	58d9ca93e0	Merge pull request #2825 from SchrodingersGat/trans-fix ... Fix templated string	2022-04-14 11:39:13 +10:00
Oliver	40d6a1470f	Tweak for part.js	2022-04-14 11:04:25 +10:00
Oliver	7335bfae19	Fix templated string	2022-04-14 10:59:52 +10:00
Oliver	bfb8e61df5	Merge pull request #2824 from matmair/patch-1 ... re-add plugin on startup switch	2022-04-14 09:49:39 +10:00
Matthias Mair	a6a03acf92	re-add plugin on startup switch	2022-04-14 01:22:09 +02:00
Oliver Walters	57546dd115	Merge remote-tracking branch 'inventree/master'	2022-04-13 21:56:32 +10:00
Oliver	0233aa8bee	I18n merge (#2821) ... * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin	2022-04-13 12:27:40 +10:00
Oliver	93257d547c	Merge pull request #2806 from SchrodingersGat/bom-serializer-quantity ... Bom serializer quantity	2022-04-13 07:43:25 +10:00
Oliver	fe8f5a74e7	Merge pull request #2816 from SchrodingersGat/markdown-editor ... Markdown editor	2022-04-10 22:44:57 +10:00
Oliver Walters	7276fafcc5	Unit test fix	2022-04-10 20:25:05 +10:00
Oliver Walters	9e59d90e0e	Pin bleach package version ... (cherry picked from commit 7af9e9123e)	2022-04-10 20:24:41 +10:00
Oliver Walters	c7257a1bd3	build order	2022-04-10 20:03:40 +10:00
Oliver Walters	1c60d4e152	Refactor notes for "purchase order"	2022-04-10 19:55:32 +10:00
Oliver Walters	df9c5c0048	Refactor notes editing for "StockItem"	2022-04-10 18:08:09 +10:00
Oliver Walters	e1784c93b2	Simplification	2022-04-10 18:03:19 +10:00
Oliver Walters	641785a02b	Refactor into a monolithic js function	2022-04-10 17:53:09 +10:00
Oliver Walters	957494f483	Custom headings	2022-04-10 16:29:31 +10:00
Oliver Walters	241e2e35c0	Display part notes inline, and allow updating via API	2022-04-10 15:58:36 +10:00
Oliver Walters	82b8230a7e	Prune some dead code	2022-04-10 15:36:27 +10:00
Oliver Walters	953c7bc7e4	Adds easymde (v2.16.1)	2022-04-10 15:34:02 +10:00
Oliver Walters	b7937a4750	Add some more unit tests for BOM API endpoints	2022-04-09 19:22:12 +10:00
Oliver Walters	7af9e9123e	Pin bleach package version	2022-04-09 19:15:21 +10:00
Oliver Walters	78ed5d9cc4	Some more API unit tests	2022-04-08 21:59:59 +10:00
Oliver Walters	8ab54c8e55	Add more unit tests	2022-04-08 21:39:41 +10:00
Matthias	3ffe51b4c3	Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2385	2022-04-08 01:58:17 +02:00
Matthias	ddcaecb11f	How did I miss this?	2022-04-07 23:39:05 +02:00
Oliver Walters	49f095b15c	Bump API version	2022-04-07 19:37:16 +10:00
Oliver Walters	be9648cbc7	Remove unused function which shadowed name of query annotation	2022-04-07 19:22:20 +10:00
Oliver Walters	e225d3b765	Fix action buttons in "part" table on category page	2022-04-07 19:09:43 +10:00
Oliver Walters	e1fbd961e5	Refactor form renderer functions	2022-04-07 19:05:25 +10:00
Oliver Walters	ed69f06620	Merge remote-tracking branch 'inventree/master' into order-parts-wizard	2022-04-07 18:54:00 +10:00
Oliver Walters	eef768e01f	Merge remote-tracking branch 'inventree/master' into bom-serializer-quantity	2022-04-07 18:53:43 +10:00
Oliver Walters	ba81e6caf9	Style fixes	2022-04-07 18:50:10 +10:00
Oliver Walters	f3075d2151	Build table now also shows availability of substitute stock	2022-04-07 18:48:23 +10:00
Oliver Walters	acc6cb8729	Fix calculation of "can_build"	2022-04-07 17:47:24 +10:00
Oliver Walters	6aceb24e41	Include available substitute stock when calculating total availability in BOM table	2022-04-07 17:45:11 +10:00
Oliver	d0fa40a408	Merge pull request #2812 from eeintech/fix_upload ... Fix part and po files import	2022-04-07 08:23:02 +10:00
Matthias	4c1a0ea9ce	mkae user setting access simpler	2022-04-06 23:58:11 +02:00
eeintech	ad366ef0bd	Fix part and po files import	2022-04-06 16:45:23 -04:00
Oliver Walters	e3186b5573	Merge remote-tracking branch 'inventree/master' into bom-serializer-quantity	2022-04-06 18:01:10 +10:00
Oliver	c31bbe5c42	Merge pull request #2809 from SchrodingersGat/fix-inactive-search ... Bug fix for "inverted" logic in search results	2022-04-06 12:46:18 +10:00
Oliver	24c64d7479	Bug fix for "inverted" logic when hiding inactive parts from search results	2022-04-06 12:21:19 +10:00
Oliver	b78407a7e8	Merge pull request #2808 from SchrodingersGat/cancel-requests ... Fix search errors	2022-04-06 10:38:03 +10:00
Matthias Mair	547c51b81b	pep fix	2022-04-06 01:47:11 +02:00
Matthias Mair	b087422290	add import back in	2022-04-06 01:45:19 +02:00
Matthias Mair	b53bf6de9c	pep fix	2022-04-06 01:42:24 +02:00