Oliver Walters
							
						 
					 | 
					
						
						
							
						
						1a15b46d65
					 | 
					
						
						
							
							Remove some debug statements
						
						
						
						
						
						
					 | 
					
						2020-06-11 11:14:02 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						0068cd9825
					 | 
					
						
						
							
							Refactor barcode endoint
						
						
						
						
						
						
						
						- Moved code into 'barcode' directory 
						
						
					 | 
					
						2020-06-11 11:09:07 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						290c0eb225
					 | 
					
						
						
							
							Add barcode javascript file
						
						
						
						
						
						
					 | 
					
						2020-06-11 09:56:59 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						bc31cc550e
					 | 
					
						
						
							
							Consolidate buttons for stock item
						
						
						
						
						
						
					 | 
					
						2020-06-10 15:27:30 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						f40a9d1dad
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'
						
						
						
						
						
						
					 | 
					
						2020-06-09 16:28:59 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						218971e6f1
					 | 
					
						
						
							
							Merge pull request #864 from SchrodingersGat/translation-fixes
						
						
						
						
						
						
						
						Update translation hooks 
						
						
					 | 
					
						2020-06-09 16:28:34 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						38dcdcad54
					 | 
					
						
						
							
							Update translation hooks
						
						
						
						
						
						
					 | 
					
						2020-06-09 16:18:38 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						aeba189c1a
					 | 
					
						
						
							
							Merge pull request #863 from SchrodingersGat/decimalfix
						
						
						
						
						
						
						
						Decimalize display of variant stock 
						
						
					 | 
					
						2020-06-09 13:44:47 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						09400fd66b
					 | 
					
						
						
							
							Decimalize display of variant stock
						
						
						
						
						
						
						
						(cherry picked from commit 6e45360c4b7a6bc91f584f498fb6e1988593db95) 
						
						
					 | 
					
						2020-06-09 13:31:16 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						f3e3838782
					 | 
					
						
						
							
							Merge pull request #862 from SchrodingersGat/stock-buttons-fix
						
						
						
						
						
						
						
						Fix display of buttons for stock item 
						
						
					 | 
					
						2020-06-09 13:19:15 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						c7586b83e9
					 | 
					
						
						
							
							Fix display of buttons for stock item
						
						
						
						
						
						
						
						(cherry picked from commit b23017b6bf) 
						
						
					 | 
					
						2020-06-09 13:15:12 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						b23017b6bf
					 | 
					
						
						
							
							Fix display of buttons for stock item
						
						
						
						
						
						
					 | 
					
						2020-06-09 13:14:29 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						a6a58b299b
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'
						
						
						
						
						
						
					 | 
					
						2020-06-06 08:59:28 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						b2c302cb2c
					 | 
					
						
						
							
							Merge pull request #858 from SchrodingersGat/stock-table-ipn
						
						
						
						
						
						
						
						Add "IPN" column to stock list table 
						
						
					 | 
					
						2020-06-06 08:58:59 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						126e42a022
					 | 
					
						
						
							
							Add "IPN" column to stock list table
						
						
						
						
						
						
					 | 
					
						2020-06-06 08:47:06 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						22b30a0626
					 | 
					
						
						
							
							Merge pull request #857 from SchrodingersGat/security-fix
						
						
						
						
						
						
						
						Update django version 
						
						
					 | 
					
						2020-06-06 08:38:15 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						84362ea790
					 | 
					
						
						
							
							Update django version
						
						
						
						
						
						
					 | 
					
						2020-06-06 08:27:13 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						7be158722f
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'
						
						
						
						
						
						
					 | 
					
						2020-06-05 20:04:41 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						f563ac0dcb
					 | 
					
						
						
							
							Merge pull request #855 from SchrodingersGat/part-table
						
						
						
						
						
						
						
						Add "IPN" column to part table 
						
						
					 | 
					
						2020-06-05 19:38:16 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						16d261d956
					 | 
					
						
						
							
							Make description fields optional
						
						
						
						
						
						
					 | 
					
						2020-06-05 19:33:32 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						15817ce61a
					 | 
					
						
						
							
							Add "IPN" column to part table
						
						
						
						
						
						
					 | 
					
						2020-06-05 19:26:41 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						dedd87f20a
					 | 
					
						
						
							
							Merge pull request #854 from SchrodingersGat/customer-stock-display
						
						
						
						
						
						
						
						Customer stock display 
						
						
					 | 
					
						2020-06-05 12:20:25 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						fcd588cb01
					 | 
					
						
						
							
							Filter SalesOrder by status
						
						
						
						
						
						
					 | 
					
						2020-06-05 12:08:47 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						6ebce2b2fd
					 | 
					
						
						
							
							Add ability to filter purchase orders by "outstanding" status
						
						
						
						
						
						
					 | 
					
						2020-06-05 12:06:28 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						544e217347
					 | 
					
						
						
							
							Add page to show stock which is assigned to a customer
						
						
						
						
						
						
					 | 
					
						2020-06-05 11:52:07 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						9f599546de
					 | 
					
						
						
							
							Use stock status for determining "in stock"
						
						
						
						
						
						
					 | 
					
						2020-06-05 09:08:46 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						408c6a4040
					 | 
					
						
						
							
							Filter stock list by "customer"
						
						
						
						
						
						
					 | 
					
						2020-06-05 09:05:57 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						2c7e0bd321
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'
						
						
						
						
						
						
					 | 
					
						2020-06-04 20:07:59 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						96b79397c2
					 | 
					
						
						
							
							Merge pull request #852 from SchrodingersGat/send-to-customer
						
						
						
						
						
						
						
						Send to customer 
						
						
					 | 
					
						2020-06-04 19:55:57 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						ca1526405b
					 | 
					
						
						
							
							PEP fixes
						
						
						
						
						
						
					 | 
					
						2020-06-04 19:51:43 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						80019a3ed8
					 | 
					
						
						
							
							Add forms/views for manually assigning a stock item to a customer
						
						
						
						
						
						
					 | 
					
						2020-06-04 19:45:41 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						d907136264
					 | 
					
						
						
							
							Display customer in stock item
						
						
						
						
						
						
					 | 
					
						2020-06-04 19:13:37 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						fbd21827fb
					 | 
					
						
						
							
							Add 'customer' field to StockItem
						
						
						
						
						
						
					 | 
					
						2020-06-04 19:08:33 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						4ddabb82ef
					 | 
					
						
						
							
							Add a button to assign stock item to customer
						
						
						
						
						
						
					 | 
					
						2020-06-04 11:50:55 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						c1da4d5207
					 | 
					
						
						
							
							Merge pull request #850 from SchrodingersGat/bom-division-fix
						
						
						
						
						
						
						
						Fix for case where BOM item quantity is zero 
						
						
					 | 
					
						2020-06-04 11:42:39 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						a3c0d35b20
					 | 
					
						
						
							
							Fix for case where BOM item quantity is zero
						
						
						
						
						
						
					 | 
					
						2020-06-04 11:37:55 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						7c7055c0a0
					 | 
					
						
						
							
							Merge pull request #845 from SchrodingersGat/tweaks
						
						
						
						
						
						
						
						Tweaks 
						
						
					 | 
					
						2020-05-30 22:03:15 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						dd9584f487
					 | 
					
						
						
							
							Follow link when a new stock item is created
						
						
						
						
						
						
					 | 
					
						2020-05-30 20:58:52 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						8459de7be2
					 | 
					
						
						
							
							Display a message if no stock location is set
						
						
						
						
						
						
					 | 
					
						2020-05-30 20:58:05 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						b73044cd44
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'
						
						
						
						
						
						
					 | 
					
						2020-05-29 13:47:19 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						55bfdc000b
					 | 
					
						
						
							
							Merge pull request #844 from SchrodingersGat/part-validation-fixes
						
						
						
						
						
						
						
						template parts are now allowed to be variants 
						
						
					 | 
					
						2020-05-29 12:51:08 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						5f3816212f
					 | 
					
						
						
							
							template parts are now allowed to be variants
						
						
						
						
						
						
						
						- Do not throw an error here! 
						
						
					 | 
					
						2020-05-29 12:40:40 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						a6dab76ff6
					 | 
					
						
						
							
							Merge pull request #843 from SchrodingersGat/api-improvements
						
						
						
						
						
						
						
						Api improvements 
						
						
					 | 
					
						2020-05-28 21:31:28 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						59d9e430b4
					 | 
					
						
						
							
							Remove unique-together requirement
						
						
						
						
						
						
						
						- This is handled manually via the validate_unique function 
						
						
					 | 
					
						2020-05-28 20:38:24 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						774e26eb19
					 | 
					
						
						
							
							Mark some fields as not-required via the API
						
						
						
						
						
						
					 | 
					
						2020-05-28 20:33:33 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						f8e36c5468
					 | 
					
						
						
							
							Merge pull request #840 from SchrodingersGat/bom-queryset
						
						
						
						
						
						
						
						Allow template parts to be specified for the BOM item 
						
						
					 | 
					
						2020-05-27 10:47:46 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						9b7b65374d
					 | 
					
						
						
							
							Use rounding decimal field in BomItem form
						
						
						
						
						
						
					 | 
					
						2020-05-27 10:33:47 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						7bcf9bf5be
					 | 
					
						
						
							
							Allow template parts to be specified for the BOM item
						
						
						
						
						
						
					 | 
					
						2020-05-27 10:06:18 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						d0b3e0bd7c
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'
						
						
						
						
						
						
					 | 
					
						2020-05-27 09:31:15 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						04858f8835
					 | 
					
						
						
							
							Merge pull request #839 from SchrodingersGat/serializer-fix
						
						
						
						
						
						
						
						Fix serializer for stock item 
						
						
					 | 
					
						2020-05-26 23:20:15 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |