diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 58ffb96..e87d4c8 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.05'; + $this->version = '1.00.06'; $this->load->library( 'beheer/session/RetrieveUserSession' ); diff --git a/application/models/eloquent/queries/QEmployeeHours.php b/application/models/eloquent/queries/QEmployeeHours.php index fc2b335..3b45922 100644 --- a/application/models/eloquent/queries/QEmployeeHours.php +++ b/application/models/eloquent/queries/QEmployeeHours.php @@ -29,8 +29,11 @@ class QEmployeeHours { 0 AS nonprofitablehours, 0 AS revenues, SUM(hours) AS nonprojecthours - FROM employeehours - WHERE YEAR(hourdate) = '{$year}' "; + FROM employeehours EMH + JOIN hourtypes HTY + ON HTY.id = EMH.hourtype_id + WHERE YEAR(hourdate) = '{$year}' + AND reportable = 'T' "; if( $month != 0 ) $sql .= "AND MONTH(hourdate) = '$month' "; $sql .= " GROUP BY employee_id, MONTH(hourdate) diff --git a/application/views/pages/offers_view.php b/application/views/pages/offers_view.php index 51882a7..c5c1c58 100644 --- a/application/views/pages/offers_view.php +++ b/application/views/pages/offers_view.php @@ -1,3 +1,4 @@ +
| nummer | -klant | -offertenaam | -datum | -kans | -geaccepteerd | -afgewezen | -+ | nummer | +klant | +offertenaam | +datum | +(eigen) omzet | +kans | +(eigen) omzet * kans | + + +- | + | + € + | +% | -- - | -- + | + € | + + + + + +
|---|