reset internal rate upon saving (#2)

Keleo · Dec 9, 2020 · 183e361 · 183e361
1 parent a0c53d4
commit 183e361
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,12 @@
 # Changelog
 
-## 0.2 (unreleased) 
+## 0.2 
 
 - Added GitHub actions for basic CI
 - Code Styles
+- Reset "internal rates" in newer Kimai versions
 
-Compatible with Kimai 0.9
+Compatible with Kimai > 1.9
 
 ## 0.1 
 

diff --git a/Timesheet/Calculator/RecalculateRateCalculator.php b/Timesheet/Calculator/RecalculateRateCalculator.php
@@ -37,6 +37,10 @@ public function calculate(Timesheet $record)
             $record->setFixedRate(null);
         }
 
+        if (null !== $record->getInternalRate()) {
+            $record->setInternalRate(null);
+        }
+
         // we have to trigger it again, as there is no order defined for the calculator
         $this->calculator->calculate($record);
     }

diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.15",
-        "kevinpapst/kimai2": "1.11",
+        "kevinpapst/kimai2": ">1.9",
         "phpstan/phpstan": "^0.12",
         "phpstan/phpstan-symfony": "^0.12",
         "symfony/console": "^4.0",