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' into v5-stable

Browse Source
This commit is contained in:
David Bomba 2024-02-24 14:38:35 +11:00
commit 1292094bb2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/DataMapper/Tax/BaseRule.php
View File

@ -271,7 +271,7 @@ class BaseRule implements RuleInterface
public function isTaxableRegion(): bool public function isTaxableRegion(): bool
{ {
return $this->client->company->tax_data->regions->{$this->client_region}->tax_all_subregions || return $this->client->company->tax_data->regions->{$this->client_region}->tax_all_subregions ||
(property_exists($this->client->company->tax_data->regions->{$this->client_region}->subregions, $this->client_subregion) && $this->client->company->tax_data->regions->{$this->client_region}->subregions->{$this->client_subregion}->apply_tax); (property_exists($this->client->company->tax_data->regions->{$this->client_region}->subregions, $this->client_subregion) && ($this->client->company->tax_data->regions->{$this->client_region}->subregions->{$this->client_subregion}->apply_tax ?? false));
} }
public function defaultForeign(): self public function defaultForeign(): self

2
database/migrations/2024_02_16_011055_smtp_configuration.php
View File

@ -19,7 +19,7 @@ return new class extends Migration
$table->text('smtp_username')->nullable(); $table->text('smtp_username')->nullable();
$table->text('smtp_password')->nullable(); $table->text('smtp_password')->nullable();
$table->string('smtp_local_domain')->nullable(); $table->string('smtp_local_domain')->nullable();
$table->boolean('smtp_verify_peer')->default(0); $table->boolean('smtp_verify_peer')->default(true);
}); });
} }