diff --git a/application/views/reports/monthlyemployeehours/euro_view.php b/application/views/reports/monthlyemployeehours/euro_view.php index 445baa7..5e4663d 100644 --- a/application/views/reports/monthlyemployeehours/euro_view.php +++ b/application/views/reports/monthlyemployeehours/euro_view.php @@ -19,7 +19,7 @@ -
eigen budget beschikbaar (ex btw)
+
eigen tarief omzet (ex btw)
totaal geschreven omzet
diff --git a/public/js/lib/modules/reports/invoicereport.js b/public/js/lib/modules/reports/invoicereport.js index d3f5a17..aef778c 100644 --- a/public/js/lib/modules/reports/invoicereport.js +++ b/public/js/lib/modules/reports/invoicereport.js @@ -95,6 +95,8 @@ dbo.invoicereportInit = function () { vm.forecastRemaining( 0 ); vm.totalProjectPayments( 0 ); + vm.monthTotals.removeAll(); + vm.monthPaymentTotals.removeAll(); for ( var i = 1; i <= 12; i++ ) { vm.monthTotals.push( {monthID: i, forecastamount: ko.observable( 0 )} ); vm.monthPaymentTotals.push( {monthID: i, paymentamount: ko.observable( 0 )} ); @@ -173,7 +175,7 @@ dbo.invoicereportInit = function () { _.each( data.forecastMonths, function ( p, i ) { self.forecastMonths.push( new vm.ForecastMonth( p ) ); _.each( vm.monthTotals(), function ( q ) { - if ( q.monthID == i ) q.forecastamount( Number( q.forecastamount() ) + p.forecastamount ); + if ( q.monthID == i ) q.forecastamount( Number( q.forecastamount() ) + Number(p.forecastamount) ); } ); } ); }, @@ -193,7 +195,7 @@ dbo.invoicereportInit = function () { _.each( data.monthPayments, function ( p, i ) { self.paymentMonths.push( new vm.PaymentMonth( p ) ); _.each( vm.monthPaymentTotals(), function ( q ) { - if ( q.monthID == i ) q.paymentamount( Number( q.paymentamount() ) + p.paymentamount ); + if ( q.monthID == i ) q.paymentamount( Number( q.paymentamount() ) + Number(p.paymentamount) ); } ); } ); },