CHANGELOG.md

@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - (Monitor tickets) Muestra un icono al lado de la zona, si el ticket es frágil y se envía por agencia
 
 ### Changed
--
+- (Envíos -> Extra comunitarios) Se agrupan las entradas del mismo travel. Añadidos campos Referencia y Importe.
 
 ### Fixed
 -

modules/travel/back/methods/travel/extraCommunityFilter.js

@@ -130,6 +130,7 @@ module.exports = Self => {
                     SUM(b.stickers) AS stickers,
                     s.id AS cargoSupplierFk,
                     s.nickname AS cargoSupplierNickname,
+                    s.name AS supplierName,
                     CAST(SUM(b.weight * b.stickers) as DECIMAL(10,0)) as loadedKg,
                     CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) as DECIMAL(10,0)) as volumeKg
                 FROM travel t
@@ -167,6 +168,7 @@ module.exports = Self => {
                     SUM(b.stickers) AS stickers,
                     e.evaNotes,
                     e.notes,
+                    e.invoiceAmount,
                     CAST(SUM(b.weight * b.stickers) AS DECIMAL(10,0)) as loadedkg,
                     CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) AS DECIMAL(10,0)) as volumeKg
                 FROM tmp.travel tr

modules/travel/front/extra-community/index.html

@@ -3,7 +3,7 @@
     url="Travels/extraCommunityFilter"
     user-params="::$ctrl.defaultFilter"
     data="travels"
-    order="shipped ASC, landed ASC, travelFk, loadPriority, agencyModeFk, evaNotes"
+    order="landed ASC, shipped ASC, travelFk, loadPriority, agencyModeFk, supplierName, evaNotes"
     limit="20"
     auto-load="true">
 </vn-crud-model>
@@ -48,6 +48,9 @@
                         <th field="agencyModeFk">
                             <span translate>Agency</span>
                         </th>
+                        <th field="invoiceAmount">
+                            <span translate>Amount</span>
+                        </th>
                         <th field="ref">
                             <span translate>Reference</span>
                         </th>
@@ -107,6 +110,7 @@
                                 {{::travel.cargoSupplierNickname}}
                             </span>
                         </td>
+                        <td></td>
                         <td>{{::travel.agencyModeName}}</td>
                         <td vn-click-stop>
                             <vn-td-editable name="reference" expand>
@@ -157,22 +161,15 @@
                                 {{::entry.supplierName}}
                             </span>
                         </td>
+                        <td number>{{::entry.invoiceAmount | currency: 'EUR': 2}}</td>
                         <td></td>
-                        <td class="td-editable">{{::entry.ref}}</td>
+                        <td class="td-editable">{{::entry.invoiceNumber}}</td>
                         <td number>{{::entry.stickers}}</td>
                         <td number></td>
                         <td number>{{::entry.loadedkg}}</td>
                         <td number>{{::entry.volumeKg}}</td>
-                        <td>
-                            <span ng-if="::entry.notes" vn-tooltip="{{::entry.notes}}">
-                                {{::entry.notes}}
-                            </span>
-                        </td>
-                        <td>
-                            <span ng-if="::entry.evaNotes" vn-tooltip="{{::entry.evaNotes}}">
-                                {{::entry.evaNotes}}
-                            </span>
-                        </td>
+                        <td></td>
+                        <td></td>
                         <td></td>
                         <td></td>
                     </tr>