Release 1.6.2 (#1289)

* include user teams in user entity
* prevent unauthorized access via API
* improve teamlead permission handling in team timesheets
* add team data to user entity
* add security tests
* highlight menu for invoice template copy
* unified handling of invoice data across all templates
* access to the current users data in invoice templates
* permission improvement in invoice form
* allow to skip record rows
* allow to add new invoice locations without overwriting the global ones
* allow to order user preferences
* change permission for normal users with access to view_other_timesheets
* properly validate invoice template field length
* allow to replace multiple variables in cell values text
* upgraded office invoice template
* doctrine deprecation fix
* upgrade phpoffice/phpword
* fix future begin check for default rounding rules
* dashboard widget counter: respect visibility and teams - fixes #1161
* fix future begin check for default rounding rules
* added new events for pre and post invoice rendering
* fix permission issue for users without team seeing all records
* prevent error in spreadsheet renderer for empty invoices

src/Validator/Constraints/TimesheetValidator.php

@@ -119,12 +119,16 @@ class TimesheetValidator extends ConstraintValidator
                 ->addViolation();
         }
 
-        if (false === $this->configuration->isAllowFutureTimes() && time() < $timesheet->getBegin()->getTimestamp()) {
-            $context->buildViolation('The begin date cannot be in the future.')
-                ->atPath('begin')
-                ->setTranslationDomain('validators')
-                ->setCode(TimesheetConstraint::BEGIN_IN_FUTURE_ERROR)
-                ->addViolation();
+        if (false === $this->configuration->isAllowFutureTimes()) {
+            // allow configured default rounding time + 1 minute - see #1295
+            $allowedDiff = ($this->configuration->getDefaultRoundingBegin() * 60) + 60;
+            if ((time() + $allowedDiff) < $timesheet->getBegin()->getTimestamp()) {
+                $context->buildViolation('The begin date cannot be in the future.')
+                    ->atPath('begin')
+                    ->setTranslationDomain('validators')
+                    ->setCode(TimesheetConstraint::BEGIN_IN_FUTURE_ERROR)
+                    ->addViolation();
+            }
         }
     }