mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-08 20:22:42 +01:00
Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop
This commit is contained in:
commit
8c7b31c599
@ -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->tax_data = '';
|
||||
|
||||
return $invoice->makeVisible(['id',
|
||||
return $invoice->makeHidden(['gateway_fee'])->makeVisible(['id',
|
||||
'private_notes',
|
||||
'user_id',
|
||||
'client_id',
|
||||
|
@ -5384,7 +5384,7 @@ $lang = array(
|
||||
'currency_Congolese_Franc' => 'Congolese Franc',
|
||||
'currency_Djiboutian_Franc' => 'Djiboutian Franc',
|
||||
'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_Iraqi_Dinar' => 'Iraqi Dinar',
|
||||
'currency_Lesotho_Loti' => 'Lesotho Loti',
|
||||
|
Loading…
Reference in New Issue
Block a user