zone warehouse error

db/changes/10100-AllSaints/01-zone_getLanded.sql

@@ -23,7 +23,9 @@ BEGIN
 			ENGINE = MEMORY
 		SELECT vWarehouseFk warehouseFk,
             TIMESTAMPADD(DAY,zo.travelingDays, vShipped) landed,
-			zo.zoneFk
+            vShipped shipped,
+			zo.zoneFk,
+            z.agencyModeFk
 		FROM tmp.zoneOption zo
 			JOIN zone z ON z.id = zo.zoneFk
 		WHERE agencyModeFk = vAgencyModeFk;

db/changes/10100-AllSaints/01-zone_getShippedWarehouse.sql

@@ -23,9 +23,12 @@ BEGIN
 		SELECT * FROM (
 				SELECT zo.zoneFk,
 						TIMESTAMPADD(DAY,-zo.travelingDays, vLanded) shipped,
-						zw.warehouseFk
+						zw.warehouseFk,
+                        z.agencyModeFk
 					FROM tmp.zoneOption zo
 						JOIN zoneWarehouse zw ON zw.zoneFk = zo.zoneFk
+                        JOIN zone z ON z.id = zo.zoneFk
+					WHERE z.agencyModeFk = vAgencyModeFk
                 ORDER BY shipped) t
 			GROUP BY warehouseFk;
             

modules/ticket/front/basic-data/step-one/index.html

@@ -1,6 +1,5 @@
 <vn-crud-model
     url="Zones"
-    include="{relation: 'warehouse'}"
     data="zones"
     order="name"
     auto-load="true">
@@ -86,7 +85,7 @@
                 ng-model="$ctrl.zoneId"
                 vn-acl="productionBoss">
                 <tpl-item>
-                    <span>{{::name}} - {{::warehouse.name}} - Max. {{::hour | date: 'HH:mm'}} h.</span>
+                    <span>{{::name}} - Max. {{::hour | date: 'HH:mm'}} h.</span>
                 </tpl-item>
             </vn-autocomplete>
         </vn-horizontal>