diff --git a/db/routines/sage/procedures/clientSupplier_add.sql b/db/routines/sage/procedures/clientSupplier_add.sql
index 7a0aec6e2..70f3ef3d0 100644
--- a/db/routines/sage/procedures/clientSupplier_add.sql
+++ b/db/routines/sage/procedures/clientSupplier_add.sql
@@ -53,7 +53,7 @@ BEGIN
 			IFNULL(c.street, ''),
 			c.accountingAccount,
 			@fi := IF(cu.code = LEFT(TRIM(c.fi), 2) AND c.isVies, MID(TRIM(c.fi), 3, LENGTH(TRIM(c.fi))-1), TRIM(c.fi)),
-            IF(c.isVies, CONCAT(cu.code, @fi ), TRIM(c.fi)),
+            IF(c.isVies, CONCAT(IFNULL(cu.viesCode,cu.code), @fi ), TRIM(c.fi)),
 			IFNULL(c.postcode, ''),
 			IFNULL(c.city, ''),
 			IFNULL(pr.CodigoProvincia, ''),
@@ -91,7 +91,7 @@ BEGIN
 				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)),
-				IF(s.isVies, CONCAT(co.code, @nif), TRIM(s.nif)),
+				IF(s.isVies, CONCAT(IFNULL(co.viesCode,co.code), @nif), TRIM(s.nif)),
 				IFNULL(s.postCode,''),
 				IFNULL(s.city, ''),
 				IFNULL(pr.CodigoProvincia, ''),
diff --git a/db/versions/11006-chocolateCataractarum/00-firstScript.sql b/db/versions/11006-chocolateCataractarum/00-firstScript.sql
new file mode 100644
index 000000000..7eaaa101e
--- /dev/null
+++ b/db/versions/11006-chocolateCataractarum/00-firstScript.sql
@@ -0,0 +1,7 @@
+-- Place your SQL code here
+ALTER TABLE vn.country 
+	ADD IF NOT EXISTS viesCode varchar(2) DEFAULT NULL NULL AFTER code;
+
+UPDATE vn.country
+	SET viesCode='FR'
+	WHERE country = 'Mónaco';
\ No newline at end of file