7336_devToTest #2414

Merged
alexm merged 220 commits from 7336_devToTest into test 2024-05-07 06:26:53 +00:00
3 changed files with 11 additions and 3 deletions
Showing only changes of commit 4cc6b2f4f2 - Show all commits

View File

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

View File

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

View File

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