7489-testToMaster #2515

Merged
alexm merged 329 commits from 7489-testToMaster into master 2024-05-28 05:30:19 +00:00
4 changed files with 13 additions and 5 deletions
Showing only changes of commit 5efe286382 - Show all commits

View File

@ -70,7 +70,7 @@ module.exports = Self => {
c.hasToInvoice,
c.isTaxDataChecked,
w.id comercialId,
CONCAT(w.firstName, ' ', w.lastName) comercialName
u.name workerName
FROM vn.ticket t
JOIN vn.company co ON co.id = t.companyFk
JOIN vn.sale s ON s.ticketFk = t.id

View File

@ -15,5 +15,13 @@
"description": {
"type": "string"
}
}
},
"acls": [
{
"accessType": "READ",
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
}
]
}

View File

@ -114,7 +114,7 @@
<vn-span
class="link"
ng-click="workerDescriptor.show($event, client.comercialId)">
{{::client.comercialName | dashIfEmpty}}
{{::client.workerName | dashIfEmpty}}
</vn-span>
</td>
</tr>

View File

@ -1,4 +1,3 @@
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
const buildFilter = require('vn-loopback/util/filter').buildFilter;
const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
@ -135,7 +134,8 @@ module.exports = Self => {
tr.requesterFk,
tr.isOk,
s.quantity saleQuantity,
s.itemFk,
s.itemFk saleItemFk,
i.id itemFk,
i.name itemDescription,
t.shipped,
DATE(t.shipped) shippedDate,