| 
							
							
								 Oliver | 8d04acd5f5 | Merge pull request #1846 from matmair/bom-internal Allow BOM pricing to be valid when using internal pricing - style fix | 2021-07-20 07:53:43 +10:00 |  | 
			
				
					| 
							
							
								 Matthias Mair | ebb202b19b | Merge branch 'inventree:master' into search-autocomplete | 2021-07-19 23:39:16 +02:00 |  | 
			
				
					| 
							
							
								 Oliver | 5f48c8c95a | Fix: New translations django.po from Crowdin | 2021-07-20 07:19:48 +10:00 |  | 
			
				
					| 
							
							
								 eeintech | 456710c5ce | clean_decimal should also check if the string can be converted to Decimal type | 2021-07-19 15:57:51 -04:00 |  | 
			
				
					| 
							
							
								 Matthias Mair | c2ce569506 | Merge branch 'inventree:master' into bom-internal | 2021-07-19 21:51:18 +02:00 |  | 
			
				
					| 
							
							
								 eeintech | 53f2aa107a | Umm watch out for the true fix! | 2021-07-19 15:51:04 -04:00 |  | 
			
				
					|  | 8d2e910323 | style fix | 2021-07-19 21:50:06 +02:00 |  | 
			
				
					| 
							
							
								 eeintech | 9acd57f8e0 | CI was not completely fixed | 2021-07-19 15:29:04 -04:00 |  | 
			
				
					| 
							
							
								 eeintech | c1db4c7b3d | Try to catch encoding error, fixed CI | 2021-07-19 15:14:08 -04:00 |  | 
			
				
					| 
							
							
								 eeintech | 3ab058e84b | Fixed default currency selection | 2021-07-19 14:49:55 -04:00 |  | 
			
				
					| 
							
							
								 eeintech | 23db7a89a9 | Updated PO upload template, moved call to button, improved cleaned_decimal method to handle comma separator | 2021-07-19 14:20:54 -04:00 |  | 
			
				
					| 
							
							
								 Oliver Walters | 886f300cc1 | Merge remote-tracking branch 'upstream/l10_crowdin' into l10 # Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po | 2021-07-19 18:38:42 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | dddd794eb9 | Fix: New translations django.po from Crowdin | 2021-07-19 17:47:39 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 29544236ae | Fix: New translations django.po from Crowdin | 2021-07-19 17:47:37 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 0b199de29e | Fix: New translations django.po from Crowdin | 2021-07-19 17:47:36 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | bbd6527b31 | Fix: New translations django.po from Crowdin | 2021-07-19 17:47:34 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | c4331cd4d7 | Fix: New translations django.po from Crowdin | 2021-07-19 17:47:33 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 7fd51b322f | Fix: New translations django.po from Crowdin | 2021-07-19 17:47:32 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 1c58685e4f | Fix: New translations django.po from Crowdin | 2021-07-19 17:47:31 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 7f6c106618 | Fix: New translations django.po from Crowdin | 2021-07-19 17:47:29 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 92fcd57f5f | Fix: New translations django.po from Crowdin | 2021-07-19 17:47:28 +10:00 |  | 
			
				
					| 
							
							
								![github-actions[bot]](/avatar/af2ab225b7c0eec44a8d0eba6b5c869a?size=56) github-actions[bot] | 1c53bc6ae1 | updated translation base | 2021-07-19 07:46:21 +00:00 |  | 
			
				
					| 
							
							
								 Oliver | af68ea23c3 | Merge pull request #1843 from SchrodingersGat/stock-export Stock export | 2021-07-19 17:45:11 +10:00 |  | 
			
				
					| 
							
							
								![github-actions[bot]](/avatar/af2ab225b7c0eec44a8d0eba6b5c869a?size=56) github-actions[bot] | a033b075db | updated translation base | 2021-07-19 07:25:11 +00:00 |  | 
			
				
					| 
							
							
								 Oliver | ca36775f62 | Merge pull request #1842 from SchrodingersGat/installed-items Add "installed_items" as a context variable to TestReport | 2021-07-19 17:23:56 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 4413699844 | PEP fixes | 2021-07-19 17:23:51 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | efb4f194b6 | Refactor StockExportOptions form | 2021-07-19 17:23:18 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 87d4a51575 | Add "installed items" section to default TestReport | 2021-07-19 16:44:56 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 4fdb18318a | Add "installed_items" as a context variable to the StockItem TestReport template | 2021-07-19 16:32:36 +10:00 |  | 
			
				
					| 
							
							
								![github-actions[bot]](/avatar/af2ab225b7c0eec44a8d0eba6b5c869a?size=56) github-actions[bot] | ab60c030ff | updated translation base | 2021-07-19 05:58:04 +00:00 |  | 
			
				
					|  | 1d549bcdbd | style fix | 2021-07-19 07:56:55 +02:00 |  | 
			
				
					| 
							
							
								 Oliver | e7d9485c16 | Merge pull request #1841 from SchrodingersGat/api-bump 0.3.1 | 2021-07-19 15:56:39 +10:00 |  | 
			
				
					|  | 43f1e2b8f9 | switching back to using extensive apis for search | 2021-07-19 07:54:12 +02:00 |  | 
			
				
					| 
							
							
								 Oliver | 5559db75e6 | Fix: New translations django.po from Crowdin | 2021-07-19 15:28:16 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 96e26afa9b | Fix: New translations django.po from Crowdin | 2021-07-19 15:28:14 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 3fdf48b972 | Fix: New translations django.po from Crowdin | 2021-07-19 15:28:13 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | b35df40cf2 | Fix: New translations django.po from Crowdin | 2021-07-19 15:28:12 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | a7cd34c81b | Fix: New translations django.po from Crowdin | 2021-07-19 15:28:09 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | c02173e558 | Fix: New translations django.po from Crowdin | 2021-07-19 15:28:08 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | f6463086eb | Fix: New translations django.po from Crowdin | 2021-07-19 15:28:06 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 76b2162a04 | Fix: New translations django.po from Crowdin | 2021-07-19 15:28:05 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 1c843671e9 | Fix: New translations django.po from Crowdin | 2021-07-19 15:28:04 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | e04bbb016d | 0.3.1 Bumped API version to 8 | 2021-07-19 15:10:57 +10:00 |  | 
			
				
					| 
							
							
								![github-actions[bot]](/avatar/af2ab225b7c0eec44a8d0eba6b5c869a?size=56) github-actions[bot] | f894f2cab9 | updated translation base | 2021-07-19 05:04:50 +00:00 |  | 
			
				
					| 
							
							
								 Oliver | 44d45050b9 | Merge pull request #1840 from SchrodingersGat/bom-table-fix Fix duplicate table naming | 2021-07-19 15:03:31 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 40c203c123 | Ensure BOM pricing table is loaded | 2021-07-19 14:40:02 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | bbada3e873 | Fix duplicate table naming | 2021-07-19 14:34:58 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | bf20e3906a | Fix: New translations django.po from Crowdin | 2021-07-19 12:21:32 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 78d4f8a4a7 | Fix: New translations django.po from Crowdin | 2021-07-19 12:21:31 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 642d670b54 | Fix: New translations django.po from Crowdin | 2021-07-19 12:21:29 +10:00 |  |