diff --git a/app/Helpers/Invoice/InvoiceSum.php b/app/Helpers/Invoice/InvoiceSum.php index d3e54e607861..3a9d4bab6685 100644 --- a/app/Helpers/Invoice/InvoiceSum.php +++ b/app/Helpers/Invoice/InvoiceSum.php @@ -160,16 +160,16 @@ class InvoiceSum { $this->total += $this->total_taxes; - if($this->invoice->custom_value1 > 0) + if(is_numeric($this->invoice->custom_value1) && $this->invoice->custom_value1 > 0) $this->total += $this->invoice->custom_value1; - if($this->invoice->custom_value2 > 0) + if(is_numeric($this->invoice->custom_value2) && $this->invoice->custom_value2 > 0) $this->total += $this->invoice->custom_value2; - if($this->invoice->custom_value3 > 0) + if(is_numeric($this->invoice->custom_value3) && $this->invoice->custom_value3 > 0) $this->total += $this->invoice->custom_value3; - if($this->invoice->custom_value4 > 0) + if(is_numeric($this->invoice->custom_value4) && $this->invoice->custom_value4 > 0) $this->total += $this->invoice->custom_value4; return $this; diff --git a/app/Helpers/Invoice/InvoiceSumInclusive.php b/app/Helpers/Invoice/InvoiceSumInclusive.php index 20f10b609aba..95d2492b7354 100644 --- a/app/Helpers/Invoice/InvoiceSumInclusive.php +++ b/app/Helpers/Invoice/InvoiceSumInclusive.php @@ -172,16 +172,16 @@ class InvoiceSumInclusive { //$this->total += $this->total_taxes; - if($this->invoice->custom_value1 > 0) + if(is_numeric($this->invoice->custom_value1) && $this->invoice->custom_value1 > 0) $this->total += $this->invoice->custom_value1; - if($this->invoice->custom_value2 > 0) + if(is_numeric($this->invoice->custom_value2) && $this->invoice->custom_value2 > 0) $this->total += $this->invoice->custom_value2; - if($this->invoice->custom_value3 > 0) + if(is_numeric($this->invoice->custom_value3) && $this->invoice->custom_value3 > 0) $this->total += $this->invoice->custom_value3; - if($this->invoice->custom_value4 > 0) + if(is_numeric($this->invoice->custom_value4) && $this->invoice->custom_value4 > 0) $this->total += $this->invoice->custom_value4; return $this; diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index c83d8c214b40..5e26f3ceb784 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -128,7 +128,7 @@ class Import implements ShouldQueue 'task_statuses', 'expenses', 'tasks', - 'documents', + // 'documents', ]; /**