From acb1fecda26254f21193ffd6ae72e073e4f70358 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 18 Dec 2024 08:46:02 +0100
Subject: [PATCH] feat: refs #7731 change required viesCode

---
 db/routines/sage/procedures/clientSupplier_add.sql | 2 +-
 db/versions/11303-salmonMoss/00-firstScript.sql    | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/db/routines/sage/procedures/clientSupplier_add.sql b/db/routines/sage/procedures/clientSupplier_add.sql
index 66c4bf396..6036936a9 100644
--- a/db/routines/sage/procedures/clientSupplier_add.sql
+++ b/db/routines/sage/procedures/clientSupplier_add.sql
@@ -94,7 +94,7 @@ BEGIN
 				s.name,
 				IFNULL(s.street, ''),
 				s.account,
-				@nif := IF(co.code = LEFT(TRIM(s.nif), 2), MID(TRIM(s.nif), 3, LENGTH(TRIM(s.nif))-1), TRIM(s.nif)),
+				@nif := REGEXP_REPLACE(TRIM(s.nif), s.viesCode, ''),
 				TRIM(CONCAT(IFNULL(s.viesCode,''), @nif)),
 				IFNULL(s.postCode,''),
 				IFNULL(s.city, ''),
diff --git a/db/versions/11303-salmonMoss/00-firstScript.sql b/db/versions/11303-salmonMoss/00-firstScript.sql
index 7de6dd06c..ac0750d12 100644
--- a/db/versions/11303-salmonMoss/00-firstScript.sql
+++ b/db/versions/11303-salmonMoss/00-firstScript.sql
@@ -3,7 +3,7 @@ ALTER TABLE vn.client
 	ADD COLUMN IF NOT EXISTS viesCode varchar(2) DEFAULT NULL;
 
 ALTER TABLE vn.supplier
-	ADD COLUMN IF NOT EXISTS viesCode varchar(2) DEFAULT NULL;
+	ADD COLUMN IF NOT EXISTS viesCode varchar(2) COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
 
 -- client
 UPDATE vn.client c
@@ -16,10 +16,6 @@ UPDATE client c
 	WHERE c2.name = 'Mónaco';
 
 -- supplier
-UPDATE client c
-	    JOIN country c2 ON c2.id = c.countryFk
-	SET c.viesCode = c2.code;
-
 UPDATE supplier s
     JOIN country c ON c.id = s.countryFk
 SET s.viesCode = c.code;