| 
							
							
								 Joshua Dwire | 10462cdeb4 | Merge remote-tracking branch 'origin/v5-develop' into v5-develop # Conflicts:
#	resources/views/email/import/completed.blade.php | 2021-02-16 18:20:27 -05:00 |  | 
			
				
					| 
							
							
								 David Bomba | 4612379811 | Fixes for file upload on dedicated routes | 2021-02-16 20:02:33 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 181902fece | Additional company table properties | 2021-02-16 08:52:38 +11:00 |  | 
			
				
					| 
							
							
								 Benjamin Beganović | aacc3b6602 | wip | 2021-02-15 15:52:13 +01:00 |  | 
			
				
					| 
							
							
								 David Bomba | 120d2c21ab | Refactor password reset for admin users | 2021-02-15 10:39:40 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 08e280e651 | Refactor password reset - clientcontact | 2021-02-15 09:54:27 +11:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | ac99b0039d | Import functionality updates | 2021-02-12 19:20:15 -05:00 |  | 
			
				
					| 
							
							
								 David Bomba | e115536b8c | Add quote() relation to activity | 2021-02-09 07:13:16 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | d48756ea79 | Improvements to migration email | 2021-01-31 16:07:45 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 6d278a9c05 | Add flag when permissions change | 2021-01-29 23:29:42 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | af472b21c1 | Working on filtering responses based on user permissions | 2021-01-29 23:05:03 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 9b72acf506 | Payment notifications for autobilling | 2021-01-27 21:56:50 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | b4bf6cc760 | Add document list view | 2021-01-27 21:38:28 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 78d726a483 | Fixes for system logging custom payment drivers | 2021-01-27 16:10:05 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | b5ff2d8a02 | Fixes for company gateway payment method resolution | 2021-01-27 12:06:25 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 458dd1fa4a | Soft delete/restore tokens in sync with CompanyGateway" | 2021-01-27 09:17:27 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 6540a25531 | Refactor client numbering | 2021-01-25 21:34:12 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 24dfbe48dc | working on paid_to_date fields and calculations | 2021-01-24 17:44:14 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 4b87df07b7 | Check that a company gateway always has at least one fee and limits object | 2021-01-22 08:36:25 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | e9e4c39f17 | Add support for QR code variables | 2021-01-21 23:34:21 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 62bc55cf0b | Fixes for client authentication to client portal | 2021-01-21 10:01:13 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | cfc144b6ec | Group Document defaults | 2021-01-20 07:22:14 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | f20db94b62 | Fixes for how we auth a client contact | 2021-01-19 07:29:36 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 81da8e169d | Add documents to groups | 2021-01-18 22:06:26 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | cbd6f212b5 | deprecate old getPaymentMethods() | 2021-01-18 13:59:06 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 8c8509ca40 | Merge pull request #4703 from turbo124/v5-develop Refactor alternateSave() in BaseRepo | 2021-01-16 08:45:37 +11:00 |  | 
			
				
					| 
							
							
								 Benjamin Beganović | bc584c387c | merge upstream/v5-develop | 2021-01-15 11:03:40 +01:00 |  | 
			
				
					| 
							
							
								 David Bomba | 1b551796c5 | Recurring PDF Dependencies | 2021-01-15 14:10:35 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 2f58096872 | Fixes for displaying Recurring Invoice PDF | 2021-01-15 13:02:55 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | f64a798ca5 | Merge pull request #4689 from beganovich/v5-0114-hide-drafts-from-quote-tables (v5) Client portal: Remove drafts from the quotes table | 2021-01-15 08:33:01 +11:00 |  | 
			
				
					| 
							
							
								 Roman Miniv | b20594dc43 | Deleted fillable duplicates. | 2021-01-14 23:01:31 +02:00 |  | 
			
				
					| 
							
							
								 Benjamin Beganović | a43d756068 | missing break | 2021-01-14 14:24:43 +01:00 |  | 
			
				
					| 
							
							
								 Benjamin Beganović | ab4ed1f2b0 | add status converted | 2021-01-14 14:22:01 +01:00 |  | 
			
				
					| 
							
							
								 Benjamin Beganović | c70eb17c16 | fix jpg issues in the documents-table | 2021-01-14 10:25:39 +01:00 |  | 
			
				
					| 
							
							
								 David Bomba | 7d46ec489a | User Activities | 2021-01-14 14:44:52 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 95e5b89641 | fixes for validation of line_items | 2021-01-14 08:16:07 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 97180508e8 | Remove stale invoice_type_id properties | 2021-01-14 07:35:52 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 7f03a1900e | Refactor notifications to be more specific, ie. Invoice -> Reminder 1 template | 2021-01-13 18:20:46 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 249c0e8b2b | fix for presenting company logo in portal | 2021-01-13 12:15:04 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | b2b464fb9e | Check PhantomJS response is valid PDF | 2021-01-13 10:25:33 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 43626c92a2 | Tests for PDF mime | 2021-01-13 10:12:01 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 7d69f5eba3 | Changes to schema for expenses, drop redundant columns from company table | 2021-01-12 08:57:48 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 9e3b28f6ac | Merge pull request #4668 from turbo124/v5-develop Fixes for recurring invoice cron query | 2021-01-12 08:20:52 +11:00 |  | 
			
				
					| 
							
							
								 Benjamin Beganović | 2f17f7011a | Show "Apply credits" only | 2021-01-11 15:21:17 +01:00 |  | 
			
				
					| 
							
							
								 David Bomba | df55785df9 | fix for calculating invoice payments (include partial and full refunds). | 2021-01-11 21:45:38 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | fe457537b6 | Change the way company logos are stored in the settings | 2021-01-11 19:27:11 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | c82d6fa270 | additional column on company and expenses table | 2021-01-08 21:27:49 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 0797c8e4af | fix for fee label | 2021-01-08 14:43:29 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 2e499adea6 | Fix for task status null color value | 2021-01-08 09:03:29 +11:00 |  | 
			
				
					| 
							
							
								 = | 56bcaf0785 | Fix for custom payment driver label | 2021-01-07 21:09:24 +11:00 |  |