Abubeker Yasin
dc2078dd28
fix: ( payments ) stop reconcile-before-cancel deferring bookings forever
2026-08-11 11:19:39 +03:00
Abubeker Yasin
8ce6483e26
Merge branch 'dev' into alpha
2026-08-10 14:38:44 +03:00
Abubeker Yasin
a08b097039
Merge pull request #1218 from Tria-plc/main
...
Main
2026-08-10 14:27:38 +03:00
Abubeker Yasin
0d0887f298
Merge pull request #1217 from Tria-plc/cancelation-fix
...
recover: ( payment ) recover cancelation fix deleted by malware
2026-08-10 14:26:36 +03:00
Abubeker Yasin
18c47ca4a3
recover: ( payment ) recover cancelation fix deleted by malware
2026-08-10 14:25:14 +03:00
Nathnael Wondisha
b91a7e8a8f
Merge pull request #1216 from Tria-plc/freight/nati-2
...
fix
2026-08-10 12:36:29 +03:00
Nathnael Wondisha
6f9beca27d
Merge pull request #1215 from Tria-plc/staging
...
Staging
2026-08-10 12:35:50 +03:00
ghost2023
c75ed8f149
fix
2026-08-10 12:35:43 +03:00
Nathnael Wondisha
3b4619e1e5
Merge pull request #1214 from Tria-plc/dev
...
to staging
2026-08-10 12:34:34 +03:00
Nathnael Wondisha
29d472351f
Merge pull request #1213 from Tria-plc/freight/nati-2
...
Freight/nati 2
2026-08-10 12:33:07 +03:00
ghost2023
d07d35e438
feat: allow owner to represent company as power of attorney
2026-08-10 12:31:13 +03:00
ghost2023
10af12bfc6
fix: theme toggle
2026-08-10 12:00:29 +03:00
Abubeker Yasin
6471c3511a
feat: (payment) add eBirr as synchronous API_PURCHASE wallet debit
2026-08-10 11:36:05 +03:00
Abubeker Yasin
78d69eb02b
fix: ( malware ) remove malware code
2026-08-10 10:37:47 +03:00
Nathnael Wondisha
e4a9aaadff
Merge pull request #1212 from Tria-plc/staging
...
Staging
2026-08-10 10:09:57 +03:00
Nathnael Wondisha
69cd84ebb5
Merge pull request #1211 from Tria-plc/dev
...
to staging
2026-08-10 10:08:38 +03:00
Nathnael Wondisha
b04d308413
Merge pull request #1210 from Tria-plc/freight/nati-2
...
fixes
2026-08-10 10:07:13 +03:00
Nathnael
84081156f6
fixes
2026-08-10 07:06:02 +00:00
Nathnael Wondisha
e656cc3c22
Merge pull request #1209 from Tria-plc/staging
...
Staging
2026-08-10 10:00:53 +03:00
Nathnael Wondisha
087a765b77
Merge pull request #1208 from Tria-plc/dev
...
to stagin
2026-08-10 09:59:53 +03:00
Nathnael Wondisha
826a313c9d
Merge pull request #1207 from Tria-plc/freight/nati-2
...
Freight/nati 2
2026-08-10 09:56:59 +03:00
Nathnael
124c51071b
fix: log email and sms
2026-08-10 06:56:07 +00:00
Nathnael
3d53f67156
fix: gm and poa email requirement
2026-08-10 06:46:25 +00:00
marshal
4d290c9b75
Merge pull request #1206 from Tria-plc/dev
...
freight
2026-08-10 00:30:00 +03:00
marshal
270ca2a141
Merge pull request #1205 from Tria-plc/freight_feature/usermanagement
...
Freight feature/usermanagement
2026-08-10 00:17:56 +03:00
Marshal
573e777e8f
changes
2026-08-09 21:16:52 +00:00
Nathnael Wondisha
f5c37d3374
Merge pull request #1204 from Tria-plc/freight/nati-2
...
fix: rm the exception
2026-08-09 22:29:56 +03:00
Nathnael
f6dac28ac0
fix: rm the exception
2026-08-09 19:27:47 +00:00
Hagernesh Tadesse
0e676fffae
Merge pull request #1203 from Tria-plc/eims-integration
...
fix(freight): correct direct CAS lines and sync inventory on schedule…
2026-08-09 19:09:21 +03:00
Hagernesh
cde67e4c6a
fix(freight): correct direct CAS lines and sync inventory on schedule load
...
End-to-end testing of the direct truck-to-train flow surfaced two defects
in the carriage acceptance sheet's no-wagon fallback. Container numbers
were read from freight.containers, which only gains rows at allocation,
so a direct booking's declared containers never appeared; they are read
from booking_container_units now, seal numbers included. The weight used
bulkTotalWeightTons alone, which is null for CONTAINER and PER_TON bulk
bookings, printing 0.00 — cargoTotalWeightVgm is the real weight there
and only holds an item count for PER_ITEM break-bulk.
Separately, warehouse cargo can be loaded from the Load-to-Train queue or
from the schedule, but loading from the schedule never advanced
warehouse_inventory. The booking went IN_TRANSIT while its cargo still
read as sitting in the warehouse — the same inconsistency that produced
the spurious dispatch block. loadBooking now moves the inventory to
LOADED in the same transaction, and no-ops for direct bookings.
2026-08-09 16:05:59 +00:00
Nathnael Wondisha
02d32b0414
Merge pull request #1202 from Tria-plc/staging
...
Staging
2026-08-09 16:49:24 +03:00
Nathnael Wondisha
f9f88bd2b3
Merge pull request #1201 from Tria-plc/dev
...
y
2026-08-09 16:48:09 +03:00
Nathnael Wondisha
1797238d26
Merge pull request #1200 from Tria-plc/freight/nati-2
...
Freight/nati 2
2026-08-09 16:45:25 +03:00
Nathnael
a47c7f6b7a
Merge branch 'dev' into freight/nati-2
2026-08-09 13:44:18 +00:00
Nathnael
f9f4b22a21
fix: video thumbnail
2026-08-09 13:42:28 +00:00
Nathnael
5e0674e2fb
fix: poa email
2026-08-09 13:28:45 +00:00
Nathnael
ff9bb4954a
fix: the content document
2026-08-09 13:27:05 +00:00
Nathnael
182787e143
fix: gm email
2026-08-09 07:57:45 +00:00
marshal
0d607ffeec
Merge pull request #1199 from Tria-plc/dev
...
freight
2026-08-09 00:15:47 +03:00
marshal
92bd70d860
Merge pull request #1198 from Tria-plc/freight_feature/usermanagement
...
keep cents in CBE bills and prices
2026-08-09 00:14:55 +03:00
Marshal
aedab1b436
keep cents in CBE bills and prices
2026-08-08 21:09:20 +00:00
marshal
338fa78618
Merge pull request #1197 from Tria-plc/freight_feature/usermanagement
...
keep cents in CBE bills and prices
2026-08-08 23:59:15 +03:00
Marshal
622c690ed1
keep cents in CBE bills and prices
2026-08-08 20:58:37 +00:00
marshal
22804da1b7
Merge pull request #1196 from Tria-plc/dev
...
freight
2026-08-08 23:47:02 +03:00
marshal
7f9f6da405
Merge pull request #1195 from Tria-plc/freight_feature/usermanagement
...
keep cents in CBE bills and prices
2026-08-08 23:46:17 +03:00
Marshal
80a14c176b
keep cents in CBE bills and prices
2026-08-08 20:45:05 +00:00
Nathnael Wondisha
6853562dd7
Merge pull request #1194 from Tria-plc/freight/nati-2
...
fix
2026-08-08 21:10:51 +03:00
Nathnael
e03ccf0f69
fix
2026-08-08 18:09:40 +00:00
marshal
a02fc66ec3
Merge pull request #1191 from Tria-plc/dev
...
freight
2026-08-08 21:08:01 +03:00
marshal
dd824c8196
Merge pull request #1193 from Tria-plc/freight_feature/usermanagement
...
fix issue
2026-08-08 21:07:35 +03:00
