fix(Timetracker): Allow factor 0

tine20 · Jul 19, 2021 · 6005711 · 6005711
1 parent 66dd269
commit 6005711
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 37 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -9680,36 +9680,6 @@ parameters:
 			count: 1
 			path: tine20/Timetracker/Model/TimeaccountFilter.php
 
-		-
-			message: "#^PHPDoc tag @property has invalid value \\(Tinebase_DateTime   start_date\\)\\: Unexpected token \"start_date\", expected variable at offset 107$#"
-			count: 1
-			path: tine20/Timetracker/Model/Timesheet.php
-
-		-
-			message: "#^PHPDoc tag @property has invalid value \\(integer             duration\\)\\: Unexpected token \"duration\", expected variable at offset 201$#"
-			count: 1
-			path: tine20/Timetracker/Model/Timesheet.php
-
-		-
-			message: "#^PHPDoc tag @property has invalid value \\(string              start_time\\)\\: Unexpected token \"start_time\", expected variable at offset 154$#"
-			count: 1
-			path: tine20/Timetracker/Model/Timesheet.php
-
-		-
-			message: "#^PHPDoc tag @property has invalid value \\(string              timeaccount_id\\)\\: Unexpected token \"timeaccount_id\", expected variable at offset 246$#"
-			count: 1
-			path: tine20/Timetracker/Model/Timesheet.php
-
-		-
-			message: "#^Access to an undefined property Timetracker_Model_Timesheet\\:\\:\\$start_date\\.$#"
-			count: 1
-			path: tine20/Timetracker/Model/Timesheet.php
-
-		-
-			message: "#^Access to an undefined property Timetracker_Model_Timesheet\\:\\:\\$duration\\.$#"
-			count: 1
-			path: tine20/Timetracker/Model/Timesheet.php
-
 		-
 			message: "#^Access to an undefined property Zend_Db_Adapter_Abstract\\:\\:\\$table_prefix\\.$#"
 			count: 1

diff --git a/tine20/Timetracker/Controller/Timesheet.php b/tine20/Timetracker/Controller/Timesheet.php
@@ -201,7 +201,7 @@ protected function _calculateTimes(Timetracker_Model_Timesheet $_record)
             $_record->start_time = $start->format('H:i');
         }
 
-        if (empty($_record->accounting_time)) {
+        if (!isset($_record->accounting_time)) {
             $_record->accounting_time = $_record->duration;
         }
     }

diff --git a/tine20/Timetracker/Model/Timesheet.php b/tine20/Timetracker/Model/Timesheet.php
@@ -14,11 +14,11 @@
  * 
  * @package     Timetracker
  *
- * @property    integer             accounting_time
- * @property    integer             duration
- * @property    Tinebase_DateTime   start_date
- * @property    string              start_time
- * @property    string              timeaccount_id
+ * @property integer $accounting_time
+ * @property integer $duration
+ * @property Tinebase_DateTime $start_date
+ * @property string $start_time
+ * @property string $timeaccount_id
  */
 class Timetracker_Model_Timesheet extends Tinebase_Record_Abstract implements Sales_Model_Billable_Interface
 {
@@ -259,7 +259,7 @@ class Timetracker_Model_Timesheet extends Tinebase_Record_Abstract implements Sa
             ),
             'accounting_time_factor'    => array(
                 'label'                 => 'Projecttime Accounting factor', // _('Projecttime Accounting factor')
-                'inputFilters' => array('Zend_Filter_Empty' => 1),
+                'inputFilters'          => array('Zend_Filter_Empty' => 0),
                 'type'                  => 'float',
                 'default'               => 1
             ),