Fixes for task rounding

invoiceninja · May 19, 2024 · faf7cfe · faf7cfe
1 parent aa52e41
commit faf7cfe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/data/models/settings_model.dart b/lib/data/models/settings_model.dart
@@ -843,8 +843,9 @@ abstract class SettingsEntity
       taskRoundToNearest == null ? null : taskRoundToNearest != 1;
 
   bool get isTaskRoundingCustom =>
-      taskRoundToNearest == 0 ||
-      !kTaskRoundingOptions.values.contains(taskRoundToNearest);
+      taskRoundingEnabled == true &&
+      (taskRoundToNearest == 0 ||
+          !kTaskRoundingOptions.values.contains(taskRoundToNearest));
 
   bool get hasAddress => address1 != null && address1!.isNotEmpty;
 

diff --git a/lib/ui/settings/task_settings.dart b/lib/ui/settings/task_settings.dart
@@ -161,7 +161,7 @@ class _TaskSettingsState extends State<TaskSettings> {
                       viewModel.onSettingsChanged(settings.rebuild(
                     (b) => b
                       ..taskRoundToNearest = value == true
-                          ? 60 * 5
+                          ? 60 * 15
                           : value == false
                               ? 1
                               : null,