100 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Oliver	ba3bcdba89	Add switchable columns to build output table	2022-04-28 15:50:10 +10:00
OliverandGitHub	e9500e4981	Merge pull request #2892 from SchrodingersGat/build-allocation-fix ... Fix part allocation check	2022-04-28 15:21:02 +10:00
Oliver	aec10e0cc7	Fix part allocation check	2022-04-28 14:58:05 +10:00
OliverandGitHub	5a77156051	Merge pull request #2886 from SchrodingersGat/remove-demo-mode ... Remove "demo mode"	2022-04-28 14:13:16 +10:00
Oliver	823be74f38	PEP fixes	2022-04-28 12:53:16 +10:00
OliverandGitHub	52aaa78bfe	Merge pull request #2888 from SchrodingersGat/null-label-fix ... Prevent "null" from being displayed as part units	2022-04-28 10:12:06 +10:00
Oliver	6e7b307423	Prevent "null" from being displayed as part units	2022-04-28 09:51:51 +10:00
Oliver Walters	4222b614fa	Remove stat context variables ... (cherry picked from commit 0989c308d0)	2022-04-28 01:21:23 +10:00
OliverandGitHub	110d5f066e	I18n merge (#2887) ... * 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-27 23:58:01 +10:00
OliverandGitHub	d5f503275a	Merge pull request #2865 from matmair/matmair/issue1693 ... Implement proxy based auth	2022-04-27 23:23:17 +10:00
Oliver Walters	e809fd9a2c	Remove database metrics from system info tab	2022-04-27 23:07:26 +10:00
Oliver Walters	fc3b062188	Mark injected strings as safe	2022-04-27 22:09:25 +10:00
Oliver Walters	518e0743cb	Updated config template	2022-04-27 22:05:25 +10:00
Oliver Walters	06da120ef3	Hide entry box for changing password	2022-04-27 22:03:55 +10:00
Oliver Walters	fc4de6c7b8	Remove other demo references	2022-04-27 22:00:58 +10:00
Oliver Walters	4a843908ec	Add customize option to hide admin link in user menu	2022-04-27 21:56:04 +10:00
OliverandGitHub	bb5734d1ef	Merge pull request #2861 from matmair/matmair/issue2301 ... [FR] White labeling	2022-04-27 21:49:15 +10:00
OliverandGitHub	bdf7fd5275	Merge pull request #2882 from SchrodingersGat/allocation-display ... Simplify allocation display for part page	2022-04-27 16:02:11 +10:00
Oliver	f98225334e	Simplify allocation display for part page	2022-04-27 15:36:44 +10:00
OliverandGitHub	5144821ba7	Merge pull request #2881 from SchrodingersGat/weasyprint ... Add gdk-pixbuf	2022-04-27 14:30:00 +10:00
Oliver	86f562f3b8	Add gdk-pixbuf ... - Required for weasyprint (reports) to render jpg files	2022-04-27 13:46:50 +10:00
OliverandGitHub	4afb07c764	Merge pull request #2880 from SchrodingersGat/build-stock-availability ... Visual improvements for build order stock allocation table	2022-04-27 10:18:34 +10:00
Oliver	481350b138	Refactor available quantity calculation for BOM table	2022-04-27 09:16:57 +10:00
Oliver	2a24fc43e7	Text formatting	2022-04-27 09:07:10 +10:00
Oliver	08ab99adc6	Build order table improvements: ... - Display tick / cross badge for stock availability in build order table - Correctly order available quantity	2022-04-27 09:04:57 +10:00
OliverandGitHub	01ce571a75	Merge pull request #2877 from matmair/matmair/issue2681 ... API Mixin cleanup	2022-04-27 08:42:10 +10:00
OliverandGitHub	fec43f126b	Merge pull request #2876 from SchrodingersGat/default-batch-code ... Default batch code	2022-04-26 20:47:28 +10:00
OliverandGitHub	e59c0f9d47	Merge pull request #2875 from SchrodingersGat/stock-tab-fix ... Re-enable the "pricing" tab	2022-04-26 20:29:26 +10:00
Oliver Walters	24da5d41b8	Add migration file	2022-04-26 20:21:15 +10:00
Oliver Walters	314cec5ad0	Generate default batch code for stock items	2022-04-26 20:18:33 +10:00
Oliver Walters	3f92f009e4	Add configurable setting for batch code generation	2022-04-26 20:00:06 +10:00
Oliver Walters	0b51ca2902	PEP fixes	2022-04-26 19:54:16 +10:00
Oliver Walters	7db11b627b	Refactor PartSalePriceBreak and PartInternalPriceBreak tables to use the API ... - Remove old server-side views - Simplify code	2022-04-26 19:53:09 +10:00
Oliver Walters	cb12222e17	Re-enable the "pricing" tab ... - Previously was gated entirely on the "PART_SHOW_PRICE_HISTORY" setting	2022-04-26 19:23:41 +10:00
OliverandGitHub	4c6c618af6	Merge pull request #2874 from SchrodingersGat/auto-allocate-fix ... Prevent inactive or trackable parts from being 'auto allocated'	2022-04-26 18:48:16 +10:00
OliverandGitHub	89b8d04ca4	Merge pull request #2833 from SchrodingersGat/variant-available ... Add 'available_variant_stock' to BomItem serializer	2022-04-26 18:47:56 +10:00
Oliver	3ef0386593	Prevent inactive or trackable parts from being 'auto allocated'	2022-04-26 17:14:47 +10:00
Oliver	ee47be4c9e	Add unit test for 'available_variant_stock' in BomItem API serializer	2022-04-26 17:05:21 +10:00
Oliver	7aaa4a5812	add unit tests for new variant_stock annotations	2022-04-26 16:39:03 +10:00
OliverandGitHub	c743ededf4	Merge pull request #2873 from SchrodingersGat/build-auto-allocate-fix ... Fix for 'auto-allocate' stock to build orders	2022-04-26 16:24:34 +10:00
Oliver	d4fc4bb8bd	Merge branch 'master' into variant-available ... # Conflicts: # InvenTree/InvenTree/api_version.py	2022-04-26 16:21:53 +10:00
Oliver	85fd247878	Fix for 'auto-allocate' stock to build orders ... - Allocation of serialized stock items would cause issue - Exclude serialized stock from auto allocation process	2022-04-26 15:54:03 +10:00
OliverandGitHub	2696f6bfbd	Merge pull request #2869 from SchrodingersGat/ipn-validator-fix ... Adds 'variant_of' filter back into Part API	2022-04-26 12:05:30 +10:00
Oliver	70d4960fa3	Add new unit tests for part API filters	2022-04-26 11:43:34 +10:00
OliverandGitHub	61a56be114	Merge pull request #2870 from SchrodingersGat/pt-br ... pt-br	2022-04-26 11:40:46 +10:00
Oliver	c705bb57c6	Fix language code	2022-04-26 11:16:55 +10:00
Oliver	64b1f56b98	Generate pt_br	2022-04-26 11:09:21 +10:00
Oliver	b5551a1ceb	Adds pt_br (brazillian)	2022-04-26 11:05:40 +10:00
Oliver	693e47ab89	Remove outdated filter_fields variable	2022-04-26 11:02:22 +10:00
Oliver	e1e0432963	Adds 'variant_of' filter back into Part API	2022-04-26 10:57:43 +10:00
OliverandGitHub	7ae9586c82	Merge pull request #2864 from matmair/remove-dead-code ... Remove dead code	2022-04-25 08:55:21 +10:00
OliverandGitHub	adfcd42e09	Merge pull request #2859 from SchrodingersGat/ipn-validator-fix ... IPN validator fix	2022-04-22 15:11:33 +10:00
Oliver	99718865c0	Further attempts to fix CI issues	2022-04-22 14:33:46 +10:00
Oliver	4994920119	Use recommended collation option	2022-04-22 13:48:15 +10:00
Oliver	fa3c24b085	Try a different collation option	2022-04-22 13:25:22 +10:00
Oliver	0806e18aca	Case sensitive collation	2022-04-22 12:39:42 +10:00
Oliver	2f1e869351	Only set collation option for mysql test database	2022-04-22 11:31:51 +10:00
Oliver	dc0f18d21f	Specify charset and collation options for the test database	2022-04-22 11:20:49 +10:00
Oliver Walters	5fde9f552c	Add similar check for IPN	2022-04-22 01:00:38 +10:00
Oliver Walters	292d28d378	Account for cases where serial number could be an integer!	2022-04-22 01:00:02 +10:00
Oliver Walters	aa4df62ac9	IPN fix	2022-04-22 00:40:23 +10:00
Oliver Walters	a7c18891b5	Increase unit testing for duplicate IPN testing ... - IPN duplication test is case sensitive!	2022-04-22 00:38:08 +10:00
Oliver Walters	9a9ed5f192	Fix validation of duplicate IPN ... - Duplicate IPN check does not apply if an empty IPN value is set - Note that "if x" is a more pythonic test than "if x not in [None, '']"	2022-04-22 00:36:30 +10:00
Oliver Walters	6dec8ba113	PEP fix	2022-04-22 00:24:25 +10:00
Oliver Walters	f504dfe797	part variant table now displays information about variant stock quantities	2022-04-22 00:20:32 +10:00
Oliver Walters	8b9aa86a0a	Add 'variant_stock' to Part API serializer	2022-04-22 00:14:37 +10:00
Oliver Walters	aa20d84cc1	Update javascript rendering in build table	2022-04-22 00:00:50 +10:00
Oliver Walters	ec34d23bfc	Update javascript rendering in BOM table	2022-04-21 23:58:12 +10:00
Oliver Walters	fa2510c42f	Use a proper queryset annotation to calculate the "available_variant_stock"	2022-04-21 23:53:03 +10:00
OliverandGitHub	42f0628a48	Merge pull request #2858 from SchrodingersGat/docker-init-fix ... Revert location of init.sh for Dockerfile	2022-04-21 22:29:36 +10:00
Oliver Walters	0cd5a2b005	Revert location of init.sh for Dockerfile	2022-04-21 20:17:12 +10:00
Oliver Walters	1d73f7c066	Update API version info	2022-04-21 20:14:46 +10:00
Oliver Walters	3b4d0c2f9c	Merge remote-tracking branch 'inventree/master' into variant-available ... # Conflicts: # InvenTree/InvenTree/version.py	2022-04-21 20:13:51 +10:00
OliverandGitHub	d647153cc2	Merge pull request #2856 from SchrodingersGat/docker-project-names ... Adds project names for docker-compose files	2022-04-21 12:30:07 +10:00
OliverandGitHub	60097ef57c	Merge pull request #2855 from SchrodingersGat/security-fix ... Security patch for django	2022-04-21 12:11:46 +10:00
Oliver	6d56dbd266	Adds project names for docker-compose files	2022-04-21 12:04:05 +10:00
Oliver	27c807492d	Security patch for django	2022-04-21 11:45:09 +10:00
OliverandGitHub	d9fcdf8253	Merge pull request #2852 from SchrodingersGat/docker-build-fix ... Add sqlite-config file back in	2022-04-21 02:01:11 +10:00
Oliver Walters	67196b866e	Compose script fixes ... - Define INVENTREE_DB_NAME - Cache built image	2022-04-21 01:13:34 +10:00
Oliver Walters	1ac8ae7697	No need to build docker test image on each pull request commit	2022-04-21 01:10:29 +10:00
Oliver Walters	a376625088	Force INVENTREE_DB_USER and INVENTREE_DB_PASSWORD to be set manually ... - Only for the "production" docker setup	2022-04-21 01:04:46 +10:00
Oliver Walters	ced9c6c050	Sqlite docker-compose file no longer requires .env file ... As this is only used for CI this is OK	2022-04-21 01:02:55 +10:00
OliverandGitHub	12ef35338f	Merge pull request #2851 from SchrodingersGat/czech-yourself ... Add Czech language support	2022-04-21 00:50:31 +10:00
Oliver Walters	0974fde59e	Add sqlite-config file back in ... - required for CI steps - might refactor this out later on	2022-04-21 00:34:24 +10:00
OliverandGitHub	b3d96801af	Merge pull request #2850 from SchrodingersGat/docker-refactor ... Docker refactor	2022-04-21 00:31:14 +10:00
Oliver Walters	2b8ddd58a8	Add initial translation files	2022-04-21 00:18:39 +10:00
Oliver Walters	7dce7779c3	cz -> cs	2022-04-21 00:14:38 +10:00
Oliver Walters	2144506745	Add language support for Czech	2022-04-21 00:12:53 +10:00
Oliver Walters	e15a4b73cd	Restore docker-compose.sqlite.yml ... This is used for docker build testing in CI!	2022-04-21 00:03:48 +10:00
Oliver Walters	0c93009bf7	Tweaks to dockerfile	2022-04-21 00:01:11 +10:00
Oliver Walters	6929d07f42	Cache the pre-built image ... - The worker container can then use it - Saves a *lot* of time (and otherwise wasted resources)	2022-04-20 23:52:56 +10:00
Oliver Walters	e87e478009	Fix env file reference for docker-compose.yml (development)	2022-04-20 23:34:50 +10:00
Oliver Walters	85feb30812	Refactor development docker-compose setup	2022-04-20 23:15:37 +10:00
Oliver Walters	0b3aac21ea	The production docker-compose file now no longer needs to be touched at all ... Everything can be specified in the .env file!	2022-04-20 22:46:25 +10:00
Oliver Walters	c3fff02bd8	Automatically create a database (with the correct name) when the db container is started!	2022-04-20 22:11:07 +10:00
Oliver Walters	a50f26e84d	Adjust naming of nginx production file	2022-04-20 21:52:25 +10:00
Oliver Walters	e4e735a71b	Refactoring docker-compose.postgresql.yml ... - Do not require duplication of username / password values - Specify different env file - Move to a new child directory which simplifies setup	2022-04-20 21:44:22 +10:00
Oliver Walters	f0a01587ac	Rename default docker-compose file	2022-04-20 21:18:12 +10:00
OliverandGitHub	aec7d2d0aa	Merge pull request #2842 from awiswasi/vulnerability-fix ... Fixed vulnerability in jquery-ui@1.12.1	2022-04-20 11:11:58 +10:00
OliverandGitHub	8d51c592e7	Merge pull request #2843 from matmair/plugin-mark-sample ... Mark sample plugins	2022-04-20 09:20:00 +10:00