Oliver 
							
						 
					 
					
						
						
							
						
						93257d547c 
					 
					
						
						
							
							Merge pull request  #2806  from SchrodingersGat/bom-serializer-quantity  
						
						... 
						
						
						
						Bom serializer quantity 
						
						
					 
					
						2022-04-13 07:43:25 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						fe8f5a74e7 
					 
					
						
						
							
							Merge pull request  #2816  from SchrodingersGat/markdown-editor  
						
						... 
						
						
						
						Markdown editor 
						
						
					 
					
						2022-04-10 22:44:57 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7276fafcc5 
					 
					
						
						
							
							Unit test fix  
						
						
						
						
					 
					
						2022-04-10 20:25:05 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						9e59d90e0e 
					 
					
						
						
							
							Pin bleach package version  
						
						... 
						
						
						
						(cherry picked from commit 7af9e9123e 
						
						
					 
					
						2022-04-10 20:24:41 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c7257a1bd3 
					 
					
						
						
							
							build order  
						
						
						
						
					 
					
						2022-04-10 20:03:40 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1c60d4e152 
					 
					
						
						
							
							Refactor notes for "purchase order"  
						
						
						
						
					 
					
						2022-04-10 19:55:32 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						df9c5c0048 
					 
					
						
						
							
							Refactor notes editing for "StockItem"  
						
						
						
						
					 
					
						2022-04-10 18:08:09 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e1784c93b2 
					 
					
						
						
							
							Simplification  
						
						
						
						
					 
					
						2022-04-10 18:03:19 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						641785a02b 
					 
					
						
						
							
							Refactor into a monolithic js function  
						
						
						
						
					 
					
						2022-04-10 17:53:09 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						957494f483 
					 
					
						
						
							
							Custom headings  
						
						
						
						
					 
					
						2022-04-10 16:29:31 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						241e2e35c0 
					 
					
						
						
							
							Display part notes inline, and allow updating via API  
						
						
						
						
					 
					
						2022-04-10 15:58:36 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						82b8230a7e 
					 
					
						
						
							
							Prune some dead code  
						
						
						
						
					 
					
						2022-04-10 15:36:27 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						953c7bc7e4 
					 
					
						
						
							
							Adds easymde (v2.16.1)  
						
						
						
						
					 
					
						2022-04-10 15:34:02 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						b7937a4750 
					 
					
						
						
							
							Add some more unit tests for BOM API endpoints  
						
						
						
						
					 
					
						2022-04-09 19:22:12 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7af9e9123e 
					 
					
						
						
							
							Pin bleach package version  
						
						
						
						
					 
					
						2022-04-09 19:15:21 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						78ed5d9cc4 
					 
					
						
						
							
							Some more API unit tests  
						
						
						
						
					 
					
						2022-04-08 21:59:59 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						8ab54c8e55 
					 
					
						
						
							
							Add more unit tests  
						
						
						
						
					 
					
						2022-04-08 21:39:41 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						49f095b15c 
					 
					
						
						
							
							Bump API version  
						
						
						
						
					 
					
						2022-04-07 19:37:16 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						be9648cbc7 
					 
					
						
						
							
							Remove unused function which shadowed name of query annotation  
						
						
						
						
					 
					
						2022-04-07 19:22:20 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						eef768e01f 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into bom-serializer-quantity  
						
						
						
						
					 
					
						2022-04-07 18:53:43 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ba81e6caf9 
					 
					
						
						
							
							Style fixes  
						
						
						
						
					 
					
						2022-04-07 18:50:10 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						f3075d2151 
					 
					
						
						
							
							Build table now also shows availability of substitute stock  
						
						
						
						
					 
					
						2022-04-07 18:48:23 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						acc6cb8729 
					 
					
						
						
							
							Fix calculation of "can_build"  
						
						
						
						
					 
					
						2022-04-07 17:47:24 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						6aceb24e41 
					 
					
						
						
							
							Include available substitute stock when calculating total availability in BOM table  
						
						
						
						
					 
					
						2022-04-07 17:45:11 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						d0fa40a408 
					 
					
						
						
							
							Merge pull request  #2812  from eeintech/fix_upload  
						
						... 
						
						
						
						Fix part and po files import 
						
						
					 
					
						2022-04-07 08:23:02 +10:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						ad366ef0bd 
					 
					
						
						
							
							Fix part and po files import  
						
						
						
						
					 
					
						2022-04-06 16:45:23 -04:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e3186b5573 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into bom-serializer-quantity  
						
						
						
						
					 
					
						2022-04-06 18:01:10 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						c31bbe5c42 
					 
					
						
						
							
							Merge pull request  #2809  from SchrodingersGat/fix-inactive-search  
						
						... 
						
						
						
						Bug fix for "inverted" logic in search results 
						
						
					 
					
						2022-04-06 12:46:18 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						24c64d7479 
					 
					
						
						
							
							Bug fix for "inverted" logic when hiding inactive parts from search results  
						
						
						
						
					 
					
						2022-04-06 12:21:19 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						b78407a7e8 
					 
					
						
						
							
							Merge pull request  #2808  from SchrodingersGat/cancel-requests  
						
						... 
						
						
						
						Fix search errors 
						
						
					 
					
						2022-04-06 10:38:03 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						27dac5af97 
					 
					
						
						
							
							Fix search errors  
						
						... 
						
						
						
						- Do not show API error messages for requests which were intentionally aborted
- Prevents a large number of error messages being displayed when search text is changed 
						
						
					 
					
						2022-04-06 09:42:07 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						ac721a544d 
					 
					
						
						
							
							Merge pull request  #2803  from SchrodingersGat/barcode-fix  
						
						... 
						
						
						
						Barcode scanning fixes 
						
						
					 
					
						2022-04-06 09:27:42 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						dc2da4bcb9 
					 
					
						
						
							
							BomItem API - improve annotation of available substitute stock quantity  
						
						
						
						
					 
					
						2022-04-05 21:24:57 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						30a4c38eb7 
					 
					
						
						
							
							Ensure queryset is properly annotated for BomItem detail  
						
						
						
						
					 
					
						2022-04-05 21:12:43 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e0acfe492b 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into bom-serializer-quantity  
						
						
						
						
					 
					
						2022-04-05 19:49:06 +10:00 
						 
				 
			
				
					
						
							
							
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						4ab27e5f3c 
					 
					
						
						
							
							Merge branch 'inventree:master' into matmair/issue2694  
						
						
						
						
					 
					
						2022-04-05 02:03:40 +02:00 
						 
				 
			
				
					
						
							
							
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						346327b545 
					 
					
						
						
							
							Merge branch 'inventree:master' into plugin-mark-sample  
						
						
						
						
					 
					
						2022-04-05 02:03:29 +02:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						0ff754c7d9 
					 
					
						
						
							
							Merge pull request  #2804  from SchrodingersGat/quantity-fixes  
						
						... 
						
						
						
						Quantity fixes 
						
						
					 
					
						2022-04-05 08:20:18 +10:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						bdc62dfcc3 
					 
					
						
						
							
							mark active sample code as a sample  
						
						
						
						
					 
					
						2022-04-04 23:53:35 +02:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c93f9c94f3 
					 
					
						
						
							
							Change column title  
						
						
						
						
					 
					
						2022-04-05 00:33:54 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						0908aa8c8c 
					 
					
						
						
							
							Allow sorting of part table by unallocated_stock  
						
						
						
						
					 
					
						2022-04-05 00:31:44 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						58003bc2cb 
					 
					
						
						
							
							Refactor model renderer functions  
						
						
						
						
					 
					
						2022-04-05 00:27:37 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						15253435af 
					 
					
						
						
							
							Adjustments for partStockLabel function  
						
						
						
						
					 
					
						2022-04-05 00:02:11 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e4ca638a2e 
					 
					
						
						
							
							Add field for substitute_stock (work in progress)  
						
						
						
						
					 
					
						2022-04-04 23:52:45 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c6ba104ae8 
					 
					
						
						
							
							Condense into single "available_stock" field  
						
						
						
						
					 
					
						2022-04-04 23:07:44 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						f6664b2477 
					 
					
						
						
							
							Add annotated fields to BomItem API:  
						
						... 
						
						
						
						- total-stock / allocated_to_build_orders / allocated_to_sales_orders 
						
						
					 
					
						2022-04-04 22:50:13 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						782a0f3576 
					 
					
						
						
							
							Fix for scanIntoLocation function  
						
						
						
						
					 
					
						2022-04-04 16:23:17 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						7dae05acc5 
					 
					
						
						
							
							Fix for scanItemsIntoLocation function  
						
						... 
						
						
						
						- Accept list of objects rather than pk values
- Conform to API requirements 
						
						
					 
					
						2022-04-04 16:20:19 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						2c8e274aa9 
					 
					
						
						
							
							Tweaks for barcode scanning functionality  
						
						... 
						
						
						
						- Prevent javascript errors
(cherry picked from commit 9129a42a3e2a5c5939e6002d3b4010b3fd9cc20e) 
						
						
					 
					
						2022-04-04 14:24:28 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						d1a8b7ed48 
					 
					
						
						
							
							Merge pull request  #2801  from rkalman/feat-use-unallocated-quantites  
						
						... 
						
						
						
						Use new unallocated_stock quantity in the part table and in the search results 
						
						
					 
					
						2022-04-03 23:23:02 +10:00