Resolved merge conflict between feature/MYD-387 and develop
Affichage de
- package-lock.json 29 ajouts, 0 suppressionpackage-lock.json
- package.json 1 ajout, 0 suppressionpackage.json
- src/app/dashboard/driver/new/page.tsx 0 ajout, 6 suppressionssrc/app/dashboard/driver/new/page.tsx
- src/app/dashboard/supplier/SupplierOrder/[id]/page.tsx 10 ajouts, 0 suppressionsrc/app/dashboard/supplier/SupplierOrder/[id]/page.tsx
- src/app/dashboard/supplier/salesOrder/page.tsx 6 ajouts, 0 suppressionsrc/app/dashboard/supplier/salesOrder/page.tsx
- src/routes/paths.ts 4 ajouts, 0 suppressionsrc/routes/paths.ts
- src/shared/_mock/_invoice.ts 4 ajouts, 1 suppressionsrc/shared/_mock/_invoice.ts
- src/shared/_mock/_mock.ts 1 ajout, 0 suppressionsrc/shared/_mock/_mock.ts
- src/shared/sections/driver/add-driver/create-new-driver.tsx 0 ajout, 43 suppressionssrc/shared/sections/driver/add-driver/create-new-driver.tsx
- src/shared/sections/driver/add-driver/driver-new-form.tsx 0 ajout, 136 suppressionssrc/shared/sections/driver/add-driver/driver-new-form.tsx
- src/shared/sections/supplier/All-OrderSupplier/Order-edit-status-modal.tsx 50 ajouts, 0 suppression...ns/supplier/All-OrderSupplier/Order-edit-status-modal.tsx
- src/shared/sections/supplier/All-OrderSupplier/Order-list-view.tsx 77 ajouts, 29 suppressions...d/sections/supplier/All-OrderSupplier/Order-list-view.tsx
- src/shared/sections/supplier/All-OrderSupplier/Order-table-filters-result.tsx 17 ajouts, 3 suppressions...supplier/All-OrderSupplier/Order-table-filters-result.tsx
- src/shared/sections/supplier/All-OrderSupplier/Order-table-row.tsx 157 ajouts, 29 suppressions...d/sections/supplier/All-OrderSupplier/Order-table-row.tsx
- src/shared/sections/supplier/All-OrderSupplier/Order-table-toolbar.tsx 28 ajouts, 4 suppressions...ctions/supplier/All-OrderSupplier/Order-table-toolbar.tsx
- src/shared/sections/supplier/All-OrderSupplier/sales-order/sales-order-list-view.tsx 36 ajouts, 0 suppression...r/All-OrderSupplier/sales-order/sales-order-list-view.tsx
- src/shared/sections/supplier/All-OrderSupplier/supplier-order-details/order-details-container.tsx 37 ajouts, 0 suppression...pplier/supplier-order-details/order-details-container.tsx
- src/shared/sections/supplier/All-OrderSupplier/supplier-order-details/order-details.tsx 359 ajouts, 0 suppression...ll-OrderSupplier/supplier-order-details/order-details.tsx
- src/shared/sections/supplier/All-OrderSupplier/supplier-order-details/order-gap-modal.tsx 97 ajouts, 0 suppression...-OrderSupplier/supplier-order-details/order-gap-modal.tsx
- src/shared/types/invoice.ts 5 ajouts, 3 suppressionssrc/shared/types/invoice.ts
Veuillez vous inscrire ou vous se connecter pour commenter