[Bug #150] Moved hours are taken into account when calculating deviations in hours and cost per hour.

Author: jaragunde

model/vo/CustomProjectVO.php

@@ -89,7 +89,7 @@ public function getWorkedHours() {
      */
     public function getPercDev() {
         if ($this->estHours > 0)
-            return (($this->workedHours/$this->estHours)-1)*100;
+            return (($this->workedHours/($this->estHours+$this->movedHours))-1)*100;
         else return null;
     }
 
@@ -100,7 +100,7 @@ public function getPercDev() {
      * @return double the deviation of the estimated work hours according to the worked ones.
      */
     public function getAbsDev() {
-        return ($this->workedHours-$this->estHours);
+        return ($this->workedHours-$this->estHours-$this->movedHours);
     }
 
     /** Get Estimated Hours Invoice
@@ -111,7 +111,7 @@ public function getAbsDev() {
      */
     public function getEstHourInvoice() {
         if ($this->estHours > 0)
-            return ($this->invoice/$this->estHours);
+            return ($this->invoice/($this->estHours+$this->movedHours));
         else return null;
     }