diff --git a/modules/claim/front/search-panel/index.html b/modules/claim/front/search-panel/index.html
index dbbc3a46be..22faf9ec42 100644
--- a/modules/claim/front/search-panel/index.html
+++ b/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">
{{firstName}} {{name}}
@@ -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">
{{firstName}} {{name}}
diff --git a/print/methods/closure/closure.js b/print/methods/closure/closure.js
index 8cce8237c0..2b58205e38 100644
--- a/print/methods/closure/closure.js
+++ b/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);
diff --git a/print/templates/reports/invoice/assets/css/style.css b/print/templates/reports/invoice/assets/css/style.css
index cd605db9bc..9fda2a6138 100644
--- a/print/templates/reports/invoice/assets/css/style.css
+++ b/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 {
diff --git a/print/templates/reports/invoice/invoice.html b/print/templates/reports/invoice/invoice.html
index 8b13f2a157..1d646a0db9 100644
--- a/print/templates/reports/invoice/invoice.html
+++ b/print/templates/reports/invoice/invoice.html
@@ -85,7 +85,7 @@
-