mirror of
				https://github.com/firefly-iii/firefly-iii.git
				synced 2025-10-31 02:36:28 +00:00 
			
		
		
		
	Merge branch 'main' into develop
# Conflicts: # composer.lock
This commit is contained in:
		
							
								
								
									
										2
									
								
								.github/label-actions.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/label-actions.yml
									
									
									
									
										vendored
									
									
								
							| @@ -4,6 +4,7 @@ | ||||
| feature: | ||||
|   issues: | ||||
|     # Post a comment, `{issue-author}` is an optional placeholder | ||||
|     unlabel: feature | ||||
|     comment: | | ||||
|       Hi there!  | ||||
|  | ||||
| @@ -32,6 +33,7 @@ epic: | ||||
|       Thank you for your contributions. | ||||
|  | ||||
| enhancement: | ||||
|   unlabel: enhancement | ||||
|   issues: | ||||
|     # Post a comment, `{issue-author}` is an optional placeholder | ||||
|     comment: | | ||||
|   | ||||
| @@ -37,30 +37,43 @@ class AccountType extends Model | ||||
| 
 | ||||
|     /** @deprecated */ | ||||
|     public const string ASSET            = 'Asset account'; | ||||
| 
 | ||||
|     /** @deprecated */ | ||||
|     public const string BENEFICIARY      = 'Beneficiary account'; | ||||
| 
 | ||||
|     /** @deprecated */ | ||||
|     public const string CASH             = 'Cash account'; | ||||
| 
 | ||||
|     /** @deprecated */ | ||||
|     public const string CREDITCARD       = 'Credit card'; | ||||
| 
 | ||||
|     /** @deprecated */ | ||||
|     public const string DEBT             = 'Debt'; | ||||
| 
 | ||||
|     /** @deprecated */ | ||||
|     public const string DEFAULT          = 'Default account'; | ||||
| 
 | ||||
|     /** @deprecated */ | ||||
|     public const string EXPENSE          = 'Expense account'; | ||||
| 
 | ||||
|     /** @deprecated */ | ||||
|     public const string IMPORT           = 'Import account'; | ||||
| 
 | ||||
|     /** @deprecated */ | ||||
|     public const string INITIAL_BALANCE  = 'Initial balance account'; | ||||
| 
 | ||||
|     /** @deprecated */ | ||||
|     public const string LIABILITY_CREDIT = 'Liability credit account'; | ||||
| 
 | ||||
|     /** @deprecated */ | ||||
|     public const string LOAN             = 'Loan'; | ||||
| 
 | ||||
|     /** @deprecated */ | ||||
|     public const string MORTGAGE         = 'Mortgage'; | ||||
| 
 | ||||
|     /** @deprecated */ | ||||
|     public const string RECONCILIATION   = 'Reconciliation account'; | ||||
| 
 | ||||
|     /** @deprecated */ | ||||
|     public const string REVENUE          = 'Revenue account'; | ||||
| 
 | ||||
| @@ -80,7 +93,7 @@ class AccountType extends Model | ||||
|     protected function casts(): array | ||||
|     { | ||||
|         return [ | ||||
|             //'type' => AccountTypeEnum::class,
 | ||||
|             // 'type' => AccountTypeEnum::class,
 | ||||
|         ]; | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -57,7 +57,7 @@ class AutoBudget extends Model | ||||
|     protected function casts(): array | ||||
|     { | ||||
|         return [ | ||||
|             //'auto_budget_type' => AutoBudgetType::class,
 | ||||
|             // 'auto_budget_type' => AutoBudgetType::class,
 | ||||
|         ]; | ||||
|     } | ||||
| 
 | ||||
|   | ||||
| @@ -62,7 +62,7 @@ class RecurrenceRepetition extends Model | ||||
|     protected function casts(): array | ||||
|     { | ||||
|         return [ | ||||
|             //'weekend' => RecurrenceRepetitionWeekend::class,
 | ||||
|             // 'weekend' => RecurrenceRepetitionWeekend::class,
 | ||||
|         ]; | ||||
|     } | ||||
| 
 | ||||
|   | ||||
| @@ -57,7 +57,7 @@ class TransactionType extends Model | ||||
|     protected function casts(): array | ||||
|     { | ||||
|         return [ | ||||
|             //'type' => TransactionTypeEnum::class,
 | ||||
|             // 'type' => TransactionTypeEnum::class,
 | ||||
|         ]; | ||||
|     } | ||||
| 
 | ||||
|   | ||||
| @@ -56,9 +56,9 @@ class Webhook extends Model | ||||
|     protected function casts(): array | ||||
|     { | ||||
|         return [ | ||||
| //            'delivery' => WebhookDelivery::class,
 | ||||
| //            'response' => WebhookResponse::class,
 | ||||
| //            'trigger'  => WebhookTrigger::class,
 | ||||
|             //            'delivery' => WebhookDelivery::class,
 | ||||
|             //            'response' => WebhookResponse::class,
 | ||||
|             //            'trigger'  => WebhookTrigger::class,
 | ||||
|         ]; | ||||
|     } | ||||
| 
 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user