| 
						
					 | 
					
						
						
							
						
						f73863ea51
					 | 
					
						
						
							
							adding in cstm action buttons function
						
						
						
						
						
						
					 | 
					
						2021-05-07 07:18:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						09fe9ccf11
					 | 
					
						
						
							
							sales order item tracking
						
						
						
						
						
						
					 | 
					
						2021-05-07 07:15:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						985967fccb
					 | 
					
						
						
							
							save return of part.id
						
						
						
						
						
						
					 | 
					
						2021-05-07 07:13:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Francois
							
						 
					 | 
					
						
						
							
						
						5ed17022f2
					 | 
					
						
						
							
							Fixed stock import as it was not validating the serial properly (#1559)
						
						
						
						
						
						
					 | 
					
						2021-05-07 07:57:16 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						4f942fd9f7
					 | 
					
						
						
							
							Working towards item match form
						
						
						
						
						
						
					 | 
					
						2021-05-06 17:07:22 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						e31452a6ad
					 | 
					
						
						
							
							Match field step is now managed through form
						
						
						
						
						
						
					 | 
					
						2021-05-06 16:05:58 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						f79382d96f
					 | 
					
						
						
							
							Handling part match form but still not creating purchase order items
						
						
						
						
						
						
					 | 
					
						2021-05-06 12:35:52 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						053793288b
					 | 
					
						
						
							
							same spacing for tables
						
						
						
						
						
						
						
						thanks @eeintech 
						
						
					 | 
					
						2021-05-06 18:05:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						005063aad6
					 | 
					
						
						
							
							Merge branch 'master' of github.com:inventree/InvenTree into multi_part_forms
						
						
						
						
						
						
					 | 
					
						2021-05-06 11:30:08 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aac05db6bf
					 | 
					
						
						
							
							style fixing
						
						
						
						
						
						
					 | 
					
						2021-05-06 17:15:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						792b2d11c0
					 | 
					
						
						
							
							cleanup
						
						
						
						
						
						
					 | 
					
						2021-05-06 16:46:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						660a3f9410
					 | 
					
						
						
							
							cleaner get function
						
						
						
						
						
						
					 | 
					
						2021-05-06 16:46:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						90c207b935
					 | 
					
						
						
							
							keeping part id in inherited form
						
						
						
						
						
						
					 | 
					
						2021-05-06 16:45:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4830ff28bf
					 | 
					
						
						
							
							new function for initials
						
						
						
						
						
						
					 | 
					
						2021-05-06 16:34:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c2a5e1fd23
					 | 
					
						
						
							
							moved the special stuff into the inherited view
						
						
						
						
						
						
					 | 
					
						2021-05-06 16:29:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias Mair
							
						 
					 | 
					
						
						
							
						
						3a1c233bff
					 | 
					
						
						
							
							Bug/calender (#1558)
						
						
						
						
						
						
						
						* fixes calendar not rendering when toggling view
* same for po
* and builds 
						
						
					 | 
					
						2021-05-07 00:11:08 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b09f49aaa5
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/inventree/InvenTree into issue1425
						
						
						
						
						
						
					 | 
					
						2021-05-06 14:54:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d8769748f5
					 | 
					
						
						
							
							config
						
						
						
						
						
						
					 | 
					
						2021-05-06 14:46:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c1bcc60f0a
					 | 
					
						
						
							
							forgot a py
						
						
						
						
						
						
					 | 
					
						2021-05-06 14:41:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d5b65e6e41
					 | 
					
						
						
							
							yaml!
						
						
						
						
						
						
					 | 
					
						2021-05-06 14:38:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8c63b53c16
					 | 
					
						
						
							
							here we go js
						
						
						
						
						
						
					 | 
					
						2021-05-06 14:35:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a77d9d9de7
					 | 
					
						
						
							
							same treatment for html
						
						
						
						
						
						
					 | 
					
						2021-05-06 14:33:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias Mair
							
						 
					 | 
					
						
						
							
						
						39d4129157
					 | 
					
						
						
							
							chery picked all fixed trans str from #1438 (#1554)
						
						
						
						
						
						
					 | 
					
						2021-05-06 20:29:58 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f2b0717d10
					 | 
					
						
						
							
							removes all lines consisting only of spaces
						
						
						
						
						
						
						
						this really bothers me for some reason - nothing technical 
						
						
					 | 
					
						2021-05-06 12:11:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						3511b4adda
					 | 
					
						
						
							
							Merge pull request #1550 from matmair/layout-fix
						
						
						
						
						
						
						
						Layout fix 
						
						
					 | 
					
						2021-05-06 08:58:08 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1259374822
					 | 
					
						
						
							
							removes layout-shift due to typo in menubar
						
						
						
						
						
						
					 | 
					
						2021-05-06 00:37:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f9463fa277
					 | 
					
						
						
							
							fixes navbar-layout shift with narrow dollar-sign
						
						
						
						
						
						
					 | 
					
						2021-05-06 00:33:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						66f198baa9
					 | 
					
						
						
							
							removing duplicate information in pricing table
						
						
						
						
						
						
					 | 
					
						2021-05-06 00:17:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c4d0865f06
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/inventree/InvenTree into issue1425
						
						
						
						
						
						
					 | 
					
						2021-05-06 00:14:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						efa9da2ce1
					 | 
					
						
						
							
							removed unused imports
						
						
						
						
						
						
					 | 
					
						2021-05-06 00:00:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						030865f8dd
					 | 
					
						
						
							
							sale price in pricing table
						
						
						
						
						
						
					 | 
					
						2021-05-05 23:49:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1b7ade9405
					 | 
					
						
						
							
							adding in missing parts for full saleprice
						
						
						
						
						
						
					 | 
					
						2021-05-05 23:47:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1a227faec4
					 | 
					
						
						
							
							abstracting get_price
						
						
						
						
						
						
					 | 
					
						2021-05-05 23:42:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						287a05ddc5
					 | 
					
						
						
							
							clearer spacing in html
						
						
						
						
						
						
					 | 
					
						2021-05-05 21:48:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						40e8ed9e5b
					 | 
					
						
						
							
							Match parts view is now populated correctly
						
						
						
						
						
						
					 | 
					
						2021-05-05 15:28:04 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2cfb9c60a3
					 | 
					
						
						
							
							space cleanup
						
						
						
						
						
						
					 | 
					
						2021-05-05 20:57:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b392586a08
					 | 
					
						
						
							
							quantity also for modal
						
						
						
						
						
						
					 | 
					
						2021-05-05 20:55:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dc4fb64987
					 | 
					
						
						
							
							add in price modal in table
						
						
						
						
						
						
					 | 
					
						2021-05-05 20:53:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ee028ef925
					 | 
					
						
						
							
							space cleanup
						
						
						
						
						
						
					 | 
					
						2021-05-05 20:38:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						2cd1df691b
					 | 
					
						
						
							
							Working towards part matching
						
						
						
						
						
						
					 | 
					
						2021-05-05 13:16:40 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						9773fee50b
					 | 
					
						
						
							
							Validation of matching fields is working
						
						
						
						
						
						
					 | 
					
						2021-05-05 12:40:48 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						ecc9eec084
					 | 
					
						
						
							
							Merge pull request #1547 from SchrodingersGat/no-wrap
						
						
						
						
						
						
						
						Disable wrapping for translation files 
						
						
					 | 
					
						2021-05-05 17:54:01 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						7a19145be1
					 | 
					
						
						
							
							Disable wrapping for translation files
						
						
						
						
						
						
						
						This ensures that the updates pushed back from crowding don't have unnecessary file deltas
Ref: https://docs.djangoproject.com/en/3.2/ref/django-admin/#django-admin-makemessages 
						
						
					 | 
					
						2021-05-05 17:34:35 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						54fb96f239
					 | 
					
						
						
							
							Merge pull request #1542 from matmair/matmair/issue1513
						
						
						
						
						
						
						
						adds auto price-update from price-brake to purchase order lines 
						
						
					 | 
					
						2021-05-05 09:22:59 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						6bf4887284
					 | 
					
						
						
							
							Merge pull request #1544 from matmair/matmair/issue1543
						
						
						
						
						
						
						
						[BUG] invoke: too many arguments 
						
						
					 | 
					
						2021-05-05 09:18:56 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						251603b69b
					 | 
					
						
						
							
							removing temp fix for invoke error
						
						
						
						
						
						
					 | 
					
						2021-05-04 23:47:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						b4342d6203
					 | 
					
						
						
							
							Fixed templates, not sure why can't keep FileManager across forms... and also need to save form data
						
						
						
						
						
						
					 | 
					
						2021-05-04 17:35:27 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7fa235282b
					 | 
					
						
						
							
							sale price in ui
						
						
						
						
						
						
					 | 
					
						2021-05-04 22:50:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						28a67828e3
					 | 
					
						
						
							
							[BUG] invoke: too many arguments
						
						
						
						
						
						
						
						Fixes #1543 
						
						
					 | 
					
						2021-05-04 22:04:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a6fc5d2ebe
					 | 
					
						
						
							
							Merge branch 'issue1425' of https://github.com/matmair/InvenTree into issue1425
						
						
						
						
						
						
					 | 
					
						2021-05-04 21:57:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |