Index: src/org/openbravo/erpCommon/ws/services/WebServicesAddress_data.xsql
===================================================================
--- src/org/openbravo/erpCommon/ws/services/WebServicesAddress_data.xsql	(revision 13500)
+++ src/org/openbravo/erpCommon/ws/services/WebServicesAddress_data.xsql	(working copy)
@@ -23,19 +23,17 @@
     <SqlMethod name="select" type="preparedStatement" return="multiple">
     	<SqlMethodComment></SqlMethodComment>
 	    <Sql>
-	      <![CDATA[
-	        SELECT L.AD_CLIENT_ID, B.C_BPARTNER_ID,	         		
-			       L.C_LOCATION_ID, L.ADDRESS1, L.ADDRESS2, L.CITY, L.POSTAL, 
-			       R.NAME AS REGION, 
-			       C.COUNTRYCODE AS COUNTRY
-			  FROM C_LOCATION L, C_BPARTNER_LOCATION B, C_REGION R, C_COUNTRY C
-			 WHERE L.AD_CLIENT_ID = B.AD_CLIENT_ID
-			   AND L.C_LOCATION_ID = B.C_LOCATION_ID
-			   AND L.C_COUNTRY_ID = C.C_COUNTRY_ID
-			   AND L.C_REGION_ID = R.C_REGION_ID
-			   AND L.AD_CLIENT_ID = TO_NUMBER(?)     
-			   AND B.C_BPARTNER_ID = TO_NUMBER(?)	            
-			   AND L.C_LOCATION_ID = TO_NUMBER(?)
+	      <![CDATA[SELECT L.AD_CLIENT_ID, B.C_BPARTNER_ID, L.C_LOCATION_ID, L.ADDRESS1, L.ADDRESS2, L.CITY, L.POSTAL, 
+                       R.NAME AS REGION, 
+                       C.COUNTRYCODE AS COUNTRY
+                       FROM C_LOCATION L
+                       LEFT JOIN C_BPARTNER_LOCATION B ON L.C_LOCATION_ID = B.C_LOCATION_ID AND L.AD_CLIENT_ID = B.AD_CLIENT_ID
+                       LEFT OUTER JOIN C_REGION R ON L.C_REGION_ID = R.C_REGION_ID
+                       LEFT JOIN C_COUNTRY C ON L.C_COUNTRY_ID = C.C_COUNTRY_ID
+                       WHERE 
+                       L.AD_CLIENT_ID = TO_NUMBER(?)     
+                       AND B.C_BPARTNER_ID = TO_NUMBER(?)               
+                       AND L.C_LOCATION_ID = TO_NUMBER(?)
 	      ]]>
 	    </Sql>
     	<Parameter name="clientId"/>
@@ -73,4 +71,4 @@
       <Parameter name="adClientId"/>
       <Parameter name="cLocationId"/>
    	</SqlMethod>
-</SqlClass>
\ No newline at end of file
+</SqlClass>