diff --git a/db/.pullinfo.json b/db/.pullinfo.json
index f4afbc5fb..0defed845 100644
--- a/db/.pullinfo.json
+++ b/db/.pullinfo.json
@@ -9,7 +9,7 @@
     },
     "vn": {
       "view": {
-        "expeditionPallet_Print": "288cbd6e8289df083ed5eb1a2c808f7a82ba4c90c8ad9781104808a7a54471fb"
+        "expeditionPallet_Print": "06613719475fcdba8309607c38cc78efc2e348cca7bc96b48dc3ae3c12426f54"
       }
     }
   }
diff --git a/db/routines/vn/events/client_userDisable.sql b/db/routines/vn/events/client_userDisable.sql
new file mode 100644
index 000000000..b3354f8fd
--- /dev/null
+++ b/db/routines/vn/events/client_userDisable.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`client_userDisable`
+	ON SCHEDULE EVERY 1 MONTH
+		STARTS '2023-06-01 00:00:00.000'
+	ON COMPLETION PRESERVE
+	ENABLE
+DO CALL client_userDisable()$$
+DELIMITER ;
diff --git a/db/routines/vn/events/clientsDisable.sql b/db/routines/vn/events/clientsDisable.sql
deleted file mode 100644
index 35e6554a2..000000000
--- a/db/routines/vn/events/clientsDisable.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`clientsDisable`
-	ON SCHEDULE EVERY 1 MONTH
-		STARTS '2023-06-01 00:00:00.000'
-	ON COMPLETION PRESERVE
-	ENABLE
-DO BEGIN
-	UPDATE account.user u
-			JOIN client c ON c.id = u.id
-			LEFT JOIN account.account a ON a.id = u.id
-		SET u.active = FALSE
-		WHERE c.typeFk = 'normal'
-			AND a.id IS NULL
-			AND u.active
-			AND c.created < util.VN_CURDATE() - INTERVAL 12 MONTH 
-			AND u.id NOT IN (
-				SELECT DISTINCT c.id
-					FROM client c
-						LEFT JOIN ticket t ON t.clientFk = c.id
-					WHERE c.salesPersonFk IS NOT NULL
-						OR t.created > util.VN_CURDATE() - INTERVAL 12 MONTH 
-						OR shipped > util.VN_CURDATE() - INTERVAL 12 MONTH 
-				);
-END$$
-DELIMITER ;
diff --git a/db/routines/vn/procedures/buy_clone.sql b/db/routines/vn/procedures/buy_clone.sql
index d3fbf888d..7b77204c9 100644
--- a/db/routines/vn/procedures/buy_clone.sql
+++ b/db/routines/vn/procedures/buy_clone.sql
@@ -19,7 +19,6 @@ BEGIN
 				packing,
 				`grouping`,
 				groupingMode,
-				containerFk,
 				comissionValue,
 				packageValue,
 				price1,
@@ -41,7 +40,6 @@ BEGIN
 					b.packing,
 					b.`grouping`,
 					b.groupingMode,
-					b.containerFk,
 					b.comissionValue,
 					b.packageValue,
 					b.price1,
diff --git a/db/routines/vn/procedures/client_userDisable.sql b/db/routines/vn/procedures/client_userDisable.sql
new file mode 100644
index 000000000..f2ba65c1c
--- /dev/null
+++ b/db/routines/vn/procedures/client_userDisable.sql
@@ -0,0 +1,33 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`client_userDisable`()
+BEGIN
+/**
+* Desactiva los clientes inactivos en los últimos X meses.
+*/
+	DECLARE vMonths INT;
+
+	SELECT monthsToDisableUser INTO vMonths
+		FROM clientConfig;
+
+	IF vMonths IS NULL THEN
+		CALL util.throw('Config parameter not set');
+	END IF;
+
+	UPDATE account.user u
+			JOIN client c ON c.id = u.id
+			LEFT JOIN account.account a ON a.id = u.id
+		SET u.active = FALSE
+		WHERE c.typeFk = 'normal'
+			AND a.id IS NULL
+			AND u.active
+			AND c.created < util.VN_CURDATE() - INTERVAL vMonths MONTH 
+			AND u.id NOT IN (
+				SELECT DISTINCT c.id
+					FROM client c
+						LEFT JOIN ticket t ON t.clientFk = c.id
+					WHERE c.salesPersonFk IS NOT NULL
+						OR t.created > util.VN_CURDATE() - INTERVAL vMonths MONTH 
+						OR shipped > util.VN_CURDATE() - INTERVAL vMonths MONTH 
+			);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/entry_fixMisfit.sql b/db/routines/vn/procedures/entry_fixMisfit.sql
index 3e57d362e..986a0ae9e 100644
--- a/db/routines/vn/procedures/entry_fixMisfit.sql
+++ b/db/routines/vn/procedures/entry_fixMisfit.sql
@@ -26,7 +26,6 @@ BEGIN
 			packing,
 			`grouping`,
 			groupingMode,
-			containerFk,
 			comissionValue,
 			packageValue,
 			location,
@@ -46,7 +45,6 @@ BEGIN
 				packing,
 				`grouping`,
 				groupingMode,
-				containerFk,
 				comissionValue,
 				packageValue,
 				location,
diff --git a/db/routines/vn/procedures/entry_moveNotPrinted.sql b/db/routines/vn/procedures/entry_moveNotPrinted.sql
index 526ae9d43..3a12007d1 100644
--- a/db/routines/vn/procedures/entry_moveNotPrinted.sql
+++ b/db/routines/vn/procedures/entry_moveNotPrinted.sql
@@ -56,7 +56,6 @@ BEGIN
 			packing,
 			`grouping`,
 			groupingMode,
-			containerFk,
 			comissionValue,
 			packageValue,
 			packagingFk,
@@ -77,7 +76,6 @@ BEGIN
 				packing,
 				`grouping`,
 				groupingMode,
-				containerFk,
 				comissionValue,
 				packageValue,
 				packagingFk,
@@ -114,7 +112,6 @@ BEGIN
 					packing,
 					`grouping`,
 					groupingMode,
-					containerFk,
 					comissionValue,
 					packageValue,
 					location,
@@ -133,7 +130,6 @@ BEGIN
 				packing,
 				`grouping`,
 				groupingMode,
-				containerFk,
 				comissionValue,
 				packageValue,
 				location,
diff --git a/db/routines/vn/procedures/entry_splitByShelving.sql b/db/routines/vn/procedures/entry_splitByShelving.sql
index b7d9c77b3..2898141ea 100644
--- a/db/routines/vn/procedures/entry_splitByShelving.sql
+++ b/db/routines/vn/procedures/entry_splitByShelving.sql
@@ -76,7 +76,6 @@ BEGIN
 								packing,
 								`grouping`,
 								groupingMode,
-								containerFk,
 								comissionValue,
 								packageValue,
 								location,
@@ -103,7 +102,6 @@ BEGIN
 							packing,
 							`grouping`,
 							groupingMode,
-							containerFk,
 							comissionValue,
 							packageValue,
 							location,
diff --git a/db/routines/vn/procedures/itemPlacementSupplyStockGetTargetList.sql b/db/routines/vn/procedures/itemPlacementSupplyStockGetTargetList.sql
index bdc13ae9d..86d62cad4 100644
--- a/db/routines/vn/procedures/itemPlacementSupplyStockGetTargetList.sql
+++ b/db/routines/vn/procedures/itemPlacementSupplyStockGetTargetList.sql
@@ -18,11 +18,12 @@ BEGIN
 			JOIN vn.parking p ON p.id = sh.parkingFk
 			JOIN vn.sector sc ON sc.id = p.sectorFk
 			JOIN vn.warehouse w ON w.id = sc.warehouseFk
-		WHERE sc.id = vSectorFk
-			AND ish.visible > 0
+		WHERE ish.visible > 0
 			AND ish.itemFk = vItemFk
 		GROUP BY ish.id
-		ORDER BY sh.priority DESC,
+		ORDER BY 
+			(sc.id = vSectorFk) DESC,
+			sh.priority DESC,
 			ish.created, 
 			p.pickingOrder;
 END$$
diff --git a/db/routines/vn/procedures/item_devalueA2.sql b/db/routines/vn/procedures/item_devalueA2.sql
index f331c7230..c9f716d8f 100644
--- a/db/routines/vn/procedures/item_devalueA2.sql
+++ b/db/routines/vn/procedures/item_devalueA2.sql
@@ -319,7 +319,6 @@ BEGIN
 			packing,
 			`grouping`,
 			groupingMode,
-			containerFk,
 			comissionValue,
 			packageValue,
 			price1,
@@ -341,7 +340,6 @@ BEGIN
 				packing,
 				`grouping`,
 				groupingMode,
-				containerFk,
 				comissionValue,
 				packageValue,
 				price1,
@@ -366,7 +364,6 @@ BEGIN
 				packing,
 				`grouping`,
 				groupingMode,
-				containerFk,
 				comissionValue,
 				packageValue,
 				price1,
diff --git a/db/routines/vn2008/views/Compres.sql b/db/routines/vn2008/views/Compres.sql
index 557136192..b99dd2b73 100644
--- a/db/routines/vn2008/views/Compres.sql
+++ b/db/routines/vn2008/views/Compres.sql
@@ -28,6 +28,5 @@ AS SELECT `c`.`id` AS `Id_Compra`,
 	`c`.`workerFk` AS `Id_Trabajador`,
 	`c`.`weight` AS `weight`,
 	`c`.`dispatched` AS `dispatched`,
-	`c`.`containerFk` AS `container_id`,
 	`c`.`itemOriginalFk` AS `itemOriginalFk`
 FROM `vn`.`buy` `c`
diff --git a/db/versions/11055-wheatPaniculata/00-firstScript.sql b/db/versions/11055-wheatPaniculata/00-firstScript.sql
new file mode 100644
index 000000000..6eec62fd8
--- /dev/null
+++ b/db/versions/11055-wheatPaniculata/00-firstScript.sql
@@ -0,0 +1,5 @@
+ALTER TABLE vn.clientConfig
+    ADD monthsToDisableUser int(10) unsigned DEFAULT NULL NULL;
+
+UPDATE IGNORE vn.clientConfig
+    SET monthsToDisableUser = 12;
\ No newline at end of file
diff --git a/db/versions/11057-chocolateMoss/00-part.sql b/db/versions/11057-chocolateMoss/00-part.sql
index 4cabb0e33..bd6c69955 100644
--- a/db/versions/11057-chocolateMoss/00-part.sql
+++ b/db/versions/11057-chocolateMoss/00-part.sql
@@ -1,9 +1,9 @@
 DROP TABLE IF EXISTS vn2008.scanTree__;
 DROP TABLE IF EXISTS vn2008.payroll_embargos__;
 DROP TABLE IF EXISTS vn2008.unary_source__;
-DROP TABLE IF EXISTS vn2008.unary_scan__;
 DROP TABLE IF EXISTS vn2008.unary_scan_line_buy__;
 DROP TABLE IF EXISTS vn2008.unary_scan_line__;
+DROP TABLE IF EXISTS vn2008.unary_scan__;
 DROP TABLE IF EXISTS vn2008.scan_line__;
 DROP TABLE IF EXISTS vn2008.Familias__;
 DROP TABLE IF EXISTS vn2008.language__;
diff --git a/db/versions/11057-chocolateMoss/01-part.sql b/db/versions/11057-chocolateMoss/01-part.sql
index bba2167aa..59df77f20 100644
--- a/db/versions/11057-chocolateMoss/01-part.sql
+++ b/db/versions/11057-chocolateMoss/01-part.sql
@@ -1,26 +1,41 @@
-DROP TABLE IF EXISTS vn2008.expeditions_deleted__;
-DROP TABLE IF EXISTS vn2008.Tipos_f11__;
-DROP TABLE IF EXISTS vn2008.commission__;
-DROP TABLE IF EXISTS vn2008.Movimientos_revisar__;
-DROP TABLE IF EXISTS vn2008.recibida_agricola__;
-DROP TABLE IF EXISTS vn2008.tipsa__;
-DROP TABLE IF EXISTS vn2008.rounding__;
-DROP TABLE IF EXISTS vn2008.Informes__;
-DROP TABLE IF EXISTS vn2008.Forms__;
-DROP TABLE IF EXISTS vn2008.Clientes_event__;
-DROP TABLE IF EXISTS vn2008.wh_selection__;
-DROP TABLE IF EXISTS vn2008.template_bionic_component__;
-DROP TABLE IF EXISTS vn2008.Agencias_province__;
-DROP TABLE IF EXISTS vn2008.travel_pattern__;
-DROP TABLE IF EXISTS vn2008.sort_merge_results_ernesto__;
-DROP TABLE IF EXISTS vn2008.Conteo__;
-DROP TABLE IF EXISTS vn2008.Consignatarios_devices__;
-DROP TABLE IF EXISTS vn2008.link__;
-DROP TABLE IF EXISTS vn2008.agency_warehouse__;
-DROP TABLE IF EXISTS vn2008.warehouse_lc__;
-DROP TABLE IF EXISTS vn2008.emp_day_pay__;
-DROP TABLE IF EXISTS vn2008.Entradas_kop__;
-DROP TABLE IF EXISTS vn2008.dock__;
-DROP TABLE IF EXISTS vn2008.unaryScanFilter__;
-DROP TABLE IF EXISTS vn2008.Grupos__;
-DROP TABLE IF EXISTS vn2008.nichos__;
+DROP TABLE IF EXISTS vn2008.form_query__;
+DROP TABLE IF EXISTS vn2008.filtros__;
+DROP TABLE IF EXISTS vn2008.Objetivos__;
+UPDATE IGNORE vn.province
+	SET zoneFk = NULL
+	WHERE zoneFk IN (
+		SELECT zoneFk
+			FROM vn.province
+			WHERE zoneFk IS NOT NULL AND zoneFk NOT IN (SELECT id FROM vn.`zone`)
+	);
+ALTER TABLE vn.province DROP FOREIGN KEY province_zone_fk;
+ALTER TABLE vn.province MODIFY COLUMN zoneFk int(11) DEFAULT NULL NULL;
+ALTER TABLE vn.province ADD CONSTRAINT
+    province_zone_FK FOREIGN KEY (zoneFk) REFERENCES vn.`zone`(id) ON DELETE CASCADE ON UPDATE CASCADE;
+DROP TABLE IF EXISTS vn2008.zones__;
+DROP TABLE IF EXISTS vn2008.rec_translator__;
+DROP TABLE IF EXISTS vn2008.warehouse_joined__;
+DROP TABLE IF EXISTS vn2008.warehouse_filtro__;
+DROP TABLE IF EXISTS vn2008.viaxpress__;
+DROP TABLE IF EXISTS vn2008.cl_que__;
+DROP TABLE IF EXISTS vn2008.Recibos_recorded__;
+RENAME TABLE vn.coolerPathDetail TO vn.coolerPathDetail__;
+ALTER TABLE vn.coolerPathDetail__ DROP FOREIGN KEY coolerPathDetail_FK;
+DROP TABLE IF EXISTS vn2008.cooler_path__;
+DROP TABLE IF EXISTS vn2008.payrroll_apEmpresarial__;
+DROP TABLE IF EXISTS vn2008.Compres_ok__;
+DROP TABLE IF EXISTS vn2008.Movimientos_avisar__;
+DROP TABLE IF EXISTS vn2008.Clases__;
+DROP TABLE IF EXISTS vn2008.payroll_basess__;
+DROP TABLE IF EXISTS vn2008.payroll_tipobasess__;
+DROP TABLE IF EXISTS vn2008.guillen__;
+DROP TABLE IF EXISTS vn2008.guillen_carry__;
+DROP TABLE IF EXISTS vn2008.Series__;
+DROP TABLE IF EXISTS vn2008.Permisos__;
+ALTER TABLE vn.buy DROP FOREIGN KEY buy_FK_1;
+DROP TABLE IF EXISTS vn2008.container__;
+DROP TABLE IF EXISTS vn2008.travel_reserve__;
+DROP TABLE IF EXISTS vn2008.tmpNEWTARIFAS__;
+DROP TABLE IF EXISTS vn2008.Clientes_potenciales__;
+DROP TABLE IF EXISTS vn2008.duaDismissed__;
+DROP TABLE IF EXISTS vn2008.cl_pet__;
diff --git a/db/versions/11057-chocolateMoss/02-part.sql b/db/versions/11057-chocolateMoss/02-part.sql
index dbdd6b3c4..46cda539a 100644
--- a/db/versions/11057-chocolateMoss/02-part.sql
+++ b/db/versions/11057-chocolateMoss/02-part.sql
@@ -1,26 +1,27 @@
-DROP TABLE IF EXISTS vn2008.form_query__;
-DROP TABLE IF EXISTS vn2008.filtros__;
-DROP TABLE IF EXISTS vn2008.Objetivos__;
-DROP TABLE IF EXISTS vn2008.zones__;
-DROP TABLE IF EXISTS vn2008.rec_translator__;
-DROP TABLE IF EXISTS vn2008.warehouse_joined__;
-DROP TABLE IF EXISTS vn2008.warehouse_filtro__;
-DROP TABLE IF EXISTS vn2008.viaxpress__;
-DROP TABLE IF EXISTS vn2008.cl_que__;
-DROP TABLE IF EXISTS vn2008.Recibos_recorded__;
-DROP TABLE IF EXISTS vn2008.cooler_path__;
-DROP TABLE IF EXISTS vn2008.payrroll_apEmpresarial__;
-DROP TABLE IF EXISTS vn2008.Compres_ok__;
-DROP TABLE IF EXISTS vn2008.Movimientos_avisar__;
-DROP TABLE IF EXISTS vn2008.Clases__;
-DROP TABLE IF EXISTS vn2008.payroll_tipobasess__;
-DROP TABLE IF EXISTS vn2008.guillen__;
-DROP TABLE IF EXISTS vn2008.guillen_carry__;
-DROP TABLE IF EXISTS vn2008.Series__;
-DROP TABLE IF EXISTS vn2008.Permisos__;
-DROP TABLE IF EXISTS vn2008.container__;
-DROP TABLE IF EXISTS vn2008.travel_reserve__;
-DROP TABLE IF EXISTS vn2008.tmpNEWTARIFAS__;
-DROP TABLE IF EXISTS vn2008.Clientes_potenciales__;
-DROP TABLE IF EXISTS vn2008.duaDismissed__;
-DROP TABLE IF EXISTS vn2008.cl_pet__;
+DROP TABLE IF EXISTS vn2008.expeditions_deleted__;
+DROP TABLE IF EXISTS vn2008.Tipos_f11__;
+DROP TABLE IF EXISTS vn2008.commission__;
+DROP TABLE IF EXISTS vn2008.Movimientos_revisar__;
+DROP TABLE IF EXISTS vn2008.recibida_agricola__;
+DROP TABLE IF EXISTS vn2008.tipsa__;
+DROP TABLE IF EXISTS vn2008.rounding__;
+DROP TABLE IF EXISTS vn2008.Informes__;
+DROP TABLE IF EXISTS vn2008.Monitoring__;
+DROP TABLE IF EXISTS vn2008.Forms__;
+DROP TABLE IF EXISTS vn2008.Clientes_event__;
+DROP TABLE IF EXISTS vn2008.wh_selection__;
+DROP TABLE IF EXISTS vn2008.template_bionic_component__;
+DROP TABLE IF EXISTS vn2008.Agencias_province__;
+DROP TABLE IF EXISTS vn2008.travel_pattern__;
+DROP TABLE IF EXISTS vn2008.sort_merge_results_ernesto__;
+DROP TABLE IF EXISTS vn2008.Conteo__;
+DROP TABLE IF EXISTS vn2008.Consignatarios_devices__;
+DROP TABLE IF EXISTS vn2008.link__;
+DROP TABLE IF EXISTS vn2008.agency_warehouse__;
+DROP TABLE IF EXISTS vn2008.warehouse_lc__;
+DROP TABLE IF EXISTS vn2008.emp_day_pay__;
+DROP TABLE IF EXISTS vn2008.Entradas_kop__;
+DROP TABLE IF EXISTS vn2008.dock__;
+DROP TABLE IF EXISTS vn2008.unaryScanFilter__;
+DROP TABLE IF EXISTS vn2008.Grupos__;
+DROP TABLE IF EXISTS vn2008.nichos__;
diff --git a/db/versions/11057-chocolateMoss/03-part.sql b/db/versions/11057-chocolateMoss/03-part.sql
index f5e4e45c0..e1947f064 100644
--- a/db/versions/11057-chocolateMoss/03-part.sql
+++ b/db/versions/11057-chocolateMoss/03-part.sql
@@ -6,7 +6,6 @@ DROP TABLE IF EXISTS vn2008.invoice_observation__;
 DROP TABLE IF EXISTS vn2008.edi_testigos__;
 DROP TABLE IF EXISTS vn2008.cl_dep__;
 DROP TABLE IF EXISTS vn2008.agencia_descuadre__;
-DROP TABLE IF EXISTS vn2008.Monitoring__;
 DROP TABLE IF EXISTS vn2008.payroll_datos__;
 DROP TABLE IF EXISTS vn2008.tblIVA__;
 DROP TABLE IF EXISTS vn2008.cyc__;
@@ -25,4 +24,3 @@ DROP TABLE IF EXISTS vn2008.scan__;
 DROP TABLE IF EXISTS vn2008.trolley__;
 DROP TABLE IF EXISTS vn2008.transport__;
 DROP TABLE IF EXISTS vn2008.Baldas__;
-DROP TABLE IF EXISTS vn2008.payroll_basess__;
diff --git a/db/versions/11061-silverMastic/00-firstScript.sql b/db/versions/11061-silverMastic/00-firstScript.sql
new file mode 100644
index 000000000..32dbc0c2e
--- /dev/null
+++ b/db/versions/11061-silverMastic/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.buy CHANGE containerFk containerFk__ smallint(5) unsigned DEFAULT NULL NULL;
diff --git a/e2e/paths/03-worker/07_pda.spec.js b/e2e/paths/03-worker/07_pda.spec.js
deleted file mode 100644
index 2b743823e..000000000
--- a/e2e/paths/03-worker/07_pda.spec.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Worker pda path', () => {
-    let browser;
-    let page;
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('hr', 'worker');
-        await page.accessToSearchResult('employeeNick');
-        await page.accessToSection('worker.card.pda');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should check if worker has already a PDA allocated', async() => {
-        expect(await page.waitToGetProperty(selectors.workerPda.currentPDA, 'value')).toContain('serialNumber1');
-    });
-
-    it('should deallocate the PDA', async() => {
-        await page.waitToClick(selectors.workerPda.delete);
-        let message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('PDA deallocated');
-    });
-
-    it('should allocate a new PDA', async() => {
-        await page.autocompleteSearch(selectors.workerPda.newPDA, 'serialNumber2');
-        await page.waitToClick(selectors.workerPda.submit);
-        let message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('PDA allocated');
-    });
-
-    it('should check if a new PDA has been allocated', async() => {
-        expect(await page.waitToGetProperty(selectors.workerPda.currentPDA, 'value')).toContain('serialNumber2');
-    });
-});
diff --git a/modules/entry/back/methods/entry/addFromBuy.js b/modules/entry/back/methods/entry/addFromBuy.js
index 307c04b97..e5cc427a8 100644
--- a/modules/entry/back/methods/entry/addFromBuy.js
+++ b/modules/entry/back/methods/entry/addFromBuy.js
@@ -76,7 +76,6 @@ module.exports = Self => {
                     packing: buyUltimate.packing,
                     grouping: buyUltimate.grouping,
                     groupingMode: buyUltimate.groupingMode,
-                    containerFk: buyUltimate.containerFk,
                     comissionValue: buyUltimate.comissionValue,
                     packageValue: buyUltimate.packageValue,
                     location: buyUltimate.location,
diff --git a/modules/entry/back/models/buy.json b/modules/entry/back/models/buy.json
index 35861fd81..14cafde06 100644
--- a/modules/entry/back/models/buy.json
+++ b/modules/entry/back/models/buy.json
@@ -63,9 +63,6 @@
         "isIgnored": {
             "type": "boolean"
         },
-        "containerFk": {
-            "type": "number"
-        },
         "location": {
             "type": "number"
         },
diff --git a/modules/ticket/back/methods/ticket/closeAll.js b/modules/ticket/back/methods/ticket/closeAll.js
index e3cbc83e2..35b9b1e37 100644
--- a/modules/ticket/back/methods/ticket/closeAll.js
+++ b/modules/ticket/back/methods/ticket/closeAll.js
@@ -138,9 +138,12 @@ module.exports = Self => {
                     JOIN alertLevel al ON al.id = ts.alertLevel
                     JOIN agencyMode am ON am.id = t.agencyModeFk
                     JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
+                    LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id
                 SET t.routeFk = NULL
                 WHERE DATE(t.shipped) BETWEEN ? - INTERVAL 2 DAY AND util.dayEnd(?)
                     AND al.code NOT IN ('DELIVERED', 'PACKED')
+                    AND NOT t.packages
+                    AND tob.id IS NULL
                     AND t.routeFk`, [toDate, toDate], {userId: ctx.req.accessToken.userId});
 
         return {
diff --git a/modules/worker/front/pda/index.html b/modules/worker/front/pda/index.html
deleted file mode 100644
index c6d31dc85..000000000
--- a/modules/worker/front/pda/index.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<div class="vn-w-md" ng-show="$ctrl.currentPDA">
-    <vn-card class="vn-pa-lg">
-        <vn-horizontal>
-            <vn-textfield
-                label="Current PDA"
-                ng-model="$ctrl.currentPDA.description"
-                disabled="true">
-                <append>
-                    <vn-icon-button
-                        icon="delete"
-                        vn-tooltip="Deallocate PDA"
-                        ng-click="$ctrl.deallocatePDA()"
-                        vn-acl="hr, productionAssi">
-                    </vn-icon-button>
-                </append>
-            </vn-textfield>
-        </vn-horizontal>
-    </vn-card>
-</div>
-<form name="form" ng-show="!$ctrl.currentPDA" ng-submit="$ctrl.allocatePDA()" class="vn-w-md">
-    <vn-card class="vn-pa-lg">
-            <vn-horizontal>
-                <vn-autocomplete
-                    vn-acl="hr, productionAssi"
-                    ng-model="$ctrl.newPDA"
-                    url="DeviceProductions"
-                    fields="['id', 'modelFk', 'serialNumber']"
-                    where="{'stateFk': 'idle'}"
-                    label="New PDA"
-                    order="id"
-                    value-field="id"
-                    show-field="serialNumber">
-                    <tpl-item>
-                        <div>
-                            ID: {{id}}
-                        </div>
-                        <div class="text-caption text-grey">
-                            {{modelFk}}, {{serialNumber}}
-                        </div>
-                    </tpl-item>
-                </vn-autocomplete>
-            </vn-horizontal>
-    </vn-card>
-    <vn-button-bar>
-        <vn-submit
-            disabled="!$ctrl.newPDA"
-            label="Assign">
-        </vn-submit>
-    </vn-button-bar>
-</form>
diff --git a/modules/worker/front/pda/index.js b/modules/worker/front/pda/index.js
index 885261e5c..c3616b41e 100644
--- a/modules/worker/front/pda/index.js
+++ b/modules/worker/front/pda/index.js
@@ -1,53 +1,18 @@
 import ngModule from '../module';
 import Section from 'salix/components/section';
-import './style.scss';
 
 class Controller extends Section {
     constructor($element, $) {
         super($element, $);
-        const filter = {
-            where: {userFk: this.$params.id},
-            include: {relation: 'deviceProduction'}
-        };
-        this.$http.get('DeviceProductionUsers', {filter}).
-            then(res => {
-                if (res.data && res.data.length > 0)
-                    this.setCurrentPDA(res.data[0]);
-            });
     }
 
-    deallocatePDA() {
-        this.$http.post(`Workers/${this.$params.id}/deallocatePDA`, {pda: this.currentPDA.deviceProductionFk})
-            .then(() => {
-                this.vnApp.showSuccess(this.$t('PDA deallocated'));
-                delete this.currentPDA;
-            });
-    }
-
-    allocatePDA() {
-        this.$http.post(`Workers/${this.$params.id}/allocatePDA`, {pda: this.newPDA})
-            .then(res => {
-                if (res.data)
-                    this.setCurrentPDA(res.data);
-
-                this.vnApp.showSuccess(this.$t('PDA allocated'));
-                delete this.newPDA;
-            });
-    }
-
-    setCurrentPDA(data) {
-        this.currentPDA = data;
-        this.currentPDA.description = [];
-        this.currentPDA.description.push(`ID: ${this.currentPDA.deviceProductionFk}`);
-        this.currentPDA.description.push(`${this.$t('Model')}: ${this.currentPDA.deviceProduction.modelFk}`);
-        this.currentPDA.description.push(`${this.$t('Serial Number')}: ${this.currentPDA.deviceProduction.serialNumber}`);
-        this.currentPDA.description = this.currentPDA.description.join(' ');
+    async $onInit() {
+        const url = await this.vnApp.getUrl(`worker/${this.$params.id}/pda`);
+        this.$state.go('worker.card.summary', {id: this.$params.id});
+        window.location.href = url;
     }
 }
 
-Controller.$inject = ['$element', '$scope'];
-
 ngModule.vnComponent('vnWorkerPda', {
-    template: require('./index.html'),
-    controller: Controller,
+    controller: Controller
 });
diff --git a/modules/worker/front/pda/index.spec.js b/modules/worker/front/pda/index.spec.js
deleted file mode 100644
index a0540af45..000000000
--- a/modules/worker/front/pda/index.spec.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import './index';
-
-describe('Worker', () => {
-    describe('Component vnWorkerPda', () => {
-        let $httpBackend;
-        let $scope;
-        let $element;
-        let controller;
-
-        beforeEach(ngModule('worker'));
-
-        beforeEach(inject(($componentController, $rootScope, _$httpBackend_) => {
-            $httpBackend = _$httpBackend_;
-            $scope = $rootScope.$new();
-            $element = angular.element('<vn-worker-pda></vn-worker-pda>');
-            controller = $componentController('vnWorkerPda', {$element, $scope});
-            $httpBackend.expectGET(`DeviceProductionUsers`).respond();
-        }));
-
-        describe('deallocatePDA()', () => {
-            it('should make an HTTP Post query to deallocatePDA', () => {
-                jest.spyOn(controller.vnApp, 'showSuccess');
-                controller.currentPDA = {deviceProductionFk: 1};
-                controller.$params.id = 1;
-
-                $httpBackend
-                    .expectPOST(`Workers/${controller.$params.id}/deallocatePDA`,
-                        {pda: controller.currentPDA.deviceProductionFk})
-                    .respond();
-                controller.deallocatePDA();
-                $httpBackend.flush();
-
-                expect(controller.vnApp.showSuccess).toHaveBeenCalled();
-                expect(controller.currentPDA).toBeUndefined();
-            });
-        });
-
-        describe('allocatePDA()', () => {
-            it('should make an HTTP Post query to allocatePDA', () => {
-                jest.spyOn(controller.vnApp, 'showSuccess');
-                controller.newPDA = 4;
-                controller.$params.id = 1;
-
-                $httpBackend
-                    .expectPOST(`Workers/${controller.$params.id}/allocatePDA`,
-                        {pda: controller.newPDA})
-                    .respond();
-                controller.allocatePDA();
-                $httpBackend.flush();
-
-                expect(controller.vnApp.showSuccess).toHaveBeenCalled();
-                expect(controller.newPDA).toBeUndefined();
-            });
-        });
-
-        describe('setCurrentPDA()', () => {
-            it('should set CurrentPDA', () => {
-                const data = {
-                    deviceProductionFk: 1,
-                    deviceProduction: {
-                        modelFk: 1,
-                        serialNumber: 1
-                    }
-                };
-                controller.setCurrentPDA(data);
-
-                expect(controller.currentPDA).toBeDefined();
-                expect(controller.currentPDA.description).toBeDefined();
-            });
-        });
-    });
-});
diff --git a/modules/worker/front/pda/style.scss b/modules/worker/front/pda/style.scss
deleted file mode 100644
index c55c9d218..000000000
--- a/modules/worker/front/pda/style.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "./variables";
-
-.text-grey {
-    color: $color-font-light;
-}
-
diff --git a/package.json b/package.json
index 390b61be1..c2f630974 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "24.22.0",
+    "version": "24.24.0",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",