Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Bomba 2024-04-30 15:38:01 +10:00
commit 567ae31067
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/SelfUpdateController.php
View File

@ -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'); nlog('Removing cache files');
Artisan::call('clear-compiled'); Artisan::call('clear-compiled');

5
app/Jobs/Company/CompanyImport.php
View File

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

1
app/Utils/Traits/GeneratesCounter.php
View File

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