verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 66 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware

This commit is contained in:
Alex Moreno 2022-02-18 10:17:18 +01:00
parent 927493e9b3 b4c4c6dfff
commit 6b1bd4ee92
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/claim/front/search-panel/index.html
View File

@ -28,7 +28,7 @@
url="Workers/activeWithRole" url="Workers/activeWithRole"
search-function="{firstName: $search}" search-function="{firstName: $search}"
value-field="id" value-field="id"
where="{role: {inq: ['salesPerson', 'officeBoss']}}" where="{role: {inq: ['salesBoss', 'salesPerson', 'officeBoss']}}"
label="Salesperson"> label="Salesperson">
<tpl-item>{{firstName}} {{name}}</tpl-item> <tpl-item>{{firstName}} {{name}}</tpl-item>
</vn-autocomplete> </vn-autocomplete>
@ -38,7 +38,7 @@
url="Workers/activeWithRole" url="Workers/activeWithRole"
search-function="{firstName: $search}" search-function="{firstName: $search}"
value-field="id" value-field="id"
where="{role: 'salesPerson'}" where="{role: {inq: ['salesBoss', 'salesPerson']}}"
label="Attended by"> label="Attended by">
<tpl-item>{{firstName}} {{name}}</tpl-item> <tpl-item>{{firstName}} {{name}}</tpl-item>
</vn-autocomplete> </vn-autocomplete>

4
print/methods/closure/closure.js
View File

@ -12,8 +12,6 @@ module.exports = {
const failedtickets = []; const failedtickets = [];
for (const ticket of tickets) { for (const ticket of tickets) {
try { try {
await db.rawSql('START TRANSACTION');
await db.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id]); await db.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id]);
const invoiceOut = await db.findOne(` const invoiceOut = await db.findOne(`
@ -91,9 +89,7 @@ module.exports = {
const email = new Email('delivery-note-link', args); const email = new Email('delivery-note-link', args);
await email.send(); await email.send();
} }
await db.rawSql('COMMIT');
} catch (error) { } catch (error) {
await db.rawSql('ROLLBACK');
// Domain not found // Domain not found
if (error.responseCode == 450) if (error.responseCode == 450)
return invalidEmail(ticket); return invalidEmail(ticket);

9
print/templates/reports/invoice/assets/css/style.css
View File

@ -5,7 +5,7 @@ h2 {
.table-title { .table-title {
margin-bottom: 15px; margin-bottom: 15px;
font-size: 0.8rem font-size: .8rem
} }
.table-title h2 { .table-title h2 {
@ -16,9 +16,12 @@ h2 {
font-size: 22px font-size: 22px
} }
#nickname h2 { #nickname h2 {
max-width: 400px; max-width: 400px;
word-wrap: break-word text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
} }
#phytosanitary { #phytosanitary {

2
print/templates/reports/invoice/invoice.html
View File

@ -85,7 +85,7 @@
<!-- End of rectified invoices block --> <!-- End of rectified invoices block -->
<!-- Sales block --> <!-- Sales block -->
<div class="vn-mt-lg no-page-break" v-for="ticket in tickets"> <div class="vn-mt-lg" v-for="ticket in tickets">
<div class="table-title clearfix"> <div class="table-title clearfix">
<div class="pull-left"> <div class="pull-left">
<h2>{{$t('deliveryNote')}}</strong> <h2>{{$t('deliveryNote')}}</strong>