Merge branch 'MS-74' into 'develop'

Modification ou Voucher , Data in french format solved

Closes MS-74

See merge request !477

src/shared/sections/voucher/addVoucher/AddVoucher.tsx

@@ -161,23 +161,24 @@ export default function AddVoucher() {
 
                 <LocalizationProvider dateAdapter={AdapterDayjs}>
                   <DateTimePicker
-                    label="Date d'expiration"
-                    value={formik.values.expirationDate}
-                    onChange={(value) => formik.setFieldValue('expirationDate', value)}
-                    slotProps={{
-                      textField: {
-                        name: 'expirationDate',
-                        onBlur: (event) => {
-                          formik.handleBlur(event);
-                        },
-                        error:
-                          formik.touched.expirationDate && Boolean(formik.errors.expirationDate),
-                        helperText:
-                          formik.touched.expirationDate && formik.errors.expirationDate,
-                        fullWidth: true,
-                        margin: 'normal',
-                      },
-                    }}
+                  label="Date d'expiration"
+                  format="DD/MM/YYYY hh:mm a"
+                  value={formik.values.expirationDate}
+                  onChange={(value) => formik.setFieldValue('expirationDate', value)}
+                  slotProps={{
+                    textField: {
+                    name: 'expirationDate',
+                    onBlur: (event) => {
+                      formik.handleBlur(event);
+                    },
+                    error:
+                      formik.touched.expirationDate && Boolean(formik.errors.expirationDate),
+                    helperText:
+                      formik.touched.expirationDate && formik.errors.expirationDate,
+                    fullWidth: true,
+                    margin: 'normal',
+                    },
+                  }}
                   />
                 </LocalizationProvider>
 

src/shared/sections/voucher/edit-Voucher/EditVoucher.tsx

@@ -168,6 +168,7 @@ export default function EditVoucher({ voucherId }: { voucherId: number }) {
               <LocalizationProvider dateAdapter={AdapterDayjs}>
                 <DateTimePicker
                   label="Date d'expiration"
+                  format="DD/MM/YYYY hh:mm a"
                   value={formik.values.expirationDate}
                   onChange={(value) => formik.setFieldValue('expirationDate', value)}
                   slotProps={{