7773-testToMaster_2430 #2774

Merged
alexm merged 368 commits from 7773-testToMaster_2430 into master 2024-07-23 06:21:03 +00:00
1 changed files with 6 additions and 1 deletions
Showing only changes of commit f0326860ba - Show all commits

View File

@ -177,10 +177,15 @@ module.exports = Self => {
s.name AS supplierName,
s.nickname AS supplierAlias,
co.code AS companyCode,
cu.code AS currencyCode
cu.code AS currencyCode,
t.shipped AS shipped,
t.landed AS landed,
t.warehouseInFk AS warehouseId,
w.name AS warehouseName
FROM vn.entry e
JOIN vn.supplier s ON s.id = e.supplierFk
JOIN vn.travel t ON t.id = e.travelFk
JOIN vn.warehouse w ON w.id = t.warehouseInFk
JOIN vn.company co ON co.id = e.companyFk
JOIN vn.currency cu ON cu.id = e.currencyFk`
);