Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl

CHANGELOG.md

@@ -5,17 +5,32 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2316.01] - 2023-05-04
+## [2320.01] - 2023-05-25
+
+### Added
+-
+
+### Changed
+-
+
+### Fixed
+-
+
+
+
+## [2318.01] - 2023-05-08
 
 ### Added
 - (Usuarios -> Histórico) Nueva sección
 - (Roles -> Histórico) Nueva sección
+- (General -> Traducciones) Correo de bienvenida a clientes al portugués y al francés
 
 ### Changed
 - (Artículo -> Precio fijado) Modificado el buscador superior por uno lateral
 
 ### Fixed
--
+- (Ticket -> Boxing) Arreglado selección de horas
+
 
 
 ## [2314.01] - 2023-04-20

db/changes/231601/00-updateIsVies.sql

@@ -1,5 +0,0 @@
-    UPDATE vn.supplier s
-            JOIN vn.country c ON c.id = s.countryFk
-        SET s.nif = MID(REPLACE(s.nif, ' ', ''), 3, LENGTH(REPLACE(s.nif, ' ', '')) - 1)
-        WHERE s.isVies = TRUE 
-            AND c.code = LEFT(REPLACE(s.nif, ' ', ''), 2);

db/changes/231601/00-updateisViesClient.sql

@@ -1,5 +0,0 @@
-UPDATE IGNORE vn.client c
-        JOIN vn.country co ON co.id = c.countryFk
-    SET c.fi = MID(REPLACE(c.fi, ' ', ''), 3, LENGTH(REPLACE(c.fi, ' ', '')) - 1)
-    WHERE c.isVies = TRUE 
-        AND co.code = LEFT(REPLACE(c.fi, ' ', ''), 2);

db/changes/231801/00-updateIsVies.sql

@@ -0,0 +1,5 @@
+    UPDATE `vn`.`supplier` s
+            JOIN `vn`.`country` c ON c.id = s.countryFk
+        SET s.nif = MID(REPLACE(s.nif, ' ', ''), 3, LENGTH(REPLACE(s.nif, ' ', '')) - 1)
+        WHERE s.isVies = TRUE
+            AND c.code = LEFT(REPLACE(s.nif, ' ', ''), 2);

db/changes/231801/00-updateisViesClient.sql

@@ -0,0 +1,5 @@
+UPDATE IGNORE `vn`.`client` c
+        JOIN `vn`.`country` co ON co.id = c.countryFk
+    SET c.fi = MID(REPLACE(c.fi, ' ', ''), 3, LENGTH(REPLACE(c.fi, ' ', '')) - 1)
+    WHERE c.isVies = TRUE
+        AND co.code = LEFT(REPLACE(c.fi, ' ', ''), 2);

package-lock.json

@@ -1,7 +1,7 @@
 {
     "name": "salix-back",
-    "version": "23.16.01",
-    "lockfileVersion": 2,
+    "version": "23.18.01",
+    "lockfileVersion": 1,
     "requires": true,
     "packages": {
         "": {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "23.16.01",
+    "version": "23.20.01",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",