| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						294e86cc38
					 | 
					
						
						
							
							Add in sale price model
						
						
						
						
						
						
					 | 
					
						2021-05-04 21:56:25 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1614c6e08a
					 | 
					
						
						
							
							Add in sale price model
						
						
						
						
						
						
					 | 
					
						2021-05-04 21:51:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						55cdeef30e
					 | 
					
						
						
							
							adds price-calc to purchase order Fixes #1513
						
						
						
						
						
						
					 | 
					
						2021-05-04 21:33:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						64fb492b97
					 | 
					
						
						
							
							Added match parts step, need to process fields data
						
						
						
						
						
						
					 | 
					
						2021-05-04 14:45:52 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						7cdf0af04a
					 | 
					
						
						
							
							Added upload file step
						
						
						
						
						
						
					 | 
					
						2021-05-04 12:20:57 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						373898d43e
					 | 
					
						
						
							
							Added step description and crispy form tag
						
						
						
						
						
						
					 | 
					
						2021-05-04 10:28:00 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						b847604f15
					 | 
					
						
						
							
							Started implementation of multi-step form for purchase order file uplod
						
						
						
						
						
						
					 | 
					
						2021-05-03 17:30:33 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						5d214fc869
					 | 
					
						
						
							
							Merge pull request #1535 from eeintech/get_price
						
						
						
						
						
						
						
						Added support for fractional price and lower price break 
						
						
					 | 
					
						2021-05-01 09:52:21 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						706f3a913d
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
					 | 
					
						2021-05-01 09:12:36 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						94ff8829f7
					 | 
					
						
						
							
							Merge pull request #1536 from eeintech/manufacturer_part_api_fix
						
						
						
						
						
						
						
						API fixes related to ManufacturerPart 
						
						
					 | 
					
						2021-05-01 08:26:32 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						ecbea8ca30
					 | 
					
						
						
							
							Merge pull request #1537 from matmair/credits
						
						
						
						
						
						
						
						Link for credits in UI and README Closes #1533 
						
						
					 | 
					
						2021-05-01 08:25:17 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						036c5661ec
					 | 
					
						
						
							
							Link for credits in UI and README Closes #1533
						
						
						
						
						
						
					 | 
					
						2021-04-30 23:40:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						4972440dda
					 | 
					
						
						
							
							Fixed API test
						
						
						
						
						
						
					 | 
					
						2021-04-30 15:27:36 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						41962ca23a
					 | 
					
						
						
							
							API fixes related to ManufacturerPart
						
						
						
						
						
						
					 | 
					
						2021-04-30 13:54:56 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						c60f4c4f2f
					 | 
					
						
						
							
							Merge pull request #1529 from matmair/matmair/issue1527
						
						
						
						
						
						
						
						per session user-language settings 
						
						
					 | 
					
						2021-04-30 11:53:39 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						ad8d95f2f0
					 | 
					
						
						
							
							Added two more tests with fractional quantities
						
						
						
						
						
						
					 | 
					
						2021-04-29 14:35:23 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						87b38ec992
					 | 
					
						
						
							
							Added support for fractional part/bom quantity and price
						
						
						
						
						
						
					 | 
					
						2021-04-29 14:22:07 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						2eafdd53b8
					 | 
					
						
						
							
							Merge pull request #1530 from eeintech/complete_build_output_fix
						
						
						
						
						
						
						
						Fixes to create build output form 
						
						
					 | 
					
						2021-04-29 14:56:29 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						dd03efe5f2
					 | 
					
						
						
							
							Merge pull request #1532 from eeintech/purchase_order_fixes
						
						
						
						
						
						
						
						Purchase order fixes 
						
						
					 | 
					
						2021-04-29 09:48:11 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						d072187bf8
					 | 
					
						
						
							
							Fixed exception for quantity check
						
						
						
						
						
						
					 | 
					
						2021-04-28 16:46:42 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						a63d5012f0
					 | 
					
						
						
							
							Purchase order fixes
						
						
						
						
						
						
					 | 
					
						2021-04-28 13:16:40 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						b1ff686395
					 | 
					
						
						
							
							Fixes to create build output form, added validation on quantity field
						
						
						
						
						
						
					 | 
					
						2021-04-28 11:18:47 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						15eb835ffc
					 | 
					
						
						
							
							explicit redirection url Fixes #1527
						
						
						
						
						
						
					 | 
					
						2021-04-28 14:38:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c5640fe6c6
					 | 
					
						
						
							
							renamed theme to appearance
						
						
						
						
						
						
					 | 
					
						2021-04-28 14:37:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						660f2673ac
					 | 
					
						
						
							
							added in language-change form
						
						
						
						
						
						
					 | 
					
						2021-04-28 14:26:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						28b4e12d8c
					 | 
					
						
						
							
							Merge pull request #1528 from matmair/BUG/polish
						
						
						
						
						
						
						
						fixed wrong i18n-code for polish 
						
						
					 | 
					
						2021-04-28 22:21:57 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						292944179e
					 | 
					
						
						
							
							fixed wrong i18n-code for polish
						
						
						
						
						
						
					 | 
					
						2021-04-28 13:57:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						9feed0dcdc
					 | 
					
						
						
							
							Merge pull request #1522 from eeintech/import_records_fix
						
						
						
						
						
						
						
						Add owner model to imports ignore list 
						
						
					 | 
					
						2021-04-28 09:01:48 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						e6c2252887
					 | 
					
						
						
							
							Merge pull request #1523 from eeintech/required_parts_build_order
						
						
						
						
						
						
						
						Updated "Required for Build Orders" API queryset 
						
						
					 | 
					
						2021-04-28 08:57:30 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |