diff --git a/db/dump/structure.sql b/db/dump/structure.sql
index 7a598d9d7..e064a32fb 100644
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@@ -67138,7 +67138,7 @@ BEGIN
isTaxDataChecked = FALSE;
- SELECT * FROM tmp.ticketProblems;
+ -- SELECT * FROM tmp.ticketProblems;
DROP TEMPORARY TABLE
tmp.clientGetDebt,
diff --git a/front/core/components/table/style.scss b/front/core/components/table/style.scss
index a3c339b5f..08106add4 100644
--- a/front/core/components/table/style.scss
+++ b/front/core/components/table/style.scss
@@ -81,6 +81,9 @@ vn-table {
width: 1px;
text-align: center;
}
+ &[shrink-date] {
+ width: 100px;
+ }
&[expand] {
max-width: 400px;
min-width: 0;
diff --git a/modules/claim/front/index/index.html b/modules/claim/front/index/index.html
index 1688cf7c0..c8f7e994c 100644
--- a/modules/claim/front/index/index.html
+++ b/modules/claim/front/index/index.html
@@ -10,7 +10,7 @@
Id
Client
- Created
+ Created
Worker
State
@@ -29,7 +29,7 @@
{{::claim.name}}
- {{::claim.created | date:'dd/MM/yyyy'}}
+ {{::claim.created | date:'dd/MM/yyyy'}}
{{::invoiceOut.ref | dashIfEmpty}}
- {{::invoiceOut.issued | date:'dd/MM/yyyy' | dashIfEmpty}}
+ {{::invoiceOut.issued | date:'dd/MM/yyyy' | dashIfEmpty}}
{{::invoiceOut.amount | currency: 'EUR': 2 | dashIfEmpty}}
{{::invoiceOut.created | date:'dd/MM/yyyy' | dashIfEmpty}}
{{::invoiceOut.companyCode | dashIfEmpty}}
- {{::invoiceOut.dued | date:'dd/MM/yyyy' | dashIfEmpty}}
+ {{::invoiceOut.dued | date:'dd/MM/yyyy' | dashIfEmpty}}
Client
Confirmed
Created
- Landed
+ Landed
Hour
Agency
Total
@@ -46,8 +46,8 @@
disabled="true">
- {{::order.created | date: 'dd/MM/yyyy HH:mm'}}
-
+ {{::order.created | date: 'dd/MM/yyyy HH:mm'}}
+
{{::order.landed | date:'dd/MM/yyyy'}}
diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html
index 7bbadefe4..6331537f8 100644
--- a/modules/route/front/index/index.html
+++ b/modules/route/front/index/index.html
@@ -17,7 +17,7 @@
Worker
Agency
Vehicle
- Date
+ Date
m³
Description
@@ -44,7 +44,7 @@
{{::route.agencyName | dashIfEmpty}}
{{::route.vehiclePlateNumber | dashIfEmpty}}
- {{::route.created | dashIfEmpty | date:'dd/MM/yyyy'}}
+ {{::route.created | dashIfEmpty | date:'dd/MM/yyyy'}}
{{::route.m3 | dashIfEmpty}}
{{::route.description | dashIfEmpty}}
diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js
index caed359d0..3312aab12 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -303,13 +303,12 @@ module.exports = Self => {
stmt.merge(conn.makeOrderBy(filter.order));
stmt.merge(conn.makeLimit(filter));
- let ticketsIndex = stmts.push(stmt);
+ let ticketsIndex = stmts.push(stmt) - 1;
stmts.push(
`DROP TEMPORARY TABLE
tmp.filter,
tmp.ticket,
- tmp.ticketTotal,
tmp.ticketGetProblems`);
let sql = ParameterizedSQL.join(stmts, ';');
diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html
index 13e2944e5..915e16a11 100644
--- a/modules/ticket/front/index/index.html
+++ b/modules/ticket/front/index/index.html
@@ -16,7 +16,7 @@
Id
Salesperson
- Date
+ Date
Hour
Closure
Alias
@@ -80,12 +80,12 @@
{{::ticket.userName | dashIfEmpty}}
-
+
{{::ticket.shipped | date: 'dd/MM/yyyy'}}
- {{::ticket.shipped | date: 'HH:mm'}}
+ {{::ticket.shipped | date: 'HH:mm'}}
{{::ticket.zoneLanding | date: 'HH:mm'}}
Reference
Agency
Warehouse Out
- Shipped
+ Shipped
Delivered
Warehouse In
- Landed
+ Landed
Received
@@ -29,14 +29,14 @@
{{::travel.ref}}
{{::travel.agencyModeName}}
{{::travel.warehouseOutName}}
-
+
{{::travel.shipped | date:'dd/MM/yyyy'}}
{{::travel.warehouseInName}}
-
+
{{::travel.landed | date:'dd/MM/yyyy'}}