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

Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Robert Ferrús 2024-04-24 10:14:49 +00:00
parent ffe56edc9c f7d9cc8102
commit 5efe286382
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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,
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

8
modules/invoiceOut/back/models/cplus-rectification-type.json
View File

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

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.comercialName | dashIfEmpty}} {{::client.workerName | dashIfEmpty}}
</vn-span> </vn-span>
</td> </td>
</tr> </tr>

4
modules/ticket/back/methods/ticket-request/filter.js
View File

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