eeintech
							
						 
					 | 
					
						
						
							
						
						9b69980a6c
					 | 
					
						
						
							
							Oopsy forgot to merge PurchaseOrderUpload view
						
						
						
						
						
						
					 | 
					
						2021-05-07 18:08:11 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						88000200b3
					 | 
					
						
						
							
							Merged master and resolved conflicts
						
						
						
						
						
						
					 | 
					
						2021-05-07 18:02:40 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						ceccdf3909
					 | 
					
						
						
							
							Now creating PurchaseOrderLineItem instances!
						
						
						
						
						
						
					 | 
					
						2021-05-07 18:00:30 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						fbf24621f3
					 | 
					
						
						
							
							Getting there...
						
						
						
						
						
						
					 | 
					
						2021-05-07 16:46:10 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						6e269ae41a
					 | 
					
						
						
							
							Now displaying item match table
						
						
						
						
						
						
					 | 
					
						2021-05-07 13:23:10 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						e47a8d6d5e
					 | 
					
						
						
							
							Merge pull request #1545 from matmair/issue1425
						
						
						
						
						
						
						
						adds sales order line item price 
						
						
					 | 
					
						2021-05-07 23:54:45 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						63cf75eefc
					 | 
					
						
						
							
							styling again
						
						
						
						
						
						
					 | 
					
						2021-05-07 15:37:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b6043af7c0
					 | 
					
						
						
							
							auto-set price if sales-order line is added
						
						
						
						
						
						
					 | 
					
						2021-05-07 15:35:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias Mair
							
						 
					 | 
					
						
						
							
						
						bdd61fdb2c
					 | 
					
						
						
							
							enable live-serving of i18n_static tag in debug (#1560)
						
						
						
						
						
						
						
						* enable live-serving of i18n_static tag in debug
* style repair 
						
						
					 | 
					
						2021-05-07 23:18:06 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9e59d41f12
					 | 
					
						
						
							
							style improvments
						
						
						
						
						
						
					 | 
					
						2021-05-07 07:46:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ae01503a9e
					 | 
					
						
						
							
							handeling data in an inheritable way
						
						
						
						
						
						
					 | 
					
						2021-05-07 07:20:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c775c4611f
					 | 
					
						
						
							
							adding custom action button
						
						
						
						
						
						
						
						save the changes to the db and return success-json 
						
						
					 | 
					
						2021-05-07 07:19:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |