diff --git a/back/model-config.json b/back/model-config.json
index 364ffabdf..b543071c9 100644
--- a/back/model-config.json
+++ b/back/model-config.json
@@ -79,6 +79,9 @@
     "ImageCollectionSize": {
         "dataSource": "vn"
     },
+    "ImageConfig": {
+        "dataSource": "vn"
+    },
     "ImageContainer": {
         "dataSource": "imageStorage"
     },
diff --git a/back/models/image-config.json b/back/models/image-config.json
new file mode 100644
index 000000000..11f4c2284
--- /dev/null
+++ b/back/models/image-config.json
@@ -0,0 +1,22 @@
+{
+    "name": "ImageConfig",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "hedera.imageConfig"
+        }
+    },
+    "properties": {
+        "url": {
+            "type": "string"
+        }
+    },
+    "acls": [
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "$authenticated",
+            "permission": "ALLOW"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/db/routines/vn/functions/address_getGeo.sql b/db/routines/vn/functions/address_getGeo.sql
index 04155c30c..0800d226a 100644
--- a/db/routines/vn/functions/address_getGeo.sql
+++ b/db/routines/vn/functions/address_getGeo.sql
@@ -14,9 +14,11 @@ BEGIN
 	SELECT p.geoFk INTO vGeoFk
 		FROM address a 
 			JOIN town t ON t.provinceFk = a.provinceFk
-			JOIN postCode p ON p.townFk = t.id AND p.`code` = a.postalCode
+			JOIN postCode p ON p.townFk = t.id
+			JOIN zoneGeo zg ON zg.id = p.geoFk
 		WHERE a.id = vSelf
-		ORDER BY (a.city SOUNDS LIKE t.`name`) DESC
+		ORDER BY (a.city SOUNDS LIKE t.name) DESC,
+			(p.code = a.postalCode) DESC
 		LIMIT 1;
 
 	RETURN vGeoFk;
diff --git a/db/routines/vn/functions/client_getGeo.sql b/db/routines/vn/functions/client_getGeo.sql
new file mode 100644
index 000000000..e16653ee5
--- /dev/null
+++ b/db/routines/vn/functions/client_getGeo.sql
@@ -0,0 +1,26 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`client_getGeo`(vSelf INT)
+	RETURNS int(11)
+	DETERMINISTIC
+BEGIN
+/**
+ * Returns the geo for the passed client.
+ *
+ * @param vSelf The address id
+ * @return The geo id
+ */
+ 	DECLARE vGeoFk INT;
+
+	SELECT p.geoFk INTO vGeoFk
+		FROM client c
+			JOIN town t ON t.provinceFk = c.provinceFk
+			JOIN postCode p ON p.townFk = t.id
+			JOIN zoneGeo zg ON zg.id = p.geoFk
+		WHERE c.id = vSelf
+		ORDER BY (c.city SOUNDS LIKE t.name) DESC,
+			(p.code = c.postcode) DESC
+		LIMIT 1;
+
+	RETURN vGeoFk;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/functions/entry_getCommission.sql b/db/routines/vn/functions/entry_getCommission.sql
index 4a19f4e63..a4afdabd4 100644
--- a/db/routines/vn/functions/entry_getCommission.sql
+++ b/db/routines/vn/functions/entry_getCommission.sql
@@ -1,58 +1,51 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`entry_getCommission`(vTravelFk INT,
-    vCurrencyFk INT,
-    vSupplierFk INT
+	vCurrencyFk INT,
+	vSupplierFk INT
 )
 	RETURNS int(11)
 	NOT DETERMINISTIC
 	READS SQL DATA
 BEGIN
-    DECLARE vCommission INT;
-    DECLARE vCurrentCommission INT;
-    DECLARE vIsCurrencyUsd INT;
-    DECLARE vLastEntryFk INT;
-    
-    SELECT count(*) INTO vIsCurrencyUsd
-            FROM currency c
-            WHERE c.code = 'USD' AND id = vCurrencyFk;
-    
-    IF NOT vIsCurrencyUsd THEN
-    
-		SELECT e.id INTO vLastEntryFk
-			FROM vn.entry e
-				JOIN vn.travel tr ON tr.id = e.travelFk
-                WHERE e.supplierFk = vSupplierFk
-                ORDER BY tr.landed DESC
-                LIMIT 1;
-        
-        IF vLastEntryFk THEN
-        
-			SELECT commission INTO vCurrentCommission
-				FROM vn.entry
-                WHERE id = vLastEntryFk;
-        
-        ELSE
-        
-			SELECT commission INTO vCurrentCommission
-				FROM supplier s
-				WHERE s.id = vSupplierFk;
-        
-		END IF;
-        
-        RETURN vCurrentCommission;
-        
-    ELSE
+	DECLARE vCommission INT;
+	DECLARE vCurrentCommission INT;
+	DECLARE vIsNotEUR INT;
+	DECLARE vLastEntryFk INT;
 
+	SELECT count(*) INTO vIsNotEUR
+			FROM currency c
+			WHERE c.code <> 'EUR' AND id = vCurrencyFk;
+
+	IF vIsNotEUR THEN
 		SELECT ROUND(-100 * (1 - (1 / r.value))) INTO vCommission
 			FROM travel t
 				LEFT JOIN referenceCurrent r ON r.currencyFk = vCurrencyFk AND r.`dated` <= t.shipped
 			WHERE t.id = vTravelFk
 			ORDER BY r.`dated` DESC
 			LIMIT 1;
-        
+
 		RETURN IFNULL(vCommission, 0);
-    
-    END IF;
-    
+	ELSE
+		SELECT e.id INTO vLastEntryFk
+			FROM `entry` e
+				JOIN travel tr ON tr.id = e.travelFk
+				WHERE e.supplierFk = vSupplierFk
+				ORDER BY tr.landed DESC
+				LIMIT 1;
+
+		IF vLastEntryFk THEN
+			SELECT commission INTO vCurrentCommission
+				FROM `entry`
+				WHERE id = vLastEntryFk;
+
+		ELSE
+			SELECT commission INTO vCurrentCommission
+				FROM supplier s
+				WHERE s.id = vSupplierFk;
+
+		END IF;
+
+		RETURN vCurrentCommission;
+	END IF;
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/functions/supplier_getGeo.sql b/db/routines/vn/functions/supplier_getGeo.sql
new file mode 100644
index 000000000..10ca5b8b8
--- /dev/null
+++ b/db/routines/vn/functions/supplier_getGeo.sql
@@ -0,0 +1,28 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`supplier_getGeo`(vSelf INT)
+	RETURNS int(11)
+	DETERMINISTIC
+BEGIN
+/**
+ * Returns the geo for the passed supplier.
+ *
+ * @param vSelf The address id
+ * @return The geo id
+ */
+ 	DECLARE vGeoFk INT;
+
+	SELECT p.geoFk INTO vGeoFk
+		FROM supplier s
+			JOIN town t ON t.provinceFk = s.provinceFk
+			JOIN postCode p ON p.townFk = t.id
+			LEFT JOIN supplierAddress sad ON sad.supplierFk = s.id
+			JOIN zoneGeo zg ON zg.id = p.geoFk
+		WHERE s.id = vSelf
+		ORDER BY (s.city SOUNDS LIKE t.name) DESC,
+			(p.code = s.postCode) DESC,
+			(p.code = sad.postalCode) DESC
+		LIMIT 1;
+
+	RETURN vGeoFk;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/entry_updateComission.sql b/db/routines/vn/procedures/entry_updateComission.sql
index e2de2a4a5..8db28f97d 100644
--- a/db/routines/vn/procedures/entry_updateComission.sql
+++ b/db/routines/vn/procedures/entry_updateComission.sql
@@ -22,7 +22,7 @@ BEGIN
 			FROM vn.entry e
 				JOIN vn.travel t ON t.id = e.travelFk
 				JOIN vn.warehouse w ON w.id = t.warehouseInFk 
-			WHERE t.shipped >= util.VN_CURDATE()
+			WHERE t.landed >= util.VN_CURDATE()
 				AND e.currencyFk = vCurrency
 				AND NOT e.isBooked;
 
@@ -33,7 +33,7 @@ BEGIN
 	SET e.commission = vComission;
 
 	SELECT `name` INTO vCurrencyName 
-		FROM currency 
+		FROM currency
 			WHERE id = vCurrency;
 
 	CALL entry_recalc();
diff --git a/db/routines/vn/triggers/address_beforeInsert.sql b/db/routines/vn/triggers/address_beforeInsert.sql
index 56ef7aa51..a4f384f14 100644
--- a/db/routines/vn/triggers/address_beforeInsert.sql
+++ b/db/routines/vn/triggers/address_beforeInsert.sql
@@ -6,6 +6,7 @@ BEGIN
 	DECLARE vIsEqualizated BOOL;
 
 	SET NEW.editorFk = account.myUser_getId();
+	SET NEW.geoFk = address_getGeo(NEW.id);
 
 	IF (NEW.phone <> '') THEN
 		CALL pbx.phone_isValid(NEW.phone);
diff --git a/db/routines/vn/triggers/address_beforeUpdate.sql b/db/routines/vn/triggers/address_beforeUpdate.sql
index 35887912c..0b19a6266 100644
--- a/db/routines/vn/triggers/address_beforeUpdate.sql
+++ b/db/routines/vn/triggers/address_beforeUpdate.sql
@@ -3,7 +3,6 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`address_beforeUpdate`
 	BEFORE UPDATE ON `address`
 	FOR EACH ROW
 BEGIN
-	
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF !(NEW.phone <=> OLD.phone) AND (NEW.phone <> '') THEN
@@ -14,5 +13,10 @@ BEGIN
 		CALL pbx.phone_isValid(NEW.mobile);
 	END IF;
 
+	IF NOT (NEW.provinceFk <=> OLD.provinceFk)
+		OR (NEW.postalCode <=> OLD.postalCode) THEN
+
+		SET NEW.geoFk = address_getGeo(NEW.id);
+	END IF;
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/triggers/client_beforeInsert.sql b/db/routines/vn/triggers/client_beforeInsert.sql
index 45de107f1..b4038a2ba 100644
--- a/db/routines/vn/triggers/client_beforeInsert.sql
+++ b/db/routines/vn/triggers/client_beforeInsert.sql
@@ -3,8 +3,10 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`client_beforeInsert`
 	BEFORE INSERT ON `client`
 	FOR EACH ROW
 BEGIN
-
 	SET NEW.editorFk = account.myUser_getId();
+	SET NEW.accountingAccount = 4300000000 + NEW.id;
+    SET NEW.lastSalesPersonFk = NEW.salesPersonFk;
+	SET NEW.geoFk = client_getGeo(NEW.id);
 
 	IF (NEW.phone <> '') THEN
 		CALL pbx.phone_isValid(NEW.phone);
@@ -13,9 +15,5 @@ BEGIN
 	IF (NEW.mobile <> '') THEN
 		CALL pbx.phone_isValid(NEW.mobile);
 	END IF;
-
-	SET NEW.accountingAccount = 4300000000 + NEW.id;
-    
-    SET NEW.lastSalesPersonFk = NEW.salesPersonFk;
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/triggers/client_beforeUpdate.sql b/db/routines/vn/triggers/client_beforeUpdate.sql
index 7142d6604..00418a9e7 100644
--- a/db/routines/vn/triggers/client_beforeUpdate.sql
+++ b/db/routines/vn/triggers/client_beforeUpdate.sql
@@ -72,5 +72,11 @@ BEGIN
 	IF NOT (NEW.businessTypeFk <=> OLD.businessTypeFk) AND (NEW.businessTypeFk = 'individual' OR OLD.businessTypeFk = 'individual') THEN
 		SET NEW.isTaxDataChecked = 0;
 	END IF;
+
+	IF NOT (NEW.provinceFk <=> OLD.provinceFk)
+		OR (NEW.postcode <=> OLD.postcode) THEN
+
+		SET NEW.geoFk = client_getGeo(NEW.id);
+	END IF;
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/triggers/supplier_beforeInsert.sql b/db/routines/vn/triggers/supplier_beforeInsert.sql
index b141ec8fb..5bbfc79a1 100644
--- a/db/routines/vn/triggers/supplier_beforeInsert.sql
+++ b/db/routines/vn/triggers/supplier_beforeInsert.sql
@@ -4,5 +4,6 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`supplier_beforeInsert`
 	FOR EACH ROW
 BEGIN
 	SET NEW.editorFk = account.myUser_getId();
+	SET NEW.geoFk = supplier_getGeo(NEW.id);
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/triggers/supplier_beforeUpdate.sql b/db/routines/vn/triggers/supplier_beforeUpdate.sql
index af730b49d..b502340a3 100644
--- a/db/routines/vn/triggers/supplier_beforeUpdate.sql
+++ b/db/routines/vn/triggers/supplier_beforeUpdate.sql
@@ -40,5 +40,10 @@ BEGIN
 		SET NEW.isPayMethodChecked = FALSE;
 	END IF;
 
+	IF NOT (NEW.provinceFk <=> OLD.provinceFk)
+		OR (NEW.postCode <=> OLD.postCode) THEN
+
+		SET NEW.geoFk = supplier_getGeo(NEW.id);
+	END IF;
 END$$
 DELIMITER ;
diff --git a/db/versions/11346-yellowPhormium/00-address.sql b/db/versions/11346-yellowPhormium/00-address.sql
new file mode 100644
index 000000000..6837e0d86
--- /dev/null
+++ b/db/versions/11346-yellowPhormium/00-address.sql
@@ -0,0 +1,22 @@
+ALTER TABLE vn.address
+	ADD geoFk int(11) DEFAULT NULL NULL AFTER isLogifloraAllowed,
+	ADD CONSTRAINT address_zoneGeo_FK FOREIGN KEY (geoFk)
+		REFERENCES vn.zoneGeo(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+CREATE OR REPLACE TEMPORARY TABLE tmp.tAddressGeo
+	(PRIMARY KEY (id))
+	ENGINE = MEMORY
+	SELECT a.id, p.geoFk
+		FROM vn.address a
+			JOIN vn.town t ON t.provinceFk = a.provinceFk
+			JOIN vn.postCode p ON p.townFk = t.id
+			JOIN vn.zoneGeo zg ON zg.id = p.geoFk
+		GROUP BY a.id
+		ORDER BY (a.city SOUNDS LIKE t.`name`) DESC,
+			(p.code = a.postalCode) DESC;
+
+UPDATE vn.address a
+		JOIN tmp.tAddressGeo tag ON tag.id = a.id
+	SET a.geoFk = tag.geoFk;
+
+DROP TEMPORARY TABLE tmp.tAddressGeo;
diff --git a/db/versions/11346-yellowPhormium/01-client.sql b/db/versions/11346-yellowPhormium/01-client.sql
new file mode 100644
index 000000000..a95d21efa
--- /dev/null
+++ b/db/versions/11346-yellowPhormium/01-client.sql
@@ -0,0 +1,25 @@
+ALTER TABLE vn.client
+	CHANGE hasDailyInvoice hasDailyInvoice tinyint(1) DEFAULT 0 NOT NULL
+		COMMENT 'Indica si el cliente requiere facturación diaria por defecto se copiará lo que tenga country.hasDailyInvoice'
+		AFTER recommendedCredit,
+	ADD geoFk int(11) DEFAULT NULL NULL AFTER hasDailyInvoice,
+	ADD CONSTRAINT client_zoneGeo_FK FOREIGN KEY (geoFk)
+		REFERENCES vn.zoneGeo(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+CREATE OR REPLACE TEMPORARY TABLE tmp.tClientGeo
+	(PRIMARY KEY (id))
+	ENGINE = MEMORY
+	SELECT c.id, p.geoFk
+		FROM vn.client c
+			JOIN vn.town t ON t.provinceFk = c.provinceFk
+			JOIN vn.postCode p ON p.townFk = t.id
+			JOIN vn.zoneGeo zg ON zg.id = p.geoFk
+		GROUP BY c.id
+		ORDER BY (c.city SOUNDS LIKE t.`name`) DESC,
+			(p.code = c.postcode) DESC;
+
+UPDATE vn.client c
+		JOIN tmp.tClientGeo tcg ON tcg.id = c.id
+	SET c.geoFk = tcg.geoFk;
+
+DROP TEMPORARY TABLE tmp.tClientGeo;
diff --git a/db/versions/11346-yellowPhormium/02-supplier.sql b/db/versions/11346-yellowPhormium/02-supplier.sql
new file mode 100644
index 000000000..a28e7d680
--- /dev/null
+++ b/db/versions/11346-yellowPhormium/02-supplier.sql
@@ -0,0 +1,26 @@
+ALTER TABLE vn.supplier
+	CHANGE companySize companySize enum('small','medium','big') CHARACTER SET utf8mb3
+		COLLATE utf8mb3_general_ci DEFAULT NULL NULL AFTER stamp,
+	ADD geoFk int(11) DEFAULT NULL NULL AFTER companySize,
+	ADD CONSTRAINT supplier_zoneGeo_FK FOREIGN KEY (geoFk)
+			REFERENCES vn.zoneGeo(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+CREATE OR REPLACE TEMPORARY TABLE tmp.tSupplierGeo
+	(PRIMARY KEY (id))
+	ENGINE = MEMORY
+	SELECT s.id, p.geoFk
+		FROM vn.supplier s
+			JOIN vn.town t ON t.provinceFk = s.provinceFk
+			JOIN vn.postCode p ON p.townFk = t.id
+			LEFT JOIN vn.supplierAddress sad ON sad.supplierFk = s.id
+			JOIN vn.zoneGeo zg ON zg.id = p.geoFk
+		GROUP BY s.id
+		ORDER BY (s.city SOUNDS LIKE t.`name`) DESC,
+			(p.code = s.postCode) DESC,
+			(p.code = sad.postalCode) DESC;
+
+UPDATE vn.supplier s
+		JOIN tmp.tSupplierGeo tsg ON tsg.id = s.id
+	SET s.geoFk = tsg.geoFk;
+
+DROP TEMPORARY TABLE tmp.tSupplierGeo;
diff --git a/db/versions/11349-azureBamboo/00-firstScript.sql b/db/versions/11349-azureBamboo/00-firstScript.sql
new file mode 100644
index 000000000..09c919b79
--- /dev/null
+++ b/db/versions/11349-azureBamboo/00-firstScript.sql
@@ -0,0 +1,7 @@
+
+
+UPDATE salix.ACL 
+	SET principalId = 'deliveryAssistant'
+WHERE model = 'Ticket' 
+	AND property = 'updateAttributes' 
+	AND principalId = "delivery";
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 95f6ff326..86ebebc89 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -244,5 +244,7 @@
 	"Invalid or expired verification code": "Invalid or expired verification code",
     "There are tickets for this area, delete them first": "There are tickets for this area, delete them first",
 	"ticketLostExpedition": "The ticket [{{ticketId}}]({{{ticketUrl}}}) has the following lost expedition:{{ expeditionId }}",
-	"Payment method is required": "Payment method is required"
+	"Payment method is required": "Payment method is required",
+    "Sales already moved": "Sales already moved"
+
 }
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 37976c0ea..8bf9f31c4 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -387,5 +387,6 @@
 	"There are tickets for this area, delete them first": "Hay tickets para esta sección, borralos primero",
 	"There is no company associated with that warehouse": "No hay ninguna empresa asociada a ese almacén",
 	"ticketLostExpedition": "El ticket [{{ticketId}}]({{{ticketUrl}}}) tiene la siguiente expedición perdida:{{ expeditionId }}",
-	"The web user's email already exists": "El correo del usuario web ya existe"
-}
\ No newline at end of file
+	"The web user's email already exists": "El correo del usuario web ya existe",
+	"Sales already moved": "Ya han sido transferidas"
+}
diff --git a/modules/item/back/models/item-shelving.json b/modules/item/back/models/item-shelving.json
index 9a0ebc61d..483d6bf3d 100644
--- a/modules/item/back/models/item-shelving.json
+++ b/modules/item/back/models/item-shelving.json
@@ -41,6 +41,9 @@
 		},
 		"available": {
 			"type": "number"
+		},
+		"buyFk": {
+			"type": "number"
 		}
 	},
 	"relations": {
diff --git a/modules/shelving/back/models/shelving.json b/modules/shelving/back/models/shelving.json
index 46fce31e8..84e260b9e 100644
--- a/modules/shelving/back/models/shelving.json
+++ b/modules/shelving/back/models/shelving.json
@@ -1,6 +1,6 @@
 {
     "name": "Shelving",
-	"base": "VnModel",
+    "base": "VnModel",
     "mixins": {
         "Loggable": true
     },
@@ -44,6 +44,11 @@
             "type": "belongsTo",
             "model": "Worker",
             "foreignKey": "id"
+        },
+        "itemShelving": {
+            "type": "hasMany",
+            "model": "ItemShelving",
+            "foreignKey": "shelvingFk"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/modules/ticket/back/methods/ticket/transferSales.js b/modules/ticket/back/methods/ticket/transferSales.js
index 5f5fdde67..580a8e1f7 100644
--- a/modules/ticket/back/methods/ticket/transferSales.js
+++ b/modules/ticket/back/methods/ticket/transferSales.js
@@ -81,6 +81,10 @@ module.exports = Self => {
             if (ticketId != id && hasClaimedSales)
                 throw new UserError(`Can't transfer claimed sales`);
 
+            const missingSales = sales.some(({id}) => !map.has(id));
+            if (missingSales)
+                throw new UserError($t('Sales already moved'));
+
             for (const sale of sales) {
                 const originalSale = map.get(sale.id);
                 if (sale.quantity == originalSale?.quantity) {