Commit Graph

  • d08096e1c9 Merge pull request #1418 from Tria-plc/credit-invoice dev Hagernesh Tadesse 2026-08-26 11:32:54 +03:00
  • 69062389c7 fix(train-scheduling): marshalling docs respect mid-corridor wagon coupling credit-invoice Hagernesh 2026-08-26 08:27:05 +00:00
  • c11704b15c fix: ( reschedule ) stick the change summery card reschedule Abubeker Yasin 2026-08-26 10:24:28 +03:00
  • 46fa17b341 feat: (reschedule) drop the staff override so only the booker can reschedule Abubeker Yasin 2026-08-26 09:19:53 +03:00
  • 81237606bd Merge pull request #1404 from Tria-plc/staging main marshal 2026-08-26 01:29:45 +03:00
  • 90d9852a4d Merge pull request #1417 from Tria-plc/dev staging marshal 2026-08-26 01:08:42 +03:00
  • 1205e2cdc1 Merge pull request #1416 from Tria-plc/freight_feature/usermanagement marshal 2026-08-26 01:07:22 +03:00
  • 058535d648 Merge branch 'staging' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement freight_feature/usermanagement Marshal 2026-08-25 22:05:57 +00:00
  • bcc5daa137 Merge pull request #1415 from Tria-plc/freight_feature/usermanagement marshal 2026-08-26 01:02:18 +03:00
  • 29371b0b39 feat: implement MANUAL_ONLY status for bookings and update related logic Marshal 2026-08-25 22:01:03 +00:00
  • 1459e646f6 Merge pull request #1414 from Tria-plc/freight_feature/usermanagement marshal 2026-08-26 00:46:17 +03:00
  • b926a3116e feat: enhance train scheduling and contract management features Marshal 2026-08-25 21:44:21 +00:00
  • 731e4dd2d0 Merge pull request #1413 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-25 16:08:52 +03:00
  • 8adbb05479 Merge branch 'dev' into freight/nati-2 freight/nati-2 Nathnael 2026-08-25 13:07:09 +00:00
  • 08aba3fb4d fix Nathnael 2026-08-25 13:05:55 +00:00
  • ac325a6282 feat(reports): report charged vs actual volume in revenue categories Nathnael 2026-08-25 13:05:18 +00:00
  • 6d1e4a630e feat(reports): publish per-stop times when loading & unloading groups by train Nathnael 2026-08-25 13:01:47 +00:00
  • 01ea05f013 fix(auth): keep secondary positions in permission checks Nathnael 2026-08-25 12:00:43 +00:00
  • a4e9466915 Merge pull request #1412 from Tria-plc/freight_feature/usermanagement marshal 2026-08-25 02:50:34 +03:00
  • d5a5085d6d feat: enhance booking and audit log functionalities Marshal 2026-08-24 23:49:20 +00:00
  • 70171fa9d8 Muluhabt ERP modules muluhabtErp Mulu Mehari 2026-08-25 00:11:39 +03:00
  • 5c2100e76d Fix passenger list alignment feature/group_booking Roba Boru 2026-08-24 18:14:10 +03:00
  • 1abfbc1ceb Merge branch 'main' of https://github.com/Tria-plc/edr-platform into feature/group-booking feature/group-booking Roba Boru 2026-08-24 18:05:42 +03:00
  • 2037e8bf30 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into feature/group-booking Roba Boru 2026-08-24 18:05:21 +03:00
  • a5385e1462 Added group booking option Roba Boru 2026-08-24 18:04:13 +03:00
  • bd5b94c7f6 Merge pull request #1411 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-24 17:02:40 +03:00
  • 0a85dbe60d Merge branch 'dev' into freight/nati-2 Nathnael 2026-08-24 14:02:03 +00:00
  • 562c8b48ba feat: updateing the loading and unloading Nathnael 2026-08-24 14:01:19 +00:00
  • cde346af57 Merge pull request #1410 from Tria-plc/credit-invoice Hagernesh Tadesse 2026-08-24 16:21:38 +03:00
  • 565265af79 feat(eims): derive sales receipt fields from recorded invoice payment Hagernesh 2026-08-24 12:48:41 +00:00
  • 6da8adc6e9 Merge pull request #1409 from Tria-plc/freight_feature/usermanagement marshal 2026-08-24 15:51:12 +03:00
  • 2a107e8ba3 fix issue -> consolidation Marshal 2026-08-24 12:24:23 +00:00
  • 17c2dca3cc feat(reports): record loading and unloading time per stop Nathnael 2026-08-24 12:09:04 +00:00
  • 377ab136a5 Merge pull request #1408 from Tria-plc/credit-invoice Hagernesh Tadesse 2026-08-24 12:12:56 +03:00
  • c9a68570e4 feat(eims): import MoR location master and fix importer arg parsing Hagernesh 2026-08-24 09:08:09 +00:00
  • f579438483 Merge pull request #1407 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-24 12:04:30 +03:00
  • 2286135228 feat(reports): add port warehouse operations summary Nathnael 2026-08-24 08:58:58 +00:00
  • ee2caa332c Merge branch 'dev' into freight/nati-2 Nathnael 2026-08-24 08:38:37 +00:00
  • eba09c73ae fix: locomotive filtering Nathnael 2026-08-24 08:21:29 +00:00
  • 2e5dadeee9 fix(reports): apply the trade scope to six unscoped reports Nathnael 2026-08-24 08:01:20 +00:00
  • b7f8a436fb fix(reports): filter the plan side of plan-versus-actual reports Nathnael 2026-08-24 08:01:12 +00:00
  • de407c0014 feat(reports): clamp report descriptions with a show more toggle Nathnael 2026-08-24 07:54:36 +00:00
  • 2c9453f87d feat: ( reschedule ) manage reschedule policies from a Master Data page with full CRUD Abubeker Yasin 2026-08-24 10:44:28 +03:00
  • 27b4191afe Merge pull request #1406 from Tria-plc/freight_feature/usermanagement marshal 2026-08-24 10:15:36 +03:00
  • 979f024869 feat: enhance booking cancellation logic for consolidated pairs with one paid side Marshal 2026-08-24 07:13:50 +00:00
  • baef14c847 style(reports): reformat revenue transactions with prettier Nathnael 2026-08-24 07:12:51 +00:00
  • e8f46675dc feat(reports): add a total wagons column to charged vs actual volume Nathnael 2026-08-24 07:12:40 +00:00
  • a3f06597cc feat(reports): break charged vs actual volume down by leg Nathnael 2026-08-24 07:12:32 +00:00
  • cdb2f234c3 feat(reports): drop the raw booking ID from revenue transactions Nathnael 2026-08-24 07:12:17 +00:00
  • 2be1876460 feat(reports): carry time of day on report date columns Nathnael 2026-08-24 07:12:08 +00:00
  • ccc16f8f0a Merge pull request #1405 from Tria-plc/credit-invoice Hagernesh Tadesse 2026-08-24 10:09:19 +03:00
  • c3894462e7 feat(billing): search invoices by PNR and transaction ref Nathnael 2026-08-24 07:03:08 +00:00
  • 3da00e1f06 feat(billing): show the booking PNR on an invoice Nathnael 2026-08-24 07:02:46 +00:00
  • 018505d6fa feat(billing): filter, show and export invoice payment method Nathnael 2026-08-24 07:02:27 +00:00
  • c937290019 feat(eims): resolve buyer geography from the MoR location master Hagernesh 2026-08-24 04:23:47 +00:00
  • 6a48d9f490 Merge pull request #1403 from Tria-plc/dev marshal 2026-08-23 22:04:05 +03:00
  • d285006114 Merge pull request #1402 from Tria-plc/freight_feature/usermanagement marshal 2026-08-23 22:03:22 +03:00
  • 31fa313c66 add draft declaration Marshal 2026-08-23 19:02:33 +00:00
  • 8547b5bb5f Merge pull request #1401 from Tria-plc/staging marshal 2026-08-23 08:06:44 +03:00
  • 31a4c89b80 Merge pull request #1393 from Tria-plc/dev marshal 2026-08-23 08:02:13 +03:00
  • 74bca8bb5e Merge pull request #1400 from Tria-plc/freight_feature/usermanagement marshal 2026-08-23 08:01:23 +03:00
  • 58f88b74f8 add contract link Marshal 2026-08-23 05:00:43 +00:00
  • 716444e60a feat: add pagination to schedule history and consolidation approvals Marshal 2026-08-23 04:51:34 +00:00
  • e2189040fa feat: add pagination to schedule history and consolidation approvals Marshal 2026-08-23 04:49:58 +00:00
  • 105879b531 Merge pull request #1399 from Tria-plc/freight_feature/usermanagement marshal 2026-08-23 06:59:27 +03:00
  • 8e6fc09aac feat(train-scheduling): mid-route consist changes, audit history, safer workspace Marshal 2026-08-23 03:55:54 +00:00
  • 36b24a3a1b Merge pull request #1398 from Tria-plc/credit-invoice Hagernesh Tadesse 2026-08-22 12:24:13 +03:00
  • 7f5e8349da Intercity andd import export gating Hagernesh 2026-08-22 09:16:17 +00:00
  • e426e0c16e feat(train-scheduling): dedicated load/unload permissions Hagernesh 2026-08-22 09:06:11 +00:00
  • 50f442a414 Merge pull request #1397 from Tria-plc/alpha Stephanos A. 2026-08-22 11:21:04 +03:00
  • 1be2cadf0e Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha alpha Stephanos A 2026-08-22 11:18:30 +03:00
  • 81f7c0f0cd feat: coach utilization report with schedule filtering and export functionality Stephanos A 2026-08-22 11:17:58 +03:00
  • c6c4fcf0cf Merge pull request #1396 from Tria-plc/alpha Abubeker Yasin 2026-08-22 10:49:51 +03:00
  • 3d741ab928 fix: ( passenger-portal ) fix payment amount on booking confirmation Abubeker Yasin 2026-08-22 10:48:34 +03:00
  • 9d8cce84a7 Merge pull request #1395 from Tria-plc/alpha Stephanos A. 2026-08-22 10:27:04 +03:00
  • 6ce4e13b4a fix: change schedule listing order from ascending to descending by departure time Stephanos A 2026-08-22 10:22:32 +03:00
  • 0fd6a1d7d7 feat: (reschedule) share the booking flow's seat map and add a sticky change summary Abubeker Yasin 2026-08-22 09:36:00 +03:00
  • 41b8367638 Merge pull request #1394 from Tria-plc/freight_feature/usermanagement marshal 2026-08-22 09:27:19 +03:00
  • ba89b670c8 fix issue Marshal 2026-08-22 06:26:43 +00:00
  • 12b537ef90 Merge pull request #1392 from Tria-plc/freight_feature/usermanagement marshal 2026-08-22 09:17:41 +03:00
  • 722874203b fix issue Marshal 2026-08-22 06:09:36 +00:00
  • 519cdee90a Merge pull request #1391 from Tria-plc/dev marshal 2026-08-22 04:54:01 +03:00
  • 8923c2416c Merge pull request #1390 from Tria-plc/freight_feature/usermanagement marshal 2026-08-22 04:31:27 +03:00
  • 3455c1b3b4 fix issue Marshal 2026-08-22 01:29:44 +00:00
  • f4115f658d Merge pull request #1389 from Tria-plc/freight_feature/usermanagement marshal 2026-08-22 04:24:35 +03:00
  • 1ab2cfdb3b fix issue Marshal 2026-08-22 01:23:50 +00:00
  • 43590c6042 Merge pull request #1388 from Tria-plc/dev marshal 2026-08-22 03:51:12 +03:00
  • e2dd761203 Merge pull request #1387 from Tria-plc/freight_feature/usermanagement marshal 2026-08-22 03:50:34 +03:00
  • b6c1efa043 fix issue Marshal 2026-08-22 00:49:53 +00:00
  • 78cbb6b87f Merge pull request #1386 from Tria-plc/dev marshal 2026-08-22 03:11:57 +03:00
  • b6a01e9635 Merge pull request #1385 from Tria-plc/freight_feature/usermanagement marshal 2026-08-22 03:10:29 +03:00
  • bad418d79e changes Marshal 2026-08-22 00:09:00 +00:00
  • 4c9fba32f2 Merge pull request #1384 from Tria-plc/dev marshal 2026-08-22 02:36:04 +03:00
  • 1816fe41f3 Merge pull request #1383 from Tria-plc/freight_feature/usermanagement marshal 2026-08-22 02:33:08 +03:00
  • bf4d0632f1 changes Marshal 2026-08-21 23:31:24 +00:00
  • c48e9b8905 fix issue and add consolidation Marshal 2026-08-21 23:28:59 +00:00
  • ed57490575 Merge pull request #1382 from Tria-plc/freight_feature/usermanagement marshal 2026-08-22 02:17:34 +03:00
  • 49b0495e8e Merge branch 'freight_feature/usermanagement' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement Marshal 2026-08-21 23:16:26 +00:00
  • 09deecd04c fix issue and add consolidation Marshal 2026-08-21 23:16:06 +00:00
  • a0822f9d4f Merge pull request #1381 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-21 22:48:14 +03:00