Merge branch 'master' into 8000-catalog_calculate

db/routines/vn/procedures/productionControl.sql

@@ -287,4 +287,4 @@ proc: BEGIN
 		tItemShelvingStock,
 		tItemPackingType;
 END$$
-DELIMITER ;
+DELIMITER ;

db/versions/11241-grayPalmetto/00-firstScript.sql

@@ -0,0 +1,2 @@
+ALTER TABLE vn.packaging ADD IF NOT EXISTS isPlantTray BOOL DEFAULT FALSE NOT NULL 
+    COMMENT 'The container is a plant tray. Used to restrict the picking of full plant trays, to make previous picking.';

modules/supplier/back/methods/supplier/filter.js

@@ -81,7 +81,7 @@ module.exports = Self => {
         let stmts = [];
         let stmt;
         stmt = new ParameterizedSQL(
-            `SELECT 
+            `SELECT
                     s.id,
                     s.name AS socialName,
                     s.nickname AS alias,
@@ -92,10 +92,13 @@ module.exports = Self => {
                     s.payDay,
                     s.phone,
                     s.city,
+                    s.countryFk,
+                    c.name country,
                     pm.name AS payMethod,
                     pd.payDem AS payDem
                 FROM vn.supplier s
                     LEFT JOIN vn.payMethod pm ON pm.id = s.payMethodFk
+                    LEFT JOIN vn.country c ON c.id = s.countryFk
                     LEFT JOIN vn.payDem pd ON pd.id = s.payDemFk`
         );