5526 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Oliver Walters	61629eac2a	Merge remote-tracking branch 'inventree/master'	2021-05-29 18:39:58 +10:00
Oliver	b94c0b6d9b	Merge pull request #1619 from SchrodingersGat/docker-publish ... Tag with release tag	2021-05-29 18:24:57 +10:00
Oliver Walters	8d33dc5795	Tag with release tag	2021-05-29 17:48:40 +10:00
Oliver	878e9c1e8a	Update version.py ... Bump to v2.2	2021-05-29 17:35:05 +10:00
Oliver	0995ccee67	L10 merge master (#1617) ... * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * Adds a commit message * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * updated translation base * updated translation base * updated translation base * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * updated translation base * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * updated translation base * New Crowdin updates (#1551) * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * New Crowdin updates (#1552) * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * New Crowdin updates (#1568) * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * New Crowdin updates (#1570) * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * updated translation base * updated translation base * Trans merge fix (#1599) * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * New Crowdin updates (#1597) * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * Update github actions * L10 merge fix (#1614) * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Update github actions (cherry picked from commit d9bbebddb0) * New Crowdin updates (#1603) * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Update github actions (cherry picked from commit d9bbebddb0) * updated translation base Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2021-05-29 17:33:07 +10:00
Oliver	7f58d95254	Merge pull request #1482 from matmair/price-history ... Stock price history	2021-05-29 17:27:51 +10:00
Matthias Mair	9cc81df276	Merge branch 'inventree:master' into price-history	2021-05-28 12:14:03 +02:00
Oliver Walters	e0bbd23d14	Merge remote-tracking branch 'inventree/master'	2021-05-28 17:26:14 +10:00
Oliver	723a900388	Merge pull request #1613 from SchrodingersGat/actions ... Ignore actions for l10 branches	2021-05-28 14:34:08 +10:00
Oliver	4c78f88aa3	Merge pull request #1612 from SchrodingersGat/exchange-fixes ... Remove debug message	2021-05-28 13:26:14 +10:00
Oliver Walters	b716312438	Ignore actions for l10 branches	2021-05-28 13:24:18 +10:00
Oliver Walters	be6e2aa276	Better exception handling	2021-05-28 13:02:34 +10:00
Oliver Walters	7832ccccc2	Check if database tables are ready	2021-05-28 12:54:55 +10:00
Oliver	70e13e4cae	Merge pull request #1581 from eeintech/bom_items_purchase_price ... Added purchase price range and average to BOM items/view	2021-05-28 12:50:31 +10:00
Oliver Walters	0978235370	Fix?	2021-05-28 12:49:50 +10:00
Oliver Walters	4ddeab3330	Update exchange rates when launching the server ... - Ensures that the exchange rates don't get messed up if the base currency is changed!	2021-05-28 12:44:39 +10:00
Oliver Walters	52fc698b51	Remove debug message	2021-05-28 12:07:53 +10:00
eeintech	cdb453b09c	Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price	2021-05-27 10:20:40 -04:00
Oliver	59aca2791a	Merge pull request #1611 from SchrodingersGat/exchange-simplification ... Exchange simplification	2021-05-27 17:10:30 +10:00
Oliver Walters	c71f4ed045	Add currency exchange unit tests	2021-05-27 16:48:13 +10:00
Oliver Walters	4520bb7447	PEP style fixes	2021-05-27 16:36:26 +10:00
Oliver Walters	6085478672	Simplify settings view ... - Show various currency exchange rates - Button to "refresh now"	2021-05-27 16:34:37 +10:00
Oliver Walters	af1904b6e4	Simplify exhange rate backend	2021-05-27 15:45:38 +10:00
Oliver	62320e46d5	Merge pull request #1610 from SchrodingersGat/template-fix ... Bug fix for template	2021-05-27 13:24:08 +10:00
Oliver Walters	2a64e4a309	Bug fix for template	2021-05-27 13:23:20 +10:00
Oliver	8501aba368	Merge pull request #1609 from SchrodingersGat/variant-convert ... Expand possibilities for variant conversion	2021-05-27 13:18:48 +10:00
Oliver Walters	4abd3524b4	Looks like py-moneyed has been updated	2021-05-27 12:59:30 +10:00
Oliver Walters	4df7e53bb8	Add DEFAULT_CURRENCY option	2021-05-27 12:55:30 +10:00
Oliver Walters	c2fe5e08b4	Expand possibilities for variant conversion ... - Ref get_conversion_options	2021-05-27 12:35:55 +10:00
eeintech	bf83cfb04c	Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price	2021-05-26 09:28:55 -04:00
Oliver Walters	b8764c4d6d	Merge remote-tracking branch 'inventree/master'	2021-05-26 19:19:33 +10:00
Oliver	3a36e800c0	Merge pull request #1600 from eeintech/update_rates_manual ... Currencies settings and exchange rates list/refresh	2021-05-26 19:10:43 +10:00
eeintech	b04ad48178	Fixed test using manual exchange backend, template update	2021-05-25 11:39:04 -04:00
eeintech	93bfe4c5f1	Added 'Custom Exchange Rate' boolea setting ... Removed Fixer.io exchange rate backend	2021-05-25 11:19:07 -04:00
eeintech	654d4ecf46	Merged @SchrodingersGat ExchangeRateHost integration work	2021-05-25 10:34:20 -04:00
Francois	949920865b	Merge pull request #3 from matmair/pr1600 ... proposed changes for translation and safer backend loading	2021-05-25 08:56:59 -05:00
Oliver	500770d1bf	Merge pull request #1608 from SchrodingersGat/rate-update-fix ... Rate update fix	2021-05-25 14:33:38 +10:00
Oliver Walters	0a26a06909	Use INVENTREE_DEFAULT_CURRENCY as specified base currency	2021-05-25 10:46:30 +10:00
Oliver Walters	619cba6007	Currency: Use ExchangeRateHost backend by default, rather than fixer.io ... - No longer support fixer.io as it requires an API key and does not support "base" currency	2021-05-25 10:37:53 +10:00
Oliver Walters	9740740090	Merge remote-tracking branch 'inventree/master'	2021-05-25 10:32:09 +10:00
Oliver	817287a26c	Merge pull request #1607 from SchrodingersGat/docker-paths ... Docker: Add parent directories if they do not exist	2021-05-25 09:48:11 +10:00
Oliver Walters	ff80c722fb	Docker: Add parent directories if they do not exist	2021-05-25 09:32:21 +10:00
Matthias	b15c20611d	style	2021-05-24 22:45:00 +02:00
Matthias	b4c9edcd27	bom-price ranges as pie-chart	2021-05-24 22:31:33 +02:00
Matthias	3363969c17	added in randomColor for dynamic color gen	2021-05-24 19:14:38 +02:00
Matthias	206bab137b	refactor	2021-05-24 17:39:32 +02:00
Matthias	fe8e03c666	additional information for graph	2021-05-24 15:46:11 +02:00
Matthias	d5b2bfedbc	re-layouting tables	2021-05-24 02:18:34 +02:00
Matthias	25681fb805	style	2021-05-24 01:30:37 +02:00
Matthias	84d71d928f	removing new stuff in pricing modal	2021-05-24 01:14:15 +02:00