From 40b2c32a00a30e2eb5e4e38921c336b52cf6e8b0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 3 May 2024 17:37:36 +0200
Subject: [PATCH] feat: refs #6243 show all cmr

---
 db/dump/.dump/data.sql                        |  2 +-
 .../route/{getExternalCmrs.js => cmrs.js}     | 30 ++++---------------
 modules/route/back/models/route.js            |  2 +-
 print/templates/reports/cmr/sql/data.sql      |  3 +-
 4 files changed, 9 insertions(+), 28 deletions(-)
 rename modules/route/back/methods/route/{getExternalCmrs.js => cmrs.js} (87%)

diff --git a/db/dump/.dump/data.sql b/db/dump/.dump/data.sql
index 8c6794a5b..a5a95d565 100644
--- a/db/dump/.dump/data.sql
+++ b/db/dump/.dump/data.sql
@@ -1783,7 +1783,7 @@ INSERT INTO `ACL` VALUES (761,'Route','downloadZip','READ','ALLOW','ROLE','emplo
 INSERT INTO `ACL` VALUES (762,'Route','filter','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (763,'Route','getByWorker','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (764,'Route','getDeliveryPoint','READ','ALLOW','ROLE','employee');
-INSERT INTO `ACL` VALUES (765,'Route','getExternalCmrs','READ','ALLOW','ROLE','employee');
+INSERT INTO `ACL` VALUES (765,'Route','cmrs','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (766,'Route','getSuggestedTickets','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (767,'Route','getTickets','READ','ALLOW','ROLE','employee');
 INSERT INTO `ACL` VALUES (768,'Route','guessPriority','WRITE','ALLOW','ROLE','employee');
diff --git a/modules/route/back/methods/route/getExternalCmrs.js b/modules/route/back/methods/route/cmrs.js
similarity index 87%
rename from modules/route/back/methods/route/getExternalCmrs.js
rename to modules/route/back/methods/route/cmrs.js
index b8cd1041a..814ff77c6 100644
--- a/modules/route/back/methods/route/getExternalCmrs.js
+++ b/modules/route/back/methods/route/cmrs.js
@@ -3,8 +3,8 @@ const buildFilter = require('vn-loopback/util/filter').buildFilter;
 const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
 
 module.exports = Self => {
-    Self.remoteMethod('getExternalCmrs', {
-        description: 'Returns an array of external cmrs',
+    Self.remoteMethod('cmrs', {
+        description: 'Returns an array of cmrs',
         accessType: 'READ',
         accepts: [
             {
@@ -53,31 +53,14 @@ module.exports = Self => {
             root: true
         },
         http: {
-            path: `/getExternalCmrs`,
+            path: `/cmrs`,
             verb: 'GET'
         }
     });
 
-    Self.getExternalCmrs = async(
-        filter,
-        cmrFk,
-        ticketFk,
-        routeFk,
-        country,
-        clientFk,
-        hasCmrDms,
-        shipped,
-        options
+    Self.cmrs = async(filter, cmrFk, ticketFk, routeFk, country, clientFk, hasCmrDms, shipped, options
     ) => {
-        const params = {
-            cmrFk,
-            ticketFk,
-            routeFk,
-            country,
-            clientFk,
-            hasCmrDms,
-            shipped,
-        };
+        const params = {cmrFk, ticketFk, routeFk, country, clientFk, hasCmrDms, shipped};
         const conn = Self.dataSource.connector;
 
         let where = buildFilter(params, (param, value) => {
@@ -124,8 +107,7 @@ module.exports = Self => {
                                         JOIN dmsType dt ON dt.id = d.dmsTypeFk
                                     WHERE dt.name = 'cmr'
                             ) sub ON sub.ticketFk = t.id
-                        WHERE co.code <> 'ES'
-                            AND am.name <> 'ABONO'
+                        WHERE am.name <> 'ABONO'
                             AND w.code = 'ALG'
                             AND t.cmrFk
                 ) sub
diff --git a/modules/route/back/models/route.js b/modules/route/back/models/route.js
index bf1f26e74..ecc434108 100644
--- a/modules/route/back/models/route.js
+++ b/modules/route/back/models/route.js
@@ -15,7 +15,7 @@ module.exports = Self => {
     require('../methods/route/sendSms')(Self);
     require('../methods/route/downloadZip')(Self);
     require('../methods/route/cmr')(Self);
-    require('../methods/route/getExternalCmrs')(Self);
+    require('../methods/route/cmrs')(Self);
     require('../methods/route/downloadCmrsZip')(Self);
     require('../methods/route/cmrEmail')(Self);
     require('../methods/route/getExpeditionSummary')(Self);
diff --git a/print/templates/reports/cmr/sql/data.sql b/print/templates/reports/cmr/sql/data.sql
index e9500cc4b..09a42a718 100644
--- a/print/templates/reports/cmr/sql/data.sql
+++ b/print/templates/reports/cmr/sql/data.sql
@@ -39,8 +39,7 @@ SELECT c.id cmrFk,
 		LEFT JOIN supplier s ON s.id = c.supplierFk
 		LEFT JOIN country cou ON cou.id = s.countryFk
 		LEFT JOIN company co ON co.id = c.companyFk
-		LEFT JOIN supplierAccount sa ON sa.id = co.supplierAccountFk
-		LEFT JOIN supplier s2 ON s2.id = sa.supplierFk
+		LEFT JOIN supplier s2 ON s2.id = c.companyFk
 		LEFT JOIN country cou2 ON cou2.id = s2.countryFk
 		LEFT JOIN `address` a ON a.id = c.addressToFk
 		LEFT JOIN province p ON p.id = a.provinceFk