From dfeeb0b5e3a9fc95e64e896bf5b71cd93a80a8f3 Mon Sep 17 00:00:00 2001 From: Theo Weijmer Date: Sun, 23 Feb 2020 16:21:15 +0100 Subject: [PATCH] changes for dashboard --- application/views/pages/dashboard_view.php | 4 ++-- public/js/lib/modules/dashboard/dashboardModule.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/pages/dashboard_view.php b/application/views/pages/dashboard_view.php index c1be180..9d185a9 100644 --- a/application/views/pages/dashboard_view.php +++ b/application/views/pages/dashboard_view.php @@ -174,7 +174,7 @@

- Saldo inkomsten totaal (excl btw): + Netto kasstroom (excl btw):
-

Openstaande facturen + nog te factureren totaal + kosten derden + reserveringen derden.

+

Openstaande facturen + nog te factureren totaal - kosten derden.

diff --git a/public/js/lib/modules/dashboard/dashboardModule.js b/public/js/lib/modules/dashboard/dashboardModule.js index a0d0d73..01ce6e9 100644 --- a/public/js/lib/modules/dashboard/dashboardModule.js +++ b/public/js/lib/modules/dashboard/dashboardModule.js @@ -63,7 +63,7 @@ dbo.dashboardInit = function () { } ) self.openCosts( dbo.helpers.thousandSeparator( openCosts ) ) - var revenues = outstandings.openInvoices + outstandings.toInvoice + openCosts + var revenues = outstandings.openInvoices + outstandings.toInvoice - openCosts revenues = Math.round( revenues / 1.21 ) self.revenues( dbo.helpers.thousandSeparator( revenues ) ) } )