Matthias 
							
						 
					 
					
						
						
							
						
						e7b189ba29 
					 
					
						
						
							
							fix templates  
						
						 
						
						
						
						
					 
					
						2022-05-02 22:41:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias 
							
						 
					 
					
						
						
							
						
						8f3899ffe6 
					 
					
						
						
							
							move migrations  
						
						 
						
						
						
						
					 
					
						2022-05-02 22:10:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						0c338cb2ae 
					 
					
						
						
							
							Merge branch 'inventree:master' into matmair/issue2788  
						
						 
						
						
						
						
					 
					
						2022-05-02 21:50:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						4125803e6d 
					 
					
						
						
							
							Merge branch 'inventree:master' into matmair/issue2385  
						
						 
						
						
						
						
					 
					
						2022-05-02 21:50:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e87a02638e 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into order-parts-wizard  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	InvenTree/order/serializers.py
#	InvenTree/templates/js/translated/model_renderers.js 
						
						
					 
					
						2022-05-02 16:11:11 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						18080f329b 
					 
					
						
						
							
							Remove compiled .mo files from tracking  
						
						 
						
						
						
						
					 
					
						2022-05-02 10:52:30 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						194d72e63e 
					 
					
						
						
							
							updated translation base ( #2914 )  
						
						 
						
						... 
						
						
						
						* updated translation base
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> 
						
						
					 
					
						2022-05-02 10:31:31 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						e418a54c25 
					 
					
						
						
							
							PEP fix  
						
						 
						
						
						
						
					 
					
						2022-05-01 21:48:45 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						8490589fa9 
					 
					
						
						
							
							check for only unique methods to be added  
						
						 
						
						
						
						
					 
					
						2022-05-01 21:46:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias 
							
						 
					 
					
						
						
							
						
						96e6752324 
					 
					
						
						
							
							remove double import  
						
						 
						
						
						
						
					 
					
						2022-05-01 22:13:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias 
							
						 
					 
					
						
						
							
						
						e7a0cf7342 
					 
					
						
						
							
							fix old url() usage  
						
						 
						
						
						
						
					 
					
						2022-05-01 22:04:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias 
							
						 
					 
					
						
						
							
						
						de6507e918 
					 
					
						
						
							
							update translation commands  
						
						 
						
						
						
						
					 
					
						2022-05-01 22:03:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias 
							
						 
					 
					
						
						
							
						
						67ab45bdee 
					 
					
						
						
							
							update depreciated paths  
						
						 
						
						
						
						
					 
					
						2022-05-01 22:00:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias 
							
						 
					 
					
						
						
							
						
						d05472b30c 
					 
					
						
						
							
							upgrade to pyhton 3.9 syntax  
						
						 
						
						... 
						
						
						
						using pyupgrade 
						
						
					 
					
						2022-05-01 21:53:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						cc42977233 
					 
					
						
						
							
							Merge pull request  #2910  from SchrodingersGat/translation-ci  
						
						 
						
						... 
						
						
						
						Translation CI 
						
						
					 
					
						2022-05-01 23:19:58 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						526571c062 
					 
					
						
						
							
							Prevent recursion  
						
						 
						
						
						
						
					 
					
						2022-05-01 22:50:56 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e3c3ed28da 
					 
					
						
						
							
							PEP fixes  
						
						 
						
						
						
						
					 
					
						2022-05-01 22:46:50 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						0a3613476c 
					 
					
						
						
							
							Fix empty translation string  
						
						 
						
						
						
						
					 
					
						2022-05-01 22:34:03 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d72efc3757 
					 
					
						
						
							
							Small tweaks  
						
						 
						
						... 
						
						
						
						- Factor out native_value property (not needed!)
- PEP fixes 
						
						
					 
					
						2022-05-01 22:30:24 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						f794d91e5c 
					 
					
						
						
							
							Adds more unit tests for global settings objects  
						
						 
						
						
						
						
					 
					
						2022-05-01 22:26:51 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						0f8f9f3e5e 
					 
					
						
						
							
							Add unit test for integer settings with validator  
						
						 
						
						
						
						
					 
					
						2022-05-01 22:21:57 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						f972551246 
					 
					
						
						
							
							Add unit test for multiple-choice setting type  
						
						 
						
						
						
						
					 
					
						2022-05-01 22:07:16 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						eabe082f0a 
					 
					
						
						
							
							Add unit tests for boolean user settings (via the API)  
						
						 
						
						
						
						
					 
					
						2022-05-01 20:23:50 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						75fa0bed26 
					 
					
						
						
							
							Render "native value" in serializer  
						
						 
						
						
						
						
					 
					
						2022-05-01 20:13:58 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						5d4972d981 
					 
					
						
						
							
							Convert settings to 'native' values before running callable valiators  
						
						 
						
						
						
						
					 
					
						2022-05-01 19:46:17 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						3777686c92 
					 
					
						
						
							
							503 page was missing inventree_extras  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 1a8fd7878ea253f7cdfd50f54850827e634fcb0f) 
						
						
					 
					
						2022-05-01 19:44:52 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						433ecdb2c3 
					 
					
						
						
							
							Merge pull request  #2714  from matmair/matmair/issue2694  
						
						 
						
						... 
						
						
						
						[FR] Add delivery cost (excluding unit cost that already exists) in PO 
						
						
					 
					
						2022-05-01 10:28:47 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias 
							
						 
					 
					
						
						
							
						
						93a05491ce 
					 
					
						
						
							
							PEP fix  
						
						 
						
						
						
						
					 
					
						2022-05-01 00:17:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias 
							
						 
					 
					
						
						
							
						
						58901a8cf6 
					 
					
						
						
							
							fix migrations  
						
						 
						
						
						
						
					 
					
						2022-05-01 00:15:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias 
							
						 
					 
					
						
						
							
						
						0c72fa180c 
					 
					
						
						
							
							fix model backtrack  
						
						 
						
						
						
						
					 
					
						2022-05-01 00:09:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias 
							
						 
					 
					
						
						
							
						
						9947cc2b08 
					 
					
						
						
							
							remove old permissionset  
						
						 
						
						
						
						
					 
					
						2022-05-01 00:07:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias 
							
						 
					 
					
						
						
							
						
						132f4aa82e 
					 
					
						
						
							
							Use set_null instead  
						
						 
						
						
						
						
					 
					
						2022-05-01 00:07:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kálmán Rózsahegyi 
							
						 
					 
					
						
						
							
						
						b8399e4887 
					 
					
						
						
							
							Increment number of JS files in test_js_load  
						
						 
						
						
						
						
					 
					
						2022-04-30 21:56:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kálmán Rózsahegyi 
							
						 
					 
					
						
						
							
						
						c7692475a8 
					 
					
						
						
							
							Add onBarcodeScanClicked() to exported functions  
						
						 
						
						
						
						
					 
					
						2022-04-30 21:28:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						c18579088a 
					 
					
						
						
							
							Merge branch 'inventree:master' into matmair/issue2385  
						
						 
						
						
						
						
					 
					
						2022-04-30 19:53:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						71a0d8159e 
					 
					
						
						
							
							Merge branch 'inventree:master' into matmair/issue2788  
						
						 
						
						
						
						
					 
					
						2022-04-30 19:53:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						e75daec695 
					 
					
						
						
							
							Merge branch 'inventree:master' into matmair/issue2694  
						
						 
						
						
						
						
					 
					
						2022-04-30 19:50:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kálmán Rózsahegyi 
							
						 
					 
					
						
						
							
						
						84bfb0a827 
					 
					
						
						
							
							One more try to pass JS checks...  
						
						 
						
						
						
						
					 
					
						2022-04-30 12:33:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kálmán Rózsahegyi 
							
						 
					 
					
						
						
							
						
						51152eee53 
					 
					
						
						
							
							More JS style fixes  
						
						 
						
						
						
						
					 
					
						2022-04-30 12:22:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kálmán Rózsahegyi 
							
						 
					 
					
						
						
							
						
						b37bb3eb3e 
					 
					
						
						
							
							Fix JS styling  
						
						 
						
						
						
						
					 
					
						2022-04-30 12:14:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kálmán Rózsahegyi 
							
						 
					 
					
						
						
							
						
						8b279edee0 
					 
					
						
						
							
							Merge branch 'master' into feat-qr-scanner  
						
						 
						
						
						
						
					 
					
						2022-04-30 11:57:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						35de490f72 
					 
					
						
						
							
							JS linting fixes  
						
						 
						
						
						
						
					 
					
						2022-04-29 17:13:59 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						260680c5c4 
					 
					
						
						
							
							Refactor BOM table to not load multi level BOMs by default  
						
						 
						
						... 
						
						
						
						- Click to select which ones to load 
						
						
					 
					
						2022-04-29 17:07:54 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						227b3d6aec 
					 
					
						
						
							
							Merge pull request  #2893  from SchrodingersGat/build-output-table-improvements  
						
						 
						
						... 
						
						
						
						Build output table improvements 
						
						
					 
					
						2022-04-29 15:05:52 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						1bb2551edb 
					 
					
						
						
							
							Fixes for model rendering code  
						
						 
						
						
						
						
					 
					
						2022-04-29 13:51:49 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						94fa424440 
					 
					
						
						
							
							Table tweaks  
						
						 
						
						
						
						
					 
					
						2022-04-29 13:13:12 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						a80465e85c 
					 
					
						
						
							
							Display batch code in build output table  
						
						 
						
						
						
						
					 
					
						2022-04-29 13:03:41 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						8fc34a21a6 
					 
					
						
						
							
							Reload the untracked stock table when allocation actions are performed  
						
						 
						
						
						
						
					 
					
						2022-04-29 12:59:20 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kalman Rozsahegyi 
							
						 
					 
					
						
						
							
						
						9e1a143132 
					 
					
						
						
							
							Merge branch 'master' into feat-qr-scanner  
						
						 
						
						
						
						
					 
					
						2022-04-28 22:14:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						51da1f02a8 
					 
					
						
						
							
							JS linting fixes  
						
						 
						
						
						
						
					 
					
						2022-04-29 01:58:57 +10:00