diff --git a/app/Helpers/Invoice/InvoiceItemSum.php b/app/Helpers/Invoice/InvoiceItemSum.php index 2ed5543f7171..a542c017c926 100644 --- a/app/Helpers/Invoice/InvoiceItemSum.php +++ b/app/Helpers/Invoice/InvoiceItemSum.php @@ -81,8 +81,6 @@ class InvoiceItemSum private function push() { - nlog($this->sub_total . " + ". $this->getLineTotal()); - $this->sub_total += $this->getLineTotal(); $this->line_items[] = $this->item; @@ -125,9 +123,6 @@ class InvoiceItemSum { $item_tax = 0; - // nlog(print_r($this->item,1)); - // nlog(print_r($this->invoice,1)); - $amount = $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / 100)); $item_tax_rate1_total = $this->calcAmountLineTax($this->item->tax_rate1, $amount); diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index c3271cbfcdc3..60827d644e4d 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -202,6 +202,10 @@ class BaseController extends Controller $transformer = new $this->entity_transformer($this->serializer); $updated_at = request()->has('updated_at') ? request()->input('updated_at') : 0; + if ($user->getCompany()->is_large && $updated_at == 0){ + $updated_at = time(); + } + $updated_at = date('Y-m-d H:i:s', $updated_at); $query->with(