Merge pull request #6842 from msupply-foundation/999-fix-field-order

Rearrange date and clinician in prescriptions

Author: jmbrunskill

client/packages/invoices/src/Prescriptions/DetailView/Toolbar.tsx

@@ -112,20 +112,6 @@ export const Toolbar: FC = () => {
             }
           />
         )}
-        <InputWithLabelRow
-          label={t('label.date')}
-          Input={
-            <DateTimePickerInput
-              disabled={isDisabled}
-              value={DateUtils.getDateOrNull(dateValue) ?? new Date()}
-              format="P"
-              onChange={handleDateChange}
-              maxDate={new Date()}
-            />
-          }
-        />
-      </Grid>
-      <Grid container flexDirection="column" display="flex" gap={1}>
         <InputWithLabelRow
           label={t('label.clinician')}
           Input={
@@ -143,6 +129,20 @@ export const Toolbar: FC = () => {
           }
         />
       </Grid>
+      <Grid container flexDirection="column" display="flex" gap={1}>
+        <InputWithLabelRow
+          label={t('label.date')}
+          Input={
+            <DateTimePickerInput
+              disabled={isDisabled}
+              value={DateUtils.getDateOrNull(dateValue) ?? new Date()}
+              format="P"
+              onChange={handleDateChange}
+              maxDate={new Date()}
+            />
+          }
+        />
+      </Grid>
     </AppBarContentPortal>
   );
 };