mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-10-31 15:57:33 -04:00 
			
		
		
		
	Merge branch 'master' of github.com:invoiceninja/invoiceninja
This commit is contained in:
		
						commit
						d8a0462e1b
					
				| @ -1168,6 +1168,11 @@ trait GenerateMigrationResources | ||||
| 
 | ||||
|         foreach ($tasks as $task) | ||||
|         { | ||||
| 
 | ||||
| 
 | ||||
|             if(!($task->deleted_at instanceof Carbon)) | ||||
|                 $task->deleted_at = Carbon::parse($task->deleted_at); | ||||
| 
 | ||||
|             $transformed[] = [ | ||||
|                 'id' => $task->id, | ||||
|                 'company_id' => $this->account->id, | ||||
| @ -1204,6 +1209,10 @@ trait GenerateMigrationResources | ||||
| 
 | ||||
|         foreach ($projects as $project) | ||||
|         { | ||||
| 
 | ||||
|             if(!($project->deleted_at instanceof Carbon)) | ||||
|                 $project->deleted_at = Carbon::parse($project->deleted_at); | ||||
| 
 | ||||
|             $transformed[] = [ | ||||
|                 'id' => $project->id, | ||||
|                 'company_id' => $this->account->id, | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user