diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php index 60adc4bb80d8..4af43a2a1224 100644 --- a/app/Http/Controllers/SelfUpdateController.php +++ b/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'); diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php index ac3dde209232..e1249a67277f 100644 --- a/app/Jobs/Company/CompanyImport.php +++ b/app/Jobs/Company/CompanyImport.php @@ -229,6 +229,11 @@ class CompanyImport implements ShouldQueue 'is_template', ] ], + '5.8.51' => [ + CompanyGateway::class => [ + 'always_show_required_fields', + ] + ] ]; /** diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php index 3c7b3bb7c7a3..731e39a504ea 100644 --- a/app/Utils/Traits/GeneratesCounter.php +++ b/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);