diff -r 6c3fcdc7c067 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Jun 25 15:43:11 2015 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Jun 25 16:23:16 2015 +0200
@@ -3074,8 +3074,8 @@
-
-
+
+
diff -r 6c3fcdc7c067 src-db/database/sourcedata/AD_REF_TREE.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/sourcedata/AD_REF_TREE.xml Thu Jun 25 16:23:16 2015 +0200
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 6c3fcdc7c067 src-db/database/sourcedata/AD_REF_TREE_FIELD.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/sourcedata/AD_REF_TREE_FIELD.xml Thu Jun 25 16:23:16 2015 +0200
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 6c3fcdc7c067 src/org/openbravo/retail/posterminal/datasource/CCSelectWarehouseQueryTransformer.java
--- a/src/org/openbravo/retail/posterminal/datasource/CCSelectWarehouseQueryTransformer.java Thu Jun 25 15:43:11 2015 +0200
+++ b/src/org/openbravo/retail/posterminal/datasource/CCSelectWarehouseQueryTransformer.java Thu Jun 25 16:23:16 2015 +0200
@@ -41,6 +41,7 @@
"where not exists (select 1 from OrganizationWarehouse as oww where oww.organization.id = 'replace_org_id' "
+ "and oww.warehouse.id = e.id and (oww.warehouseType <> 'cross_channel' OR oww.warehouseType is null)) and e.client");
hqlQuery = hqlQuery.replaceAll("replace_org_id", organizationId);
+ hqlQuery = hqlQuery.replaceAll("join_0.name", "e.organization.name");
hqlQuery = hqlQuery.replaceAll("join_0", "e.locationAddress");
hqlQuery = hqlQuery.replaceAll("join_1", "e.locationAddress.region");
hqlQuery = hqlQuery.replaceAll("join_2", "e.locationAddress.country");