Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 22:54:25 +01:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
David Bomba 2024-10-25 17:51:09 +11:00
commit 8c7b31c599
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/Jobs/Company/CompanyExport.php
View File

@ -307,7 +307,7 @@ class CompanyExport implements ShouldQueue
$invoice = $this->transformArrayOfKeys($invoice, ['recurring_id','client_id', 'vendor_id', 'project_id', 'design_id', 'subscription_id']); $invoice = $this->transformArrayOfKeys($invoice, ['recurring_id','client_id', 'vendor_id', 'project_id', 'design_id', 'subscription_id']);
$invoice->tax_data = ''; $invoice->tax_data = '';
return $invoice->makeVisible(['id', return $invoice->makeHidden(['gateway_fee'])->makeVisible(['id',
'private_notes', 'private_notes',
'user_id', 'user_id',
'client_id', 'client_id',

2
lang/en/texts.php
View File

@ -5384,7 +5384,7 @@ $lang = array(
'currency_Congolese_Franc' => 'Congolese Franc', 'currency_Congolese_Franc' => 'Congolese Franc',
'currency_Djiboutian_Franc' => 'Djiboutian Franc', 'currency_Djiboutian_Franc' => 'Djiboutian Franc',
'currency_Eritrean_Nakfa' => 'Eritrean Nakfa', 'currency_Eritrean_Nakfa' => 'Eritrean Nakfa',
'currency_Falkland_Islands_Pound' => 'Falklan Islands Pound', 'currency_Falkland_Islands_Pound' => 'Falkland Islands Pound',
'currency_Guinean_Franc' => 'Guinean Franc', 'currency_Guinean_Franc' => 'Guinean Franc',
'currency_Iraqi_Dinar' => 'Iraqi Dinar', 'currency_Iraqi_Dinar' => 'Iraqi Dinar',
'currency_Lesotho_Loti' => 'Lesotho Loti', 'currency_Lesotho_Loti' => 'Lesotho Loti',