Oliver
							
						 
					 | 
					
						
						
							
						
						2cd6c0b9fc
					 | 
					
						
						
							
							Merge pull request #895 from SchrodingersGat/return-to-stock
						
						
						
						
						
						
						
						Return to stock 
						
						
					 | 
					
						2020-08-08 09:48:44 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						8d9cfd3678
					 | 
					
						
						
							
							Migration file for StockStatus codes
						
						
						
						
						
						
					 | 
					
						2020-08-08 09:44:21 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						a2c3c1086c
					 | 
					
						
						
							
							Catch unhandled javascript errors
						
						
						
						
						
						
					 | 
					
						2020-08-08 09:31:57 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						ff71fe6e93
					 | 
					
						
						
							
							Fix "in_stock" logic for StockItem
						
						
						
						
						
						
						
						- Not in stock if it is at a customer! 
						
						
					 | 
					
						2020-08-08 09:20:42 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						861a2982db
					 | 
					
						
						
							
							Removed "SHIPPED" stock status code
						
						
						
						
						
						
					 | 
					
						2020-08-08 09:16:53 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						54c1f2d9a2
					 | 
					
						
						
							
							Upgrade to latest flake8
						
						
						
						
						
						
					 | 
					
						2020-08-08 09:15:45 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						459cc03aae
					 | 
					
						
						
							
							Remove "ASSIGNED_TO_BUILD" status code
						
						
						
						
						
						
					 | 
					
						2020-08-08 09:08:15 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						80173a9d43
					 | 
					
						
						
							
							Remove ASSIGNED_TO_OTHER_ITEM status code
						
						
						
						
						
						
					 | 
					
						2020-08-08 09:07:25 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						bdea29df04
					 | 
					
						
						
							
							Add functionality to return stock item from customer
						
						
						
						
						
						
					 | 
					
						2020-08-08 09:05:33 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						7b332d93ee
					 | 
					
						
						
							
							Rearrange button layouts
						
						
						
						
						
						
					 | 
					
						2020-08-08 08:48:27 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						518ad3eb60
					 | 
					
						
						
							
							Merge pull request #892 from SchrodingersGat/import-fix
						
						
						
						
						
						
						
						Allow default_keywords to be  null 
						
						
					 | 
					
						2020-08-04 11:35:25 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						0f199556df
					 | 
					
						
						
							
							Add migration file
						
						
						
						
						
						
					 | 
					
						2020-08-04 11:21:27 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						3a266cf322
					 | 
					
						
						
							
							Allow default_keywords to be  null
						
						
						
						
						
						
					 | 
					
						2020-08-04 11:10:24 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						d65d76653c
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'
						
						
						
						
						
						
					 | 
					
						2020-08-03 20:49:33 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						08bab0a1b9
					 | 
					
						
						
							
							Merge pull request #891 from SchrodingersGat/security-fix
						
						
						
						
						
						
						
						Update requirements.txt 
						
						
					 | 
					
						2020-08-03 19:53:34 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						481eeb8338
					 | 
					
						
						
							
							Update requirements.txt
						
						
						
						
						
						
					 | 
					
						2020-08-03 19:36:41 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						e0e82dabf3
					 | 
					
						
						
							
							Merge pull request #889 from SchrodingersGat/allow-empty-stock
						
						
						
						
						
						
						
						Allow creation of a stock item with zero quantity 
						
						
					 | 
					
						2020-07-30 21:09:57 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						10691b3d03
					 | 
					
						
						
							
							Allow creation of a stock item with zero quantity
						
						
						
						
						
						
					 | 
					
						2020-07-30 21:05:37 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						8a1f358505
					 | 
					
						
						
							
							Merge pull request #888 from SchrodingersGat/allow-staff-delete
						
						
						
						
						
						
						
						Allow staff delete 
						
						
					 | 
					
						2020-07-30 20:29:57 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						b7f30ee136
					 | 
					
						
						
							
							Update translations
						
						
						
						
						
						
					 | 
					
						2020-07-30 20:26:14 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						d90edab59f
					 | 
					
						
						
							
							Staff users are allowed to delete stock items that otherwise are not able to be deleted
						
						
						
						
						
						
					 | 
					
						2020-07-30 20:23:46 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						d1d5b45073
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'
						
						
						
						
						
						
					 | 
					
						2020-07-22 14:52:57 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						daab81fa2c
					 | 
					
						
						
							
							Merge pull request #887 from eeintech/allow_api_thumbnail_update
						
						
						
						
						
						
						
						Allowing Part thumbnail (image) update via API 
						
						
					 | 
					
						2020-07-22 09:19:43 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						f386039d5a
					 | 
					
						
						
							
							Added validation method for uploaded file using imghdr library
						
						
						
						
						
						
					 | 
					
						2020-07-21 16:01:17 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						af70dd5dfe
					 | 
					
						
						
							
							Allowing Part thumbnail (image) update via API
						
						
						
						
						
						
					 | 
					
						2020-07-20 16:16:26 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						51c194fb8f
					 | 
					
						
						
							
							Merge branch 'master' of github.com:eeintech/InvenTree into bom_dev
						
						
						
						
						
						
					 | 
					
						2020-07-19 15:05:07 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						6994af411d
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'
						
						
						
						
						
						
					 | 
					
						2020-07-18 13:31:07 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						5209a7a1b0
					 | 
					
						
						
							
							Merge pull request #884 from SchrodingersGat/fix-filters
						
						
						
						
						
						
						
						Adds table filters for stock assigned to a particular customer 
						
						
					 | 
					
						2020-07-14 16:05:44 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						0152ae79ef
					 | 
					
						
						
							
							Adds table filters for stock assigned to a particular customer
						
						
						
						
						
						
					 | 
					
						2020-07-14 15:54:03 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						3b98d85143
					 | 
					
						
						
							
							Merge branch 'master' of github:eeintech/InvenTree into bom_dev
						
						
						
						
						
						
					 | 
					
						2020-07-09 08:48:41 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						46586ba960
					 | 
					
						
						
							
							Corrected typo in part.models, simplified MakeBomTemplate function
						
						
						
						
						
						
					 | 
					
						2020-07-09 08:47:52 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						cfd1194a6e
					 | 
					
						
						
							
							Merge pull request #883 from eeintech/api_delete_inactive_part
						
						
						
						
						
						
						
						API: Allow part deletion if inactive 
						
						
					 | 
					
						2020-07-09 19:42:51 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						9b7977a217
					 | 
					
						
						
							
							API: Allow part deletion if inactive
						
						
						
						
						
						
					 | 
					
						2020-07-08 10:56:23 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						5f2ca784c9
					 | 
					
						
						
							
							Merge branch 'negative-stock-fix'
						
						
						
						
						
						
					 | 
					
						2020-06-28 19:26:56 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						3d7676e292
					 | 
					
						
						
							
							Merge pull request #880 from SchrodingersGat/negative-stock-fix
						
						
						
						
						
						
						
						Improve logic of "quantity_to_order" function 
						
						
					 | 
					
						2020-06-28 19:23:37 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						25b7f0b7ee
					 | 
					
						
						
							
							Merge pull request #879 from SchrodingersGat/star-filter-fix
						
						
						
						
						
						
						
						Fix filter logic for 'starred' parts 
						
						
					 | 
					
						2020-06-28 19:14:55 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						3d245c7ce3
					 | 
					
						
						
							
							Improve logic of "quantity_to_order" function
						
						
						
						
						
						
					 | 
					
						2020-06-28 19:14:51 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						134a688e4a
					 | 
					
						
						
							
							Fix filter logic for 'starred' parts
						
						
						
						
						
						
					 | 
					
						2020-06-28 19:08:13 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						8ac23c080f
					 | 
					
						
						
							
							Merge pull request #875 from SchrodingersGat/tweaks
						
						
						
						
						
						
						
						"Active" part toggle is always enabled 
						
						
					 | 
					
						2020-06-22 11:33:39 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						fa3d2d005a
					 | 
					
						
						
							
							"Active" part toggle is always enabled
						
						
						
						
						
						
					 | 
					
						2020-06-22 11:27:59 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						da70af7ba0
					 | 
					
						
						
							
							Merge pull request #874 from SchrodingersGat/show_non_stock
						
						
						
						
						
						
						
						Add ability to display "out of stock" items against a part 
						
						
					 | 
					
						2020-06-22 10:55:12 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						930f903f5d
					 | 
					
						
						
							
							Add ability to display "out of stock" items against a part
						
						
						
						
						
						
					 | 
					
						2020-06-22 10:48:41 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						16bea33695
					 | 
					
						
						
							
							Merge pull request #867 from SchrodingersGat/name-conventions
						
						
						
						
						
						
						
						Update verbose names for some fields 
						
						
					 | 
					
						2020-06-13 20:52:15 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						dedc25d681
					 | 
					
						
						
							
							Update verbose names for some fields
						
						
						
						
						
						
					 | 
					
						2020-06-13 20:46:19 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						82433db1ea
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'
						
						
						
						
						
						
					 | 
					
						2020-06-12 18:16:23 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						2047b2d7d7
					 | 
					
						
						
							
							Merge pull request #866 from SchrodingersGat/moar-buttons
						
						
						
						
						
						
						
						Reorganize buttons for "Part" view 
						
						
					 | 
					
						2020-06-12 18:16:06 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						2e91f64a96
					 | 
					
						
						
							
							Add (disabled) print-label button for Part display
						
						
						
						
						
						
					 | 
					
						2020-06-12 18:13:14 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						1ad4b8b131
					 | 
					
						
						
							
							Reorganize buttons for "Part" view
						
						
						
						
						
						
					 | 
					
						2020-06-12 18:11:57 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						a63219466f
					 | 
					
						
						
							
							Merge pull request #865 from SchrodingersGat/barcode-suppor
						
						
						
						
						
						
						
						Barcode support 
						
						
					 | 
					
						2020-06-12 17:57:36 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						9757fb06db
					 | 
					
						
						
							
							Fix a weird button issue
						
						
						
						
						
						
						
						- reloadTable() was causing the button 'click' handler to fire...
- NFI why this is happening 
						
						
					 | 
					
						2020-06-12 16:47:57 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |