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 pull request #8453 from turbo124/v5-develop

Browse Source 
Minor fixes for translations
This commit is contained in:
David Bomba 2023-04-20 16:13:43 +10:00 committed by GitHub
commit 48e1b678da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,7 +154,7 @@ class BaseRule implements RuleInterface
match($this->client_region){ match($this->client_region){
'US' => $this->client_subregion = $this->tax_data->geoState, 'US' => $this->client_subregion = $this->tax_data->geoState,
'EU' => $this->client_subregion = $this->client->country->iso_3166_2, 'EU' => $this->client_subregion = $this->client->country->iso_3166_2,
default => $this->client->country->iso_3166_2, default => $this->client_subregion = $this->client->country->iso_3166_2,
}; };
return $this; return $this;

1
app/DataMapper/Tax/TaxModel.php
View File

@ -381,6 +381,7 @@ class TaxModel
$this->regions->EU->subregions->DK = new \stdClass(); $this->regions->EU->subregions->DK = new \stdClass();
$this->regions->EU->subregions->DK->tax_rate = 25; $this->regions->EU->subregions->DK->tax_rate = 25;
$this->regions->EU->subregions->DK->tax_name = 'Moms';
$this->regions->EU->subregions->DK->reduced_tax_rate = 0; $this->regions->EU->subregions->DK->reduced_tax_rate = 0;
$this->regions->EU->subregions->DK->apply_tax = false; $this->regions->EU->subregions->DK->apply_tax = false;

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

@ -532,7 +532,7 @@ class BankIntegrationController extends BaseController
$accounts = $yodlee->getAccounts(); $accounts = $yodlee->getAccounts();
foreach ($accounts as $account) { foreach ($accounts as $account) {
if (!BankIntegration::where('bank_account_id', $account['id'])->where('company_id', auth()->user()->company()->id)->exists()) { if (!BankIntegration::withTrashed()->where('bank_account_id', $account['id'])->where('company_id', auth()->user()->company()->id)->exists()) {
$bank_integration = new BankIntegration(); $bank_integration = new BankIntegration();
$bank_integration->company_id = auth()->user()->company()->id; $bank_integration->company_id = auth()->user()->company()->id;
$bank_integration->account_id = auth()->user()->account_id; $bank_integration->account_id = auth()->user()->account_id;
@ -547,7 +547,6 @@ class BankIntegrationController extends BaseController
$bank_integration->nickname = $account['nickname']; $bank_integration->nickname = $account['nickname'];
$bank_integration->balance = $account['current_balance']; $bank_integration->balance = $account['current_balance'];
$bank_integration->currency = $account['account_currency']; $bank_integration->currency = $account['account_currency'];
$bank_integration->save(); $bank_integration->save();
} }
} }

2
lang/en/texts.php
View File

@ -5060,6 +5060,8 @@ $LANG = array(
'date_picker_hint' => 'Use +days to set the date in the future', 'date_picker_hint' => 'Use +days to set the date in the future',
'app_help_link' => 'More information ', 'app_help_link' => 'More information ',
'here' => 'here', 'here' => 'here',
'industry_Restaurant & Catering' => 'Restaurant & Catering',
'show_credits_table' => 'Show Credits Table',
); );

4
resources/views/pdf-designs/calm.html
View File

@ -413,8 +413,8 @@
<div id="statement-invoice-table-totals" data-ref="statement-totals"></div> <div id="statement-invoice-table-totals" data-ref="statement-totals"></div>
<table id="statement-payment-table" cellspacing="0" data-ref="table"></table> <table id="statement-payment-table" cellspacing="0" data-ref="table"></table>
<div id="statement-payment-table-totals" data-ref="statement-totals"></div> <div id="statement-payment-table-totals" data-ref="statement-totals"></div>
<table id="statement-credit-table" cellspacing="0" data-ref="table"></table> <table id="statement-credit-table" cellspacing="0" data-ref="table"></table>
<div id="statement-credit-table-totals" data-ref="statement-totals"></div> <div id="statement-credit-table-totals" data-ref="statement-totals"></div>
<table id="statement-aging-table" cellspacing="0" data-ref="table"></table> <table id="statement-aging-table" cellspacing="0" data-ref="table"></table>
<div id="statement-aging-table-totals" data-ref="statement-totals"></div> <div id="statement-aging-table-totals" data-ref="statement-totals"></div>
<div id="table-totals" cellspacing="0">$status_logo</div> <div id="table-totals" cellspacing="0">$status_logo</div>