Release 2.37 (#5546)

src/Form/ExportTemplateSpreadsheetForm.php

@@ -14,6 +14,7 @@ use App\Form\Type\ExportColumnsType;
 use App\Form\Type\ExportRendererType;
 use App\Form\Type\LanguageType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -26,6 +27,7 @@ class ExportTemplateSpreadsheetForm extends AbstractType
         $builder->add('renderer', ExportRendererType::class, ['label' => 'type']);
         $builder->add('language', LanguageType::class, ['required' => false]);
         $builder->add('columns', ExportColumnsType::class, ['required' => true]);
+        $builder->add('separator', ChoiceType::class, ['choices' => ['Comma (,)' => ',', 'Semicolon (;)' => ';'], 'required' => true]);
     }
 
     public function configureOptions(OptionsResolver $resolver): void

src/Form/Type/QuickEntryTimesheetType.php

@@ -61,7 +61,7 @@ final class QuickEntryTimesheetType extends AbstractType
                 }
 
                 if ($data instanceof Timesheet && !$this->security->isGranted('edit', $data)) {
-                    $event->getForm()->remove('duration');
+                    // do not call $event->getForm()->remove() this would change the field order
                     $event->getForm()->add('duration', DurationType::class, array_merge(['disabled' => true], $durationOptions));
 
                     $mainForm = $event->getForm()->getParent()?->getParent();
@@ -79,7 +79,7 @@ final class QuickEntryTimesheetType extends AbstractType
                             continue;
                         }
                         $type = \get_class($child->getConfig()->getType()->getInnerType());
-                        $mainForm->remove($key);
+                        // do not call $mainForm->remove() this would change the field order
                         $mainForm->add($key, $type, array_merge($child->getConfig()->getOptions(), ['disabled' => true]));
                     }
                 }