From c376c39e7296ea13afc063188d3421c92244abe4 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 12 Nov 2023 21:22:29 +1100 Subject: [PATCH] V5.7.47 --- VERSION.txt | 2 +- app/Services/Report/TaxSummaryReport.php | 4 +++- config/ninja.php | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 91d0dfd73ee7..c212b57a0df3 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.7.46 \ No newline at end of file +5.7.47 \ No newline at end of file diff --git a/app/Services/Report/TaxSummaryReport.php b/app/Services/Report/TaxSummaryReport.php index 92453e88d59f..6aaaff474d96 100644 --- a/app/Services/Report/TaxSummaryReport.php +++ b/app/Services/Report/TaxSummaryReport.php @@ -83,7 +83,9 @@ class TaxSummaryReport extends BaseExport $this->csv->insertOne([ctrans('texts.tax_summary')]); $this->csv->insertOne([ctrans('texts.created_on'),' ',$this->translateDate(now()->format('Y-m-d'), $this->company->date_format(), $this->company->locale())]); - $this->csv->insertOne([ctrans('texts.date_range'),' ',$this->translateDate($this->start_date, $this->company->date_format(), $this->company->locale()),' - ',$this->translateDate($this->end_date, $this->company->date_format(), $this->company->locale())]); + + if($this->input['date_range'] != 'all') + $this->csv->insertOne([ctrans('texts.date_range'),' ',$this->translateDate($this->start_date, $this->company->date_format(), $this->company->locale()),' - ',$this->translateDate($this->end_date, $this->company->date_format(), $this->company->locale())]); diff --git a/config/ninja.php b/config/ninja.php index 1ae82986a65f..edd4d3806be9 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -15,8 +15,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => env('APP_VERSION','5.7.46'), - 'app_tag' => env('APP_TAG','5.7.46'), + 'app_version' => env('APP_VERSION','5.7.47'), + 'app_tag' => env('APP_TAG','5.7.47'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),