Francois
							
						 
					 | 
					
						
						
							
						
						b1885138de
					 | 
					
						
						
							
							Merge branch 'master' into categories_parameters
						
						
						
						
						
						
					 | 
					
						2020-11-03 07:01:56 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						1e844c642f
					 | 
					
						
						
							
							Merge pull request #1063 from SchrodingersGat/build-fixes
						
						
						
						
						
						
						
						Build system updates 
						
						
					 | 
					
						2020-11-03 22:58:38 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						2e1a5a85a3
					 | 
					
						
						
							
							Bug fix for unit testing
						
						
						
						
						
						
					 | 
					
						2020-11-03 22:14:02 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						3ea671986c
					 | 
					
						
						
							
							Merge conflicting migration files
						
						
						
						
						
						
					 | 
					
						2020-11-03 21:29:25 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						083dac1300
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into build-fixes
						
						
						
						
						
						
					 | 
					
						2020-11-03 21:26:39 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						1c503adced
					 | 
					
						
						
							
							Merge pull request #1026 from eeintech/user_unique_group_validation
						
						
						
						
						
						
						
						Added check for multiple groups assigned to user 
						
						
					 | 
					
						2020-11-03 21:21:08 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						ef2c04baa8
					 | 
					
						
						
							
							Merge pull request #1048 from eeintech/related_parts
						
						
						
						
						
						
						
						Related Parts 
						
						
					 | 
					
						2020-11-03 21:18:27 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						897d9b4831
					 | 
					
						
						
							
							Update translation files
						
						
						
						
						
						
					 | 
					
						2020-11-03 21:02:31 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						5988e847ce
					 | 
					
						
						
							
							Add serial number suggestions
						
						
						
						
						
						
					 | 
					
						2020-11-03 21:01:14 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						8d0845d92b
					 | 
					
						
						
							
							Mark a build as "production" whenever a build output is created
						
						
						
						
						
						
					 | 
					
						2020-11-03 20:43:49 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						ac03dab8de
					 | 
					
						
						
							
							Tweaks
						
						
						
						
						
						
					 | 
					
						2020-11-03 20:37:33 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						2b91f69c7d
					 | 
					
						
						
							
							Fix unit tests
						
						
						
						
						
						
					 | 
					
						2020-11-03 20:19:24 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						b936f67d87
					 | 
					
						
						
							
							Various form fixes
						
						
						
						
						
						
						
						- Updating forms, a lot has changed! 
						
						
					 | 
					
						2020-11-03 16:21:40 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						152801f06f
					 | 
					
						
						
							
							Dramatic speed improvements for build completion
						
						
						
						
						
						
						
						- Might still need to be a background task at some point.. 
						
						
					 | 
					
						2020-11-03 15:56:20 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						3f03adba72
					 | 
					
						
						
							
							Bug fix for stock table
						
						
						
						
						
						
						
						- Grouped rows were not displaying the part name 
						
						
					 | 
					
						2020-11-03 15:05:13 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						13a07be728
					 | 
					
						
						
							
							Added PartCategoryParameterTemplate tests
						
						
						
						
						
						
					 | 
					
						2020-11-02 15:35:54 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						6320384ecb
					 | 
					
						
						
							
							Fixed category parameter template edit form
						
						
						
						
						
						
					 | 
					
						2020-11-02 15:05:37 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						43fab8a8b3
					 | 
					
						
						
							
							Backtracked on setting category choices (fixed failed migration)
						
						
						
						
						
						
					 | 
					
						2020-11-02 13:28:34 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						34b784d1e4
					 | 
					
						
						
							
							Added setting, checkbox (PartCreateView only) and hook to create part parameters from category templates
						
						
						
						
						
						
					 | 
					
						2020-11-02 13:14:31 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						978b5f869d
					 | 
					
						
						
							
							Added checkbox to add parameter template to all categories
						
						
						
						
						
						
					 | 
					
						2020-11-02 12:20:29 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						05613b9642
					 | 
					
						
						
							
							Further build tweaks / improvements
						
						
						
						
						
						
					 | 
					
						2020-11-02 23:47:36 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						f5d0d54ded
					 | 
					
						
						
							
							Improve modal error message
						
						
						
						
						
						
					 | 
					
						2020-11-02 23:02:02 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						500da8099b
					 | 
					
						
						
							
							Add forms / views for creating a new build output, and completing the build
						
						
						
						
						
						
						
						- Also some refactoring of how forms are handled and saved 
						
						
					 | 
					
						2020-11-02 22:56:26 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						b02c87ea50
					 | 
					
						
						
							
							Lots of work towards multiple build output
						
						
						
						
						
						
					 | 
					
						2020-11-02 01:24:31 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						f1b83f1c17
					 | 
					
						
						
							
							Update fixtues for unit testing
						
						
						
						
						
						
					 | 
					
						2020-11-01 15:34:42 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						3a347fba21
					 | 
					
						
						
							
							Added edit/delete for category parameter templates
						
						
						
						
						
						
					 | 
					
						2020-10-31 12:55:52 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						2a563d7370
					 | 
					
						
						
							
							Added category list of parameter templates table to settings
						
						
						
						
						
						
					 | 
					
						2020-10-31 09:18:33 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						3e5d8d2b2d
					 | 
					
						
						
							
							Added form to select category in settings and update context data
						
						
						
						
						
						
					 | 
					
						2020-10-31 08:35:47 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						5310ce8465
					 | 
					
						
						
							
							First step into managing Category Parameters to InvenTree settings
						
						
						
						
						
						
					 | 
					
						2020-10-30 17:17:18 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						34ff05d66e
					 | 
					
						
						
							
							Created PartCategoryParameterTemplate model and admin interface
						
						
						
						
						
						
					 | 
					
						2020-10-30 16:09:27 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						95fadf1300
					 | 
					
						
						
							
							Update unit testing
						
						
						
						
						
						
					 | 
					
						2020-10-30 23:08:12 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						3a702266e6
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into build-fixes
						
						
						
						
						
						
						
						# Conflicts:
#	InvenTree/InvenTree/views.py
#	InvenTree/build/views.py
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/order/views.py
#	InvenTree/part/api.py
#	InvenTree/part/views.py
#	InvenTree/templates/js/bom.js 
						
						
					 | 
					
						2020-10-30 22:44:25 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						ad90adbc04
					 | 
					
						
						
							
							Merge pull request #1095 from SchrodingersGat/forms
						
						
						
						
						
						
						
						Refactor how form errors are handled 
						
						
					 | 
					
						2020-10-30 22:12:45 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						1caa341f8e
					 | 
					
						
						
							
							Fixes for unit tests
						
						
						
						
						
						
					 | 
					
						2020-10-30 21:34:56 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						e049ca1a85
					 | 
					
						
						
							
							More refactoring
						
						
						
						
						
						
					 | 
					
						2020-10-30 16:54:05 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						87903f27ed
					 | 
					
						
						
							
							Merge pull request #1094 from SchrodingersGat/typo-fix
						
						
						
						
						
						
						
						Fixed a typo in bom.js 
						
						
					 | 
					
						2020-10-30 16:23:07 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						c533f59405
					 | 
					
						
						
							
							Refactor how form errors are handled
						
						
						
						
						
						
						
						- Use form.add_error (as the django gods intended) 
						
						
					 | 
					
						2020-10-30 16:04:56 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						cabbdbb5cf
					 | 
					
						
						
							
							Fixed a typo in bom.js
						
						
						
						
						
						
					 | 
					
						2020-10-30 15:53:13 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						fb28204dfd
					 | 
					
						
						
							
							Merge pull request #1093 from SchrodingersGat/bom-filters
						
						
						
						
						
						
						
						Add filtering for BOM table 
						
						
					 | 
					
						2020-10-30 12:45:46 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						2428e77969
					 | 
					
						
						
							
							Add filtering for BOM table
						
						
						
						
						
						
					 | 
					
						2020-10-30 11:45:54 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						1311e5fe58
					 | 
					
						
						
							
							Merge pull request #1092 from SchrodingersGat/copy-bom
						
						
						
						
						
						
						
						Copy bom 
						
						
					 | 
					
						2020-10-30 11:40:06 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						5c5641d884
					 | 
					
						
						
							
							Update calls to post_save
						
						
						
						
						
						
					 | 
					
						2020-10-30 10:12:42 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						2d583d19c2
					 | 
					
						
						
							
							Adds function to duplicate a BOM from a parent part
						
						
						
						
						
						
						
						- Improves form validation workflow
- More 'djangoesque' 
						
						
					 | 
					
						2020-10-30 10:08:06 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						90cfb3496a
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into build-fixes
						
						
						
						
						
						
						
						# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.mo
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/templates/js/bom.js 
						
						
					 | 
					
						2020-10-29 15:23:51 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						a148cfe593
					 | 
					
						
						
							
							Merge pull request #1088 from SchrodingersGat/tweaks
						
						
						
						
						
						
						
						Tweaks 
						
						
					 | 
					
						2020-10-29 15:16:49 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						1d6d1121a7
					 | 
					
						
						
							
							Add some more icons
						
						
						
						
						
						
					 | 
					
						2020-10-29 13:58:05 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						f1a7ac3187
					 | 
					
						
						
							
							Add icon badges to bom.js
						
						
						
						
						
						
					 | 
					
						2020-10-29 13:26:32 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						fda0bff14c
					 | 
					
						
						
							
							Tweaks to part.js
						
						
						
						
						
						
					 | 
					
						2020-10-29 13:20:42 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						8246e9c802
					 | 
					
						
						
							
							Add function makeIconBadge for tables
						
						
						
						
						
						
						
						- Add filters for part variants table 
						
						
					 | 
					
						2020-10-29 13:18:45 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						b3ac261746
					 | 
					
						
						
							
							Add filter for supplier part table:
						
						
						
						
						
						
						
						Filter by "active" status 
						
						
					 | 
					
						2020-10-29 12:50:17 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |