Oliver 
							
						 
					 
					
						
						
							
						
						774d834b7e 
					 
					
						
						
							
							Merge pull request  #2477  from SchrodingersGat/duplicate-bom-form  
						
						 
						
						... 
						
						
						
						Duplicate bom form 
						
						
					 
					
						2021-12-21 23:06:44 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						2c0da25cbc 
					 
					
						
						
							
							"Validate BOM" now uses the API also  
						
						 
						
						
						
						
					 
					
						2021-12-21 22:45:59 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						70f9a0fe13 
					 
					
						
						
							
							Furher logic improvements to BOM copy  
						
						 
						
						... 
						
						
						
						- Remove "self" part from list
- Stop inherited BOM items from being copied incorrectly
- Allow user to select whether "inherited" BOM items are copied 
						
						
					 
					
						2021-12-21 22:07:08 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						0c8a047bc2 
					 
					
						
						
							
							Adds simply endpoint for BOM duplication  
						
						 
						
						
						
						
					 
					
						2021-12-21 17:29:14 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						0060bb074e 
					 
					
						
						
							
							Updates for various part views  
						
						 
						
						
						
						
					 
					
						2021-12-21 16:56:47 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						103f98b665 
					 
					
						
						
							
							Adds "reload" button to attachment table(s)  
						
						 
						
						
						
						
					 
					
						2021-12-21 16:51:26 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						9884c0fadb 
					 
					
						
						
							
							Adds filters for "manufacturer-parts" list  
						
						 
						
						
						
						
					 
					
						2021-12-21 16:47:20 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						46aeafb5da 
					 
					
						
						
							
							Adds filter for "assigned stock" view on customer page  
						
						 
						
						
						
						
					 
					
						2021-12-21 16:44:49 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						0a21512329 
					 
					
						
						
							
							Adds refresh and filtering for "company" table  
						
						 
						
						
						
						
					 
					
						2021-12-21 16:41:34 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						fcb2bb2a46 
					 
					
						
						
							
							Fix behaviour on deleting parent stock item  
						
						 
						
						
						
						
					 
					
						2021-12-21 01:03:37 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						552ca8e5c4 
					 
					
						
						
							
							Adds javascript function to merge multiple stock items together  
						
						 
						
						
						
						
					 
					
						2021-12-20 22:09:08 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						c060bc0815 
					 
					
						
						
							
							Float "depleted" badge to the right  
						
						 
						
						
						
						
					 
					
						2021-12-20 13:30:54 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						81a3547120 
					 
					
						
						
							
							Hide "receive parts" button for orders which have been cancelled  
						
						 
						
						
						
						
					 
					
						2021-12-20 11:17:29 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						922b8b1c30 
					 
					
						
						
							
							Fix typo  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 673a5779f9 ) 
						
						
					 
					
						2021-12-13 23:12:18 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						01ce752a8c 
					 
					
						
						
							
							BOM export options are now han  
						
						 
						
						... 
						
						
						
						(cherry picked from commit c797eb0703 ) 
						
						
					 
					
						2021-12-13 23:12:11 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						88fc0393b7 
					 
					
						
						
							
							Logic fix for boolean fields in JS forms  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 10dec7743e ) 
						
						
					 
					
						2021-12-13 23:11:56 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						d75ce451be 
					 
					
						
						
							
							Allow user to select file format when downloadin BOM import template  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 8030ca0bb9 ) 
						
						
					 
					
						2021-12-13 23:11:42 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						e1a5192604 
					 
					
						
						
							
							Calculate how many items to assign to sales order  
						
						 
						
						... 
						
						
						
						- Do not over-allocate by default 
						
						
					 
					
						2021-12-11 00:45:53 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						c1163b9f6b 
					 
					
						
						
							
							Adds missing semicolon  
						
						 
						
						
						
						
					 
					
						2021-12-09 09:07:36 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						4a453b0a35 
					 
					
						
						
							
							Assign multiple stock items to a customer at one  
						
						 
						
						
						
						
					 
					
						2021-12-09 00:33:45 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						96a885e4e1 
					 
					
						
						
							
							client side form for assigning stock items to customers  
						
						 
						
						
						
						
					 
					
						2021-12-09 00:20:45 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						463192e0b9 
					 
					
						
						
							
							Improved table filtering for "purchase order" table (as seen from "part" view)  
						
						 
						
						
						
						
					 
					
						2021-12-07 10:33:09 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias 
							
						 
					 
					
						
						
							
						
						bb2ad7c2cb 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/inventree/InvenTree  into plugin-2037  
						
						 
						
						
						
						
					 
					
						2021-12-04 18:04:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						9e1251d78d 
					 
					
						
						
							
							Adds "assigned_to_me" filtering to build orders  
						
						 
						
						
						
						
					 
					
						2021-12-04 21:30:11 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						087ac0bd34 
					 
					
						
						
							
							Adds filter to purchase order for "assigned to me"  
						
						 
						
						
						
						
					 
					
						2021-12-04 21:15:38 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						9ec5e39c50 
					 
					
						
						
							
							js tweaks  
						
						 
						
						
						
						
					 
					
						2021-12-04 17:50:25 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						008c52ef39 
					 
					
						
						
							
							Allocation by serial number now moved to the API  
						
						 
						
						
						
						
					 
					
						2021-12-04 13:08:00 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						e9796676c0 
					 
					
						
						
							
							Add a progress spinner to modal forms  
						
						 
						
						
						
						
					 
					
						2021-12-04 10:44:48 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						921ef5ae9e 
					 
					
						
						
							
							Tweaks to PO and SO tables  
						
						 
						
						
						
						
					 
					
						2021-12-04 10:11:18 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						1215ef520d 
					 
					
						
						
							
							Further JS linting  
						
						 
						
						
						
						
					 
					
						2021-12-04 09:44:23 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						35b3bc73cc 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into partial-shipment  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	InvenTree/order/api.py 
						
						
					 
					
						2021-12-04 09:35:54 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						3abad2f73d 
					 
					
						
						
							
							js linting  
						
						 
						
						
						
						
					 
					
						2021-12-04 09:33:42 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						f6e1de42f5 
					 
					
						
						
							
							JS linting  
						
						 
						
						
						
						
					 
					
						2021-12-03 21:16:58 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						acfafe22c5 
					 
					
						
						
							
							order lines can be received directly from the new table  
						
						 
						
						
						
						
					 
					
						2021-12-03 21:07:09 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						6d90ded27f 
					 
					
						
						
							
							First pass at a part-purchase-order table  
						
						 
						
						
						
						
					 
					
						2021-12-03 20:54:21 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						c93009876d 
					 
					
						
						
							
							UI changes  
						
						 
						
						
						
						
					 
					
						2021-12-03 20:14:09 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						d7c87300c6 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into partial-shipment  
						
						 
						
						
						
						
					 
					
						2021-12-03 17:31:27 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias 
							
						 
					 
					
						
						
							
						
						329b00ae07 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/inventree/InvenTree  into plugin-2037  
						
						 
						
						
						
						
					 
					
						2021-12-02 17:16:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						9ca6204d4b 
					 
					
						
						
							
							Add option for creating initial stock quantity when duplicating a part  
						
						 
						
						... 
						
						
						
						Fixes https://github.com/inventree/InvenTree/issues/2407  
						
						
					 
					
						2021-12-03 00:05:55 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						e1668c8662 
					 
					
						
						
							
							More stuffs:  
						
						 
						
						... 
						
						
						
						- Allow filtering of salesorderlineitem by "completed" status
- Allow deletion of (empty) shipment
- Show which items are going to be shipped 
						
						
					 
					
						2021-12-02 23:52:53 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						e74e7138a9 
					 
					
						
						
							
							More stuff:  
						
						 
						
						... 
						
						
						
						- Pass tracking number through when completing a shipment
- Reload tables automatically when certain actions are performed
- Limit stock items to only those with available stock 
						
						
					 
					
						2021-12-02 21:59:59 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						d5ace1a8da 
					 
					
						
						
							
							Differentiate between "fully allocated" and "partially allocated" in stock item table  
						
						 
						
						
						
						
					 
					
						2021-12-02 21:46:05 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						586d38fb61 
					 
					
						
						
							
							Add item count to shipment table  
						
						 
						
						
						
						
					 
					
						2021-12-02 21:40:21 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						123aab89bc 
					 
					
						
						
							
							Adds an "available" filter for stock item API  
						
						 
						
						
						
						
					 
					
						2021-12-02 21:40:03 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						6ec0cfc641 
					 
					
						
						
							
							Merge branch 'master' into partial-shipment  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	InvenTree/company/templates/company/company_base.html
#	InvenTree/stock/templates/stock/item_base.html 
						
						
					 
					
						2021-12-02 20:49:13 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						11e527a02a 
					 
					
						
						
							
							Merge branch 'inventree:master' into plugin-2037  
						
						 
						
						
						
						
					 
					
						2021-12-02 09:23:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						98bbee8159 
					 
					
						
						
							
							Adds function to lookup stock item by serial number  
						
						 
						
						
						
						
					 
					
						2021-12-02 15:55:00 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						6e9937e0e9 
					 
					
						
						
							
							Don't be dull, check for null  
						
						 
						
						
						
						
					 
					
						2021-11-30 15:24:19 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						3f9b280e17 
					 
					
						
						
							
							Allow shipment numbers to be non-unique for different sales orders  
						
						 
						
						... 
						
						
						
						- must be unique for a given sales order 
						
						
					 
					
						2021-11-30 00:42:30 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						f3f3030b37 
					 
					
						
						
							
							Adds API endpoint to "ship" a sales order shipment  
						
						 
						
						
						
						
					 
					
						2021-11-30 00:02:03 +11:00