verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

7383-testToMaster #2445

Merged
alexm merged 233 commits from 7383-testToMaster into master 2024-05-14 05:44:13 +00:00
Conversation 0 Commits 233 Files Changed 166 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9759ee4bd0 - Show all commits

2
modules/invoiceOut/back/methods/invoiceOut/negativeBases.js
View File

@ -70,7 +70,7 @@ module.exports = Self => {
c.hasToInvoice, c.hasToInvoice,
c.isTaxDataChecked, c.isTaxDataChecked,
w.id comercialId, w.id comercialId,
u.name workerSocial 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

2
modules/invoiceOut/front/negative-bases/index.html
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.workerSocial | dashIfEmpty}} {{::client.workerName | dashIfEmpty}}
</vn-span> </vn-span>
</td> </td>
</tr> </tr>