12877 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Oliver	27dac5af97	Fix search errors ... - Do not show API error messages for requests which were intentionally aborted - Prevents a large number of error messages being displayed when search text is changed	2022-04-06 09:42:07 +10:00
Oliver	ac721a544d	Merge pull request #2803 from SchrodingersGat/barcode-fix ... Barcode scanning fixes	2022-04-06 09:27:42 +10:00
Matthias	b4654a7c71	add tests for email notification	2022-04-06 01:22:52 +02:00
Matthias	e1d261f989	pep fix	2022-04-05 23:47:26 +02:00
Matthias	77f5fa9360	pep fix	2022-04-05 23:45:35 +02:00
Matthias	f3aab952de	remove empty class	2022-04-05 23:43:50 +02:00
Matthias	47f9bd911a	add tests for notifications	2022-04-05 23:41:37 +02:00
Oliver Walters	dc2da4bcb9	BomItem API - improve annotation of available substitute stock quantity	2022-04-05 21:24:57 +10:00
Oliver Walters	30a4c38eb7	Ensure queryset is properly annotated for BomItem detail	2022-04-05 21:12:43 +10:00
Oliver Walters	e0acfe492b	Merge remote-tracking branch 'inventree/master' into bom-serializer-quantity	2022-04-05 19:49:06 +10:00
Matthias Mair	41b75e4928	Merge branch 'inventree:master' into matmair/issue2385	2022-04-05 02:05:05 +02:00
Matthias Mair	4ab27e5f3c	Merge branch 'inventree:master' into matmair/issue2694	2022-04-05 02:03:40 +02:00
Matthias Mair	ed60666695	Merge branch 'inventree:master' into matmair/issue2788	2022-04-05 02:03:37 +02:00
Matthias Mair	346327b545	Merge branch 'inventree:master' into plugin-mark-sample	2022-04-05 02:03:29 +02:00
Matthias	347be2aa3a	fix test	2022-04-05 01:58:28 +02:00
Matthias	5f4c8b3a3e	add icon support for user settings	2022-04-05 01:53:41 +02:00
Matthias	5b9f84a90f	fix test	2022-04-05 01:30:12 +02:00
Matthias	785cdc5267	patch loading methods for selective loading	2022-04-05 01:29:19 +02:00
Matthias	42f630cff1	fix tests ... due to changes in the loading mechansim they need to be fethced now	2022-04-05 01:10:52 +02:00
Matthias	ad9d067033	typo fix	2022-04-05 01:08:35 +02:00
Matthias	41ccacaa05	disable email by default	2022-04-05 00:56:13 +02:00
Matthias	32918348b9	fix docstrings	2022-04-05 00:55:53 +02:00
Matthias	7063db7a32	add missing model ruleset	2022-04-05 00:43:29 +02:00
Matthias	01fcc728ad	PEP fixes	2022-04-05 00:34:30 +02:00
Matthias	dc7b88515e	rename class to make it clearer	2022-04-05 00:27:13 +02:00
Matthias	2728bfab37	fix: add genericSettingClassMixin back in	2022-04-05 00:25:39 +02:00
Matthias	d634afad48	move to common/models	2022-04-05 00:24:55 +02:00
Matthias	352ab34eda	remove struc docstring	2022-04-05 00:23:30 +02:00