diff --git a/application/controllers/dashboard/DashboardController.php b/application/controllers/dashboard/DashboardController.php index 23dc0fa..4b4066a 100644 --- a/application/controllers/dashboard/DashboardController.php +++ b/application/controllers/dashboard/DashboardController.php @@ -53,13 +53,13 @@ class DashboardController extends MY_Controller { 'revenuesThisYear' => $this->getRevenuesThisYear(), 'currentFinancialYear' => round( $currentFinancialYear ), 'owpNextyear' => round( $totalOwp - $currentFinancialYear ), - 'revenuesNextyear' => round( $currentFinancialYear / 0.4 ), + 'revenuesNextyear' => round( $totalOwp / 0.4 ), 'totalRevenues' => round( $totalRevenues ), 'outstandings' => $this->invoiceOverviews, 'costsToPay' => $this->reservations(), 'invoiced' => $this->getInvoiced(), 'totalChance' => $this->getChanceRevenues(), - 'totalPayment' => Payment::getPaymentInYear( date( 'Y' )) + 'totalPayment' => round( Payment::getPaymentInYear( date( 'Y' ))) ] ); } diff --git a/application/controllers/reports/ReportsController.php b/application/controllers/reports/ReportsController.php index 1dd5c0d..fced682 100644 --- a/application/controllers/reports/ReportsController.php +++ b/application/controllers/reports/ReportsController.php @@ -36,6 +36,7 @@ class ReportsController extends MY_Controller { $projects = $recapprojects->getProjects(); + $this->json( $projects ); } diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 83a5103..00d55bf 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -16,7 +16,7 @@ class MY_Controller extends CI_Controller { { parent::__construct(); - $this->version = '1.00.52'; + $this->version = '1.00.6'; $this->load->library( 'beheer/session/RetrieveUserSession' ); diff --git a/application/libraries/reports/invoice/InvoiceForecast.php b/application/libraries/reports/invoice/InvoiceForecast.php index 89ad696..9a0a9f6 100644 --- a/application/libraries/reports/invoice/InvoiceForecast.php +++ b/application/libraries/reports/invoice/InvoiceForecast.php @@ -112,6 +112,7 @@ class InvoiceForecast { private function setProjectDetails() { $this->projectDetails = [ + 'projectnumber' => $this->project->projectnumber, 'projectname' => $this->projectname, 'customer' => $this->customer, 'needInvoice' => number_format( $this->needInvoice, 0, ',', '.' ), @@ -121,4 +122,4 @@ class InvoiceForecast { ]; } -} \ No newline at end of file +} diff --git a/application/views/pages/invoicereport_view.php b/application/views/pages/invoicereport_view.php index 9c27879..bf34ec7 100644 --- a/application/views/pages/invoicereport_view.php +++ b/application/views/pages/invoicereport_view.php @@ -62,7 +62,7 @@
|
- project
- |
+
+
+
+ projectnummer
+
+
+ |
+
+ project
+ |
klant
|
@@ -24,7 +31,8 @@
||
|---|---|---|---|---|---|
| + | + | @@ -52,4 +60,4 @@ |