diff --git a/db/versions/11093-purpleGerbera/00-firstScript.sql b/db/versions/11093-purpleGerbera/00-firstScript.sql
new file mode 100644
index 0000000000..024b0bb599
--- /dev/null
+++ b/db/versions/11093-purpleGerbera/00-firstScript.sql
@@ -0,0 +1,4 @@
+UPDATE salix.ACL
+	SET property = 'cmrs'
+	WHERE property = 'getExternalCmrs'
+		AND model = 'Route';
\ No newline at end of file
diff --git a/modules/route/back/methods/route/getExternalCmrs.js b/modules/route/back/methods/route/cmrs.js
similarity index 85%
rename from modules/route/back/methods/route/getExternalCmrs.js
rename to modules/route/back/methods/route/cmrs.js
index 89536f50a8..0c25cbca55 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: [
             {
@@ -47,37 +47,25 @@ module.exports = Self => {
                 type: 'date',
                 description: 'The to date filter',
             },
+            {
+                arg: 'warehouseFk',
+                type: 'integer',
+            }
         ],
         returns: {
             type: ['object'],
             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, warehouseFk, options
     ) => {
-        const params = {
-            cmrFk,
-            ticketFk,
-            routeFk,
-            country,
-            clientFk,
-            hasCmrDms,
-            shipped,
-        };
+        const params = {cmrFk, ticketFk, routeFk, country, clientFk, hasCmrDms, warehouseFk, shipped};
         const conn = Self.dataSource.connector;
 
         let where = buildFilter(params, (param, value) => {
@@ -106,7 +94,8 @@ module.exports = Self => {
                             co.name country,
                             t.clientFk,
                             IF(sub.id, TRUE, FALSE) hasCmrDms,
-                            DATE(t.shipped) shipped
+                            DATE(t.shipped) shipped,
+                            t.warehouseFk
                         FROM ticket t
                             JOIN ticketState ts ON ts.ticketFk = t.id
                             JOIN state s ON s.id = ts.stateFk
@@ -124,8 +113,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 bf1f26e748..ecc434108c 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 42231709a7..31620a80d8 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