| 
							
							
								 Oliver Walters | 79c6e5cbf2 | Merge remote-tracking branch 'inventree/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-05-18 18:50:51 +10:00 |  | 
			
				
					|  | db9fd28276 | preparing stuff for gen get_field_selection() | 2021-05-18 10:48:29 +02:00 |  | 
			
				
					|  | 64f8846e99 | generalising for done() | 2021-05-18 10:47:56 +02:00 |  | 
			
				
					|  | ad4902ea44 | restucture | 2021-05-18 10:19:35 +02:00 |  | 
			
				
					|  | cb0ef30eff | form overrides | 2021-05-18 10:17:19 +02:00 |  | 
			
				
					|  | 92f8bd36f1 | inherited setup method | 2021-05-18 01:55:47 +02:00 |  | 
			
				
					|  | eafaf92ae2 | unified naming schema | 2021-05-18 01:02:31 +02:00 |  | 
			
				
					|  | 46723f42ca | Merge branch 'master' of https://github.com/inventree/InvenTree into part-import | 2021-05-18 00:57:10 +02:00 |  | 
			
				
					| 
							
							
								 Oliver | c31380ec6b | Fix: New translations django.po from Crowdin | 2021-05-18 00:58:49 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 69b935d97c | Fix: New translations django.po from Crowdin | 2021-05-17 20:47:43 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 2568299192 | Fix: New translations django.po from Crowdin | 2021-05-17 20:47:42 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | b7a8c2c5bd | Fix: New translations django.po from Crowdin | 2021-05-17 20:47:40 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | b2f568368d | Fix: New translations django.po from Crowdin | 2021-05-17 20:47:39 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 80cfa13377 | Fix: New translations django.po from Crowdin | 2021-05-17 20:47:37 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 25f8e3a2d3 | Fix: New translations django.po from Crowdin | 2021-05-17 20:47:36 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | e176bb1c80 | Fix: New translations django.po from Crowdin | 2021-05-17 20:47:34 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 8025e12b0d | Fix: New translations django.po from Crowdin | 2021-05-17 20:47:33 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | c2ea6a7cbc | Fix: New translations django.po from Crowdin | 2021-05-17 20:47:31 +10:00 |  | 
			
				
					| 
							
							
								![github-actions[bot]](/avatar/af2ab225b7c0eec44a8d0eba6b5c869a?size=56) github-actions[bot] | 87f4ce8c47 | updated translation base | 2021-05-17 10:46:13 +00:00 |  | 
			
				
					| 
							
							
								 Oliver | 56fd8132c7 | Merge pull request #1593 from SchrodingersGat/hide-purchase-price Disable "purchase price" field for non-purchaseable parts | 2021-05-17 20:45:06 +10:00 |  | 
			
				
					| 
							
							
								 Oliver Walters | 64c1503fe4 | Disable "purchase price" field for non-purchaseable parts | 2021-05-17 20:15:53 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | cf9bc5136d | Fix: New translations django.po from Crowdin | 2021-05-17 08:55:05 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | ae6c458e09 | Fix: New translations django.po from Crowdin | 2021-05-17 08:55:03 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | cdf2c1c4b2 | Fix: New translations django.po from Crowdin | 2021-05-17 08:55:02 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 6b9163fe4c | Fix: New translations django.po from Crowdin | 2021-05-17 08:55:00 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 8756a2ecef | Fix: New translations django.po from Crowdin | 2021-05-17 08:54:59 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 6aee171405 | Fix: New translations django.po from Crowdin | 2021-05-17 08:54:57 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 41a27203ff | Fix: New translations django.po from Crowdin | 2021-05-17 08:54:56 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 505b942bd1 | Fix: New translations django.po from Crowdin | 2021-05-17 08:54:54 +10:00 |  | 
			
				
					| 
							
							
								 Oliver | 7d29490c7e | Fix: New translations django.po from Crowdin | 2021-05-17 08:54:53 +10:00 |  | 
			
				
					| 
							
							
								![github-actions[bot]](/avatar/af2ab225b7c0eec44a8d0eba6b5c869a?size=56) github-actions[bot] | c17e586241 | updated translation base | 2021-05-16 22:53:54 +00:00 |  | 
			
				
					| 
							
							
								 Oliver | b3206f729e | Merge pull request #1591 from matmair/more-copy-info More copy info | 2021-05-17 08:52:27 +10:00 |  | 
			
				
					| 
							
							
								 Oliver Walters | 3b29cd4e6b | Merge remote-tracking branch 'inventree/master' | 2021-05-17 08:43:18 +10:00 |  | 
			
				
					|  | 508099e536 | style fixing | 2021-05-16 19:53:01 +02:00 |  | 
			
				
					|  | cfa6994302 | docker-mode in stats | 2021-05-16 18:20:32 +02:00 |  | 
			
				
					|  | ff9970f1cc | docker in version copy | 2021-05-16 18:20:06 +02:00 |  | 
			
				
					|  | b2a912c770 | docker-mode switch in settings and tags | 2021-05-16 18:19:35 +02:00 |  | 
			
				
					|  | 16b7d6c34d | database and debug info in version copy | 2021-05-16 18:18:58 +02:00 |  | 
			
				
					|  | 6c30d128a1 | removing duplicate information | 2021-05-16 17:33:24 +02:00 |  | 
			
				
					| 
							
							
								 Oliver | 271dad4cd9 | Fix: New translations django.po from Crowdin | 2021-05-17 00:43:32 +10:00 |  | 
			
				
					|  | 3a5b4ab74b | crispy forms for FileManagementFormView | 2021-05-16 16:00:02 +02:00 |  | 
			
				
					|  | b9c73b1e60 | simpler code | 2021-05-16 15:58:35 +02:00 |  | 
			
				
					|  | 8168db8061 | implementation for part import | 2021-05-16 15:57:57 +02:00 |  | 
			
				
					|  | 90ae281387 | adding in optional headers | 2021-05-16 15:50:13 +02:00 |  | 
			
				
					|  | 941ac25d53 | style fixes | 2021-05-15 08:45:01 +02:00 |  | 
			
				
					|  | 27ed20c123 | fix for wrong mapping | 2021-05-15 08:36:08 +02:00 |  | 
			
				
					| 
							
							
								 Oliver | 96d3a233d1 | Fix: New translations django.po from Crowdin | 2021-05-15 16:21:38 +10:00 |  | 
			
				
					|  | 6c2e18dd7a | part creation + alerts | 2021-05-15 01:09:50 +02:00 |  | 
			
				
					|  | 437e75c598 | form functions | 2021-05-15 01:09:29 +02:00 |  | 
			
				
					|  | f1f75b45cb | using messages for alerts | 2021-05-15 01:02:25 +02:00 |  |