Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

app/Http/Controllers/SelfUpdateController.php

@@ -102,6 +102,9 @@ class SelfUpdateController extends BaseController
             }
         }
 
+        if(Storage::disk('base')->directoryExists('resources/lang'))
+            Storage::disk('base')->deleteDirectory('resources/lang');
+
         nlog('Removing cache files');
 
         Artisan::call('clear-compiled');

app/Jobs/Company/CompanyImport.php

@@ -229,6 +229,11 @@ class CompanyImport implements ShouldQueue
                 'is_template',
             ]
         ],
+        '5.8.51' => [
+            CompanyGateway::class => [
+                'always_show_required_fields',
+            ]
+        ]
     ];
 
     /**

app/Utils/Traits/GeneratesCounter.php

@@ -288,6 +288,7 @@ trait GeneratesCounter
      */
     public function getNextProjectNumber(Project $project): string
     {
+        
         $entity_number = $this->getNextEntityNumber(Project::class, $project->client, false);
 
         return $this->replaceUserVars($project, $entity_number);