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

modules/claim/front/search-panel/index.html

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

print/methods/closure/closure.js

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

print/templates/reports/invoice/assets/css/style.css

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

print/templates/reports/invoice/invoice.html

@@ -85,7 +85,7 @@
                                 <!-- End of rectified invoices 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="pull-left">
                                             <h2>{{$t('deliveryNote')}}</strong>