| 
							
							
								 Oliver Walters | 793638421b | Merge branch 'l10' of github.com:inventree/InvenTree into l10 | 2021-05-28 17:19:19 +10:00 |  | 
			
				
					| 
							
							
								 Oliver Walters | d9bbebddb0 | Update github actions | 2021-05-28 17:19:01 +10:00 |  | 
			
				
					| 
							
							
								![github-actions[bot]](/avatar/af2ab225b7c0eec44a8d0eba6b5c869a?size=56) github-actions[bot] | 8319e57532 | updated translation base | 2021-05-28 04:35:51 +00:00 |  | 
			
				
					| 
							
							
								 Oliver | 723a900388 | Merge pull request #1613 from SchrodingersGat/actions Ignore actions for l10 branches | 2021-05-28 14:34:08 +10:00 |  | 
			
				
					| 
							
							
								![github-actions[bot]](/avatar/af2ab225b7c0eec44a8d0eba6b5c869a?size=56) github-actions[bot] | c1bbaf98b5 | updated translation base | 2021-05-28 03:27:38 +00: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 |  | 
			
				
					| 
							
							
								![github-actions[bot]](/avatar/af2ab225b7c0eec44a8d0eba6b5c869a?size=56) github-actions[bot] | 1b668bf920 | updated translation base | 2021-05-28 02:51:33 +00: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 |  | 
			
				
					| 
							
							
								![github-actions[bot]](/avatar/af2ab225b7c0eec44a8d0eba6b5c869a?size=56) github-actions[bot] | 8181f0dafa | updated translation base | 2021-05-27 07:11:29 +00: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 |  | 
			
				
					| 
							
							
								![github-actions[bot]](/avatar/af2ab225b7c0eec44a8d0eba6b5c869a?size=56) github-actions[bot] | 81d2672df7 | updated translation base | 2021-05-27 03:25:15 +00: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 |  | 
			
				
					| 
							
							
								![github-actions[bot]](/avatar/af2ab225b7c0eec44a8d0eba6b5c869a?size=56) github-actions[bot] | 84c473ef0d | updated translation base | 2021-05-27 03:19:54 +00: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 |  | 
			
				
					|  | 9d5b90190b | style + merge fix | 2021-05-26 13:18:07 +02:00 |  | 
			
				
					| 
							
							
								 Matthias Mair | 859a3178a4 | Merge branch 'master' into part-import | 2021-05-26 13:08:58 +02:00 |  | 
			
				
					|  | 79374c5dfd | ajax implementation for part import | 2021-05-26 13:05:20 +02:00 |  | 
			
				
					|  | 421b0a896d | AjaxView for reuse of FormViews | 2021-05-26 13:04:21 +02:00 |  | 
			
				
					|  | 002706849c | enrich context with form if not set | 2021-05-26 12:20:37 +02:00 |  | 
			
				
					| 
							
							
								 Oliver Walters | b8764c4d6d | Merge remote-tracking branch 'inventree/master' | 2021-05-26 19:19:33 +10:00 |  | 
			
				
					| 
							
							
								![github-actions[bot]](/avatar/af2ab225b7c0eec44a8d0eba6b5c869a?size=56) github-actions[bot] | 70c131dca6 | updated translation base | 2021-05-26 09:12:19 +00: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 |  | 
			
				
					|  | 4319ba16af | Settings to show import-button | 2021-05-26 09:20:50 +02: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 |  | 
			
				
					| 
							
							
								![github-actions[bot]](/avatar/af2ab225b7c0eec44a8d0eba6b5c869a?size=56) github-actions[bot] | 6c62ee4548 | updated translation base | 2021-05-25 04:34:43 +00: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 |  | 
			
				
					| 
							
							
								![github-actions[bot]](/avatar/af2ab225b7c0eec44a8d0eba6b5c869a?size=56) github-actions[bot] | 9b02171681 | updated translation base | 2021-05-24 23:50:05 +00: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 |  |