refs #5131 added lines liters to origin ticket

db/changes/230401/00-ticket_canAdvance.sql

@@ -59,15 +59,17 @@ BEGIN
 			GROUP_CONCAT(DISTINCT ipt.code  ORDER BY ipt.code) futureIpt,
 			t2.ipt,
 			t.workerFk,
-			CAST(sum(litros) AS DECIMAL(10,0)) liters,
+			CAST(SUM(litros) AS DECIMAL(10,0)) futureLiters,
-			CAST(count(*) AS DECIMAL(10,0)) `lines`,
+			CAST(COUNT(*) AS DECIMAL(10,0)) `futureLines`,
 			t2.shipped,
 			t.shipped futureShipped,
 			t2.totalWithVat,
 			t.totalWithVat futureTotalWithVat,
-            t2.hasStock,
             t2.agency,
-            am.name futureAgency
+            am.name futureAgency,
+            t2.lines,
+            t2.liters,
+            SUM((s.quantity <= IFNULL(st.amount,0))) hasStock
 		FROM vn.ticket t
 			JOIN vn.ticketState ts ON ts.ticketFk = t.id
 			JOIN vn.state st ON st.id = ts.stateFk
@@ -77,19 +79,20 @@ BEGIN
                         t2.addressFk,
                         st.isNotValidated,
                         st.name state,
-                        GROUP_CONCAT(DISTINCT ipt.code  ORDER BY ipt.code) ipt,
+                        GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) ipt,
                         t2.shipped,
                         t2.totalWithVat,
                         am.name agency,
-                        sum((s.quantity <= IFNULL(st.amount,0))) hasStock
+                        CAST(SUM(litros) AS DECIMAL(10,0)) liters,
+                        CAST(COUNT(*) AS DECIMAL(10,0)) `lines`
 						FROM vn.ticket t2
+                            JOIN vn.saleVolume sv ON t2.id = sv.ticketFk
 							JOIN vn.sale s ON s.ticketFk = t2.id
 							JOIN vn.item i ON i.id = s.itemFk
 							JOIN vn.ticketState ts ON ts.ticketFk = t2.id
 							JOIN vn.state st ON st.id = ts.stateFk
                             JOIN vn.agencyMode am ON t2.agencyModeFk = am.id
 							LEFT JOIN vn.itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
-			                LEFT JOIN tmp.stock st ON st.itemFk = s.itemFk
 						WHERE t2.shipped BETWEEN vDateToAdvance AND util.dayend(vDateToAdvance)
 							AND t2.warehouseFk = vWarehouseFk
 						GROUP BY t2.id) t2 ON t2.addressFk = t.addressFk
@@ -97,6 +100,7 @@ BEGIN
 			JOIN vn.item i ON i.id = s.itemFk
             JOIN vn.agencyMode am ON t.agencyModeFk = am.id
 			LEFT JOIN vn.itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+            LEFT JOIN tmp.stock st ON st.itemFk = s.itemFk
 		WHERE t.shipped BETWEEN vDateFuture AND util.dayend(vDateFuture)
 			AND t.warehouseFk = vWarehouseFk
 		GROUP BY t.id;

modules/ticket/front/advance/index.html

@@ -32,8 +32,8 @@
                 <thead>
                     <tr second-header>
                         <td></td>
-                        <th colspan="6" translate>Origin</th>
+                        <th colspan="9" translate>Origin</th>
-                        <th colspan="8" translate>Destination</th>
+                        <th colspan="7" translate>Destination</th>
                     </tr>
                     <tr>
                         <th shrink>
@@ -57,9 +57,15 @@
                         <th field="futureState">
                             <span translate>State</span>
                         </th>
+                        <th field="futureLiters">
+                            <span translate>Liters</span>
+                        </th>
                         <th field="hasStock">
                             <span>Stock</span>
                         </th>
+                        <th field="futureLines">
+                            <span translate>Lines</span>
+                        </th>
                         <th field="futureTotalWithVat">
                             <span translate>Import</span>
                         </th>
@@ -120,7 +126,9 @@
                                 {{::ticket.futureState | dashIfEmpty}}
                             </span>
                         </td>
+                        <td>{{::ticket.futureLiters | dashIfEmpty}}</td>
                         <td>{{::ticket.hasStock | dashIfEmpty}}</td>
+                        <td>{{::ticket.futureLines | dashIfEmpty}}</td>
                         <td>
                             <span class="chip {{$ctrl.totalPriceColor(ticket.futureTotalWithVat)}}">
                                 {{::(ticket.futureTotalWithVat ? ticket.futureTotalWithVat : 0) | currency: 'EUR': 2}}

modules/ticket/front/advance/index.js

@@ -163,6 +163,10 @@ export default class Controller extends Section {
             return {'liters': value};
         case 'lines':
             return {'lines': value};
+        case 'futureLiters':
+            return {'futureLiters': value};
+        case 'futureLines':
+            return {'futureLines': value};
         case 'ipt':
             return {'ipt': value};
         case 'futureIpt':