Oliver
							
						 
					 | 
					
						
						
							
						
						245c9bfd28
					 | 
					
						
						
							
							Enhancement for the BuildItem API / serializer
						
						
						
						
						
						
						
						- Add optional "part_detail" information
- Add optional "build_detail" information
- Add optional "location_detail" information 
						
						
					 | 
					
						2021-06-18 19:08:54 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias Mair
							
						 
					 | 
					
						
						
							
						
						8d317581dd
					 | 
					
						
						
							
							Merge branch 'master' into order-modal-show-price
						
						
						
						
						
						
					 | 
					
						2021-06-18 09:41:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						10ecddf9b4
					 | 
					
						
						
							
							Fixes after rebase
						
						
						
						
						
						
					 | 
					
						2021-06-18 17:25:24 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						0b8a50cd92
					 | 
					
						
						
							
							Add 'location_detail' filter
						
						
						
						
						
						
					 | 
					
						2021-06-18 16:51:34 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						caf52c6ce5
					 | 
					
						
						
							
							Add optional detail elements to SOAllocation API
						
						
						
						
						
						
					 | 
					
						2021-06-18 16:49:56 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						ad8dbb5900
					 | 
					
						
						
							
							Add API LIST endpoint for SalesOrderAllocations
						
						
						
						
						
						
					 | 
					
						2021-06-18 16:48:32 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						73c727ee76
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 11:38:19 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						4073f0d066
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 11:38:18 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						6448a433c9
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 11:38:17 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						463a604b51
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 11:38:15 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						c37e5b1de7
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 11:38:14 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						de807d623e
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 11:38:13 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						2e446a12e1
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 11:38:11 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						d923035eb0
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 11:38:10 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						551cde708e
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 11:38:09 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						b505b5913b
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'
						
						
						
						
						
						
					 | 
					
						2021-06-18 11:32:28 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								github-actions[bot]
							
						 
					 | 
					
						
						
							
						
						d547848e53
					 | 
					
						
						
							
							updated translation base
						
						
						
						
						
						
					 | 
					
						2021-06-18 00:37:52 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								github-actions[bot]
							
						 
					 | 
					
						
						
							
						
						f15dd08a9d
					 | 
					
						
						
							
							updated translation base
						
						
						
						
						
						
					 | 
					
						2021-06-18 00:37:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						43478a0be7
					 | 
					
						
						
							
							Merge pull request #1634 from matmair/internal-price
						
						
						
						
						
						
						
						Internal price 
						
						
					 | 
					
						2021-06-18 10:36:29 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						bb910a09fb
					 | 
					
						
						
							
							Merge pull request #1679 from matmair/fix-for-1678
						
						
						
						
						
						
						
						fix for part with no bom-price 
						
						
					 | 
					
						2021-06-18 10:35:59 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								github-actions[bot]
							
						 
					 | 
					
						
						
							
						
						a90a84fa6f
					 | 
					
						
						
							
							updated translation base
						
						
						
						
						
						
					 | 
					
						2021-06-18 00:31:31 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						b6e3df4e6b
					 | 
					
						
						
							
							Merge pull request #1680 from matmair/modal-options
						
						
						
						
						
						
						
						more modal options 
						
						
					 | 
					
						2021-06-18 10:30:18 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						1546b3f56b
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 10:28:13 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias Mair
							
						 
					 | 
					
						
						
							
						
						5bca978172
					 | 
					
						
						
							
							Merge branch 'inventree:master' into order-modal-show-price
						
						
						
						
						
						
					 | 
					
						2021-06-18 01:29:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						0154f43373
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 08:58:22 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								github-actions[bot]
							
						 
					 | 
					
						
						
							
						
						6b62475a4f
					 | 
					
						
						
							
							updated translation base
						
						
						
						
						
						
					 | 
					
						2021-06-17 22:20:03 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2cbdeae914
					 | 
					
						
						
							
							style-fix
						
						
						
						
						
						
					 | 
					
						2021-06-18 00:18:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						9991f4a694
					 | 
					
						
						
							
							Merge pull request #1681 from matmair/more-templatetags
						
						
						
						
						
						
						
						More templatetags 
						
						
					 | 
					
						2021-06-18 08:18:40 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						e12e6b0346
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 08:01:04 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						865a2b4af8
					 | 
					
						
						
							
							Merge branch 'modal-options' of https://github.com/matmair/InvenTree into order-modal-show-price
						
						
						
						
						
						
					 | 
					
						2021-06-17 23:44:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f0dd543ffa
					 | 
					
						
						
							
							render price in oer-modal if enabled in settings
						
						
						
						
						
						
					 | 
					
						2021-06-17 23:44:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a3a623a5ca
					 | 
					
						
						
							
							update-button for modal, repeat 1st step on use
						
						
						
						
						
						
					 | 
					
						2021-06-17 23:24:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2d8b96a6b8
					 | 
					
						
						
							
							setting to control visibility of price
						
						
						
						
						
						
					 | 
					
						2021-06-17 23:15:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4c7508cd6b
					 | 
					
						
						
							
							tag to call a method with (multiple)args
						
						
						
						
						
						
					 | 
					
						2021-06-17 23:11:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						58b6bbb236
					 | 
					
						
						
							
							tag to read out dict value
						
						
						
						
						
						
					 | 
					
						2021-06-17 23:09:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						47e32e78ce
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 07:02:10 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						64b6863e4c
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 06:02:14 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						43214d8e4c
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 05:06:49 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						5d8c6224e8
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 04:03:07 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c74ee4e925
					 | 
					
						
						
							
							doc for option.buttons
						
						
						
						
						
						
					 | 
					
						2021-06-17 19:24:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						96c29847e1
					 | 
					
						
						
							
							add custom buttons with response
						
						
						
						
						
						
					 | 
					
						2021-06-17 19:23:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3d17388b48
					 | 
					
						
						
							
							set modal title with response
						
						
						
						
						
						
					 | 
					
						2021-06-17 19:22:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ebe2ae77a5
					 | 
					
						
						
							
							hide error message with response
						
						
						
						
						
						
					 | 
					
						2021-06-17 19:18:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						0a619dce86
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 03:06:40 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						789865b996
					 | 
					
						
						
							
							style-fix
						
						
						
						
						
						
					 | 
					
						2021-06-17 18:25:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						997d68694e
					 | 
					
						
						
							
							fix for part with no bom-price #1678
						
						
						
						
						
						
					 | 
					
						2021-06-17 18:21:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6e77029d7d
					 | 
					
						
						
							
							Revert "fix for part with no bom"
						
						
						
						
						
						
						
						This reverts commit dd58f89977. 
						
						
					 | 
					
						2021-06-17 18:12:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						436abf31a8
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 02:09:40 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						17343cbfad
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 02:09:39 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						21f541f188
					 | 
					
						
						
							
							Fix: New translations django.po from Crowdin
						
						
						
						
						
						
					 | 
					
						2021-06-18 00:58:15 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |