diff --git a/src/org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced_data.xsql b/src/org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced_data.xsql
--- a/src/org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced_data.xsql
+++ b/src/org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced_data.xsql
@@ -293,12 +293,14 @@
     <SqlMethodComment></SqlMethodComment>
     <Sql>
       <![CDATA[
-       SELECT  AD_ORG_ID AS PADRE, M_WAREHOUSE_ID AS ID, NAME 
-       FROM M_WAREHOUSE
-       WHERE ad_client_id = ?
+       SELECT  O.AD_ORG_ID AS PADRE, W.M_WAREHOUSE_ID AS ID, W.NAME 
+       FROM M_WAREHOUSE W
+       JOIN AD_ORG O ON (AD_ISORGINCLUDED(W.AD_ORG_ID, O.AD_ORG_ID, ?) <> -1)
+       WHERE W.ad_client_id = ?
       ]]>
     </Sql>
     <Parameter name="adClient"/>
+    <Parameter name="adClient"/>
   </SqlMethod>
   
 </SqlClass>