Commit Graph

  • 270ca2a141 Merge pull request #1205 from Tria-plc/freight_feature/usermanagement marshal 2026-08-10 00:17:56 +03:00
  • 573e777e8f changes Marshal 2026-08-09 21:16:52 +00:00
  • f5c37d3374 Merge pull request #1204 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-09 22:29:56 +03:00
  • f6dac28ac0 fix: rm the exception Nathnael 2026-08-09 19:27:47 +00:00
  • 0e676fffae Merge pull request #1203 from Tria-plc/eims-integration Hagernesh Tadesse 2026-08-09 19:09:21 +03:00
  • cde67e4c6a fix(freight): correct direct CAS lines and sync inventory on schedule load Hagernesh 2026-08-09 16:03:52 +00:00
  • 02d32b0414 Merge pull request #1202 from Tria-plc/staging Nathnael Wondisha 2026-08-09 16:49:24 +03:00
  • f9f88bd2b3 Merge pull request #1201 from Tria-plc/dev Nathnael Wondisha 2026-08-09 16:48:09 +03:00
  • 1797238d26 Merge pull request #1200 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-09 16:45:25 +03:00
  • a47c7f6b7a Merge branch 'dev' into freight/nati-2 Nathnael 2026-08-09 13:44:18 +00:00
  • f9f4b22a21 fix: video thumbnail Nathnael 2026-08-09 13:42:28 +00:00
  • 5e0674e2fb fix: poa email Nathnael 2026-08-09 13:28:45 +00:00
  • ff9bb4954a fix: the content document Nathnael 2026-08-09 13:27:05 +00:00
  • 182787e143 fix: gm email Nathnael 2026-08-09 07:57:45 +00:00
  • 0d607ffeec Merge pull request #1199 from Tria-plc/dev marshal 2026-08-09 00:15:47 +03:00
  • 92bd70d860 Merge pull request #1198 from Tria-plc/freight_feature/usermanagement marshal 2026-08-09 00:14:55 +03:00
  • aedab1b436 keep cents in CBE bills and prices Marshal 2026-08-08 21:09:20 +00:00
  • 338fa78618 Merge pull request #1197 from Tria-plc/freight_feature/usermanagement marshal 2026-08-08 23:59:15 +03:00
  • 622c690ed1 keep cents in CBE bills and prices Marshal 2026-08-08 20:58:37 +00:00
  • 22804da1b7 Merge pull request #1196 from Tria-plc/dev marshal 2026-08-08 23:47:02 +03:00
  • 7f9f6da405 Merge pull request #1195 from Tria-plc/freight_feature/usermanagement marshal 2026-08-08 23:46:17 +03:00
  • 80a14c176b keep cents in CBE bills and prices Marshal 2026-08-08 20:45:05 +00:00
  • 6853562dd7 Merge pull request #1194 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-08 21:10:51 +03:00
  • e03ccf0f69 fix Nathnael 2026-08-08 18:09:40 +00:00
  • a02fc66ec3 Merge pull request #1191 from Tria-plc/dev marshal 2026-08-08 21:08:01 +03:00
  • dd824c8196 Merge pull request #1193 from Tria-plc/freight_feature/usermanagement marshal 2026-08-08 21:07:35 +03:00
  • aad9ebaf78 fix issue Marshal 2026-08-08 18:06:47 +00:00
  • 12eb07752e Merge pull request #1192 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-08 20:38:37 +03:00
  • 804d5eeb69 Merge pull request #1190 from Tria-plc/dev marshal 2026-08-08 18:43:08 +03:00
  • 352c873961 fix: add user email fall back Nathnael 2026-08-08 15:38:00 +00:00
  • 4fd7d288e4 Merge pull request #1189 from Tria-plc/eims-integration Hagernesh Tadesse 2026-08-08 18:22:13 +03:00
  • 337ff6cfe3 feat(freight): support direct truck-to-train export handover Hagernesh 2026-08-08 15:15:52 +00:00
  • 954cbec8f0 Merge pull request #1188 from Tria-plc/freight_feature/usermanagement marshal 2026-08-08 18:15:23 +03:00
  • fb6f8afc0c add usd for import Marshal 2026-08-08 15:14:10 +00:00
  • 7a32bb95ff refactor: rm company profile Nathnael 2026-08-08 15:06:46 +00:00
  • 3122169792 Merge pull request #1187 from Tria-plc/freight_feature/usermanagement marshal 2026-08-08 17:23:19 +03:00
  • 88b995d3d7 fix issue Marshal 2026-08-08 14:22:38 +00:00
  • e274981c54 Merge pull request #1186 from Tria-plc/freight_feature/usermanagement marshal 2026-08-08 17:03:25 +03:00
  • 4b8119fd3c chnages Marshal 2026-08-08 14:02:58 +00:00
  • 1700ae0747 chnages Marshal 2026-08-08 14:00:45 +00:00
  • d337fa0d85 fix(freight:backoffice): remove coarse fleet.view/fleet.manage/admin fallbacks Nathnael 2026-08-08 13:59:06 +00:00
  • a8591c0071 Merge pull request #1185 from Tria-plc/eims-integration Hagernesh Tadesse 2026-08-08 16:48:30 +03:00
  • a42d32c27c feat(billing): USD offline bank-transfer payments Marshal 2026-08-08 13:37:05 +00:00
  • 80e1648672 fix Hagernesh 2026-08-08 13:17:33 +00:00
  • 204bfd2421 fix: let trains dispatch with cargo still in the warehouse Hagernesh 2026-08-08 12:56:10 +00:00
  • 83b9e32670 usd remove from the portal Marshal 2026-08-08 12:40:07 +00:00
  • 7a84826947 usd remove from the portal Marshal 2026-08-08 12:39:56 +00:00
  • f9808d1a28 Merge pull request #1184 from Tria-plc/dev marshal 2026-08-08 13:52:52 +03:00
  • 1b0978bc1e Merge pull request #1183 from Tria-plc/freight_feature/usermanagement marshal 2026-08-08 13:49:16 +03:00
  • 229d9c6651 feat(freight-web): restrict booking currency to ETB and portal ETB payments to CBE bill only Marshal 2026-08-08 10:47:48 +00:00
  • 8a0afd37b6 Merge pull request #1182 from Tria-plc/dev Nathnael Wondisha 2026-08-08 12:47:39 +03:00
  • a140add64e Merge pull request #1181 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-08 12:38:32 +03:00
  • 41e8c08ba3 feat: WIP Contnet managemtn Nathnael 2026-08-08 09:37:28 +00:00
  • ee25de8817 fix(freight:backoffice): wire dedicated permission keys instead of broad fallbacks Nathnael 2026-08-08 09:36:51 +00:00
  • 268737cc4f Merge pull request #1180 from Tria-plc/lastmilerequest Hagernesh Tadesse 2026-08-08 12:30:43 +03:00
  • 9551c71442 Merge pull request #1179 from Tria-plc/eims-integration Hagernesh Tadesse 2026-08-08 12:29:27 +03:00
  • c20f395f5f fix: stamp export self-haul truck arrival on receive to warehouse Hagernesh 2026-08-08 09:24:59 +00:00
  • ba7fad08ca Merge pull request #1178 from Tria-plc/dev marshal 2026-08-08 11:52:38 +03:00
  • 3a78605893 Merge pull request #1177 from Tria-plc/alpha Stephanos A. 2026-08-08 11:18:49 +03:00
  • 3251901aa7 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-08-08 11:14:17 +03:00
  • 734351b357 Overall report and passenger list updates Stephanos A 2026-08-08 11:13:08 +03:00
  • 9d4e6ac085 Merge pull request #1176 from Tria-plc/eims-integration Hagernesh Tadesse 2026-08-08 10:55:47 +03:00
  • 55103f5028 modify docker compose Sennay 2026-08-08 10:53:28 +03:00
  • 375cf55e5f LM map missing map api fall back fix Hagernesh 2026-08-08 07:48:39 +00:00
  • 8d3dfa4113 fix(eims): map buyer Wereda to a MoR code too, fail locally if unmapped Hagernesh 2026-08-08 07:47:03 +00:00
  • 1bfd7a4f97 Merge pull request #1175 from Tria-plc/eims-integration Hagernesh Tadesse 2026-08-08 09:58:55 +03:00
  • aec4f3d654 fix(eims): match MoR's payload rules found by live rejections Hagernesh 2026-08-08 05:27:07 +00:00
  • e12cb78e9b feat(portal): pay-later last-mile note, gated by service type lastmilerequest Hagernesh 2026-08-08 05:24:22 +00:00
  • 40a6ccc928 Merge pull request #1174 from Tria-plc/eims-integration Hagernesh Tadesse 2026-08-08 07:58:22 +03:00
  • 2e26936bf1 fix(eims): retimestamp the EIMS migration to 3330000000000 Hagernesh 2026-08-08 04:56:28 +00:00
  • 6b1ffa831f feat(eims): surface filing state in backoffice and alert on failures Hagernesh 2026-08-08 04:05:45 +00:00
  • b72e44a7a5 Merge pull request #1173 from Tria-plc/freight_feature/usermanagement marshal 2026-08-08 02:58:09 +03:00
  • a05753f4a6 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement Marshal 2026-08-07 23:55:30 +00:00
  • cd90ccb0f5 feat(contracts): per-cargo bulk contract templates Marshal 2026-08-07 23:50:27 +00:00
  • 7d8a2847e0 Merge pull request #1172 from Tria-plc/freight_feature/usermanagement marshal 2026-08-08 02:00:59 +03:00
  • d2eb47d14b feat(ui): Marshal 2026-08-07 23:00:06 +00:00
  • 4a001eaf7d Merge pull request #1171 from Tria-plc/dev Nathnael Wondisha 2026-08-08 01:20:15 +03:00
  • a9d0a7e9e6 Merge pull request #1170 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-08 01:19:40 +03:00
  • 7f1d8fa260 fix: iam migration Nathnael 2026-08-07 22:18:41 +00:00
  • 412613d8b5 Merge pull request #1169 from Tria-plc/dev Nathnael Wondisha 2026-08-08 01:11:46 +03:00
  • 55e0c6fb0b Merge pull request #1168 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-08 01:10:56 +03:00
  • d44c3f3a38 fix: rm iam migration from migrate Nathnael 2026-08-07 22:10:05 +00:00
  • 98ee5be79b Merge pull request #1167 from Tria-plc/dev Nathnael Wondisha 2026-08-07 21:51:57 +03:00
  • b941d3bf7c Merge pull request #1166 from Tria-plc/eims-integration Hagernesh Tadesse 2026-08-07 18:25:34 +03:00
  • 84a65bfe2e Merge pull request #1165 from Tria-plc/freight_feature/usermanagement marshal 2026-08-07 18:23:01 +03:00
  • 6b3c055a93 Change the value of Field Status = SUCCESS to Success Marshal 2026-08-07 15:21:55 +00:00
  • b8e702dbc0 CAS total Hagernesh 2026-08-07 15:08:02 +00:00
  • 67573d0835 feat(eims): file issued invoices on a cron sweep, off by default Hagernesh 2026-08-07 14:58:32 +00:00
  • 02db3d2e73 fix(eims): keep EIMS filing off the Finance role preset Hagernesh 2026-08-07 14:42:24 +00:00
  • 2e7ef40d9e feat(eims): take the source system from the access token Hagernesh 2026-08-07 13:50:05 +00:00
  • eadecf3fcf chore(eims): default the EIMS tax treatment to 0 Hagernesh 2026-08-07 13:30:24 +00:00
  • 7573019038 feat(eims): register invoices with MoR EIMS and persist the outcome Hagernesh 2026-08-07 13:22:46 +00:00
  • 2644d5e52d feat(eims): add invoice mapper and signed EIMS transport Hagernesh 2026-08-07 11:42:29 +00:00
  • 527534dd73 deploy edr-dev branch SennayT 2026-08-07 16:19:16 +03:00
  • 07bf7403a1 add dev-edr-branch SennayT 2026-08-07 16:17:58 +03:00
  • 22e6e550bc Merge pull request #1164 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-07 15:58:02 +03:00
  • c9bb105e94 feat: add nationality indicator to the customer Nathnael 2026-08-07 12:54:00 +00:00
  • f330f486e5 feat: add notification to intercity user Nathnael 2026-08-07 12:53:19 +00:00
  • 116b479bb0 feat: scope notification to permission actions Nathnael 2026-08-07 12:42:33 +00:00
  • 116ea97be8 Merge pull request #1163 from Tria-plc/freight/nati-2 Nathnael Wondisha 2026-08-07 15:26:32 +03:00