diff --git a/app/Export/CSV/BaseExport.php b/app/Export/CSV/BaseExport.php index ebde41731350..e0344792895c 100644 --- a/app/Export/CSV/BaseExport.php +++ b/app/Export/CSV/BaseExport.php @@ -132,6 +132,7 @@ class BaseExport ]; protected array $invoice_report_keys = [ + 'name' => 'client.name', "invoice_number" => "invoice.number", "amount" => "invoice.amount", "balance" => "invoice.balance", diff --git a/app/Models/User.php b/app/Models/User.php index 8b321a3c932e..22e5130d0df1 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -660,7 +660,7 @@ class User extends Authenticatable implements MustVerifyEmail public function getLocale() { - $locale = $this->language->locale ?? false; + $locale = $this->language->locale ?? null; if($locale) App::setLocale($locale); diff --git a/app/Transformers/RecurringExpenseTransformer.php b/app/Transformers/RecurringExpenseTransformer.php index 62388d1f9a8b..4b48e8654e55 100644 --- a/app/Transformers/RecurringExpenseTransformer.php +++ b/app/Transformers/RecurringExpenseTransformer.php @@ -90,7 +90,6 @@ class RecurringExpenseTransformer extends EntityTransformer 'currency_id' => (string) $recurring_expense->currency_id ?: '', 'category_id' => $this->encodePrimaryKey($recurring_expense->category_id), 'payment_type_id' => (string) $recurring_expense->payment_type_id ?: '', - 'recurring_recurring_expense_id' => (string) $recurring_expense->recurring_recurring_expense_id ?: '', 'is_deleted' => (bool) $recurring_expense->is_deleted, 'should_be_invoiced' => (bool) $recurring_expense->should_be_invoiced, 'invoice_documents' => (bool) $recurring_expense->invoice_documents,