diff -r f4b4be1332ed src-db/database/model/modifiedTables/AD_ORG.xml
--- a/src-db/database/model/modifiedTables/AD_ORG.xml Thu May 28 13:24:12 2015 +0200
+++ b/src-db/database/model/modifiedTables/AD_ORG.xml Thu May 28 17:33:20 2015 +0200
@@ -45,6 +45,14 @@
+
+
+
+
+
+
+
+
diff -r f4b4be1332ed src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Thu May 28 13:24:12 2015 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu May 28 17:33:20 2015 +0200
@@ -496,6 +496,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -531,6 +565,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -710,6 +778,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1315,6 +1448,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2187,6 +2354,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2541,6 +2742,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2754,6 +2990,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4448,6 +4751,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4873,6 +5209,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5039,7 +5410,7 @@
-
+
@@ -5400,7 +5771,7 @@
-
+
@@ -5549,6 +5920,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5751,7 +6155,7 @@
-
+
@@ -5794,6 +6198,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5855,7 +6293,7 @@
-
+
@@ -6927,6 +7365,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7132,7 +7603,7 @@
-
+
@@ -7490,7 +7961,7 @@
-
+
@@ -7605,6 +8076,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7740,7 +8244,7 @@
-
+
@@ -8766,7 +9270,7 @@
-
+
@@ -8984,6 +9488,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -9012,7 +9550,7 @@
-
+
@@ -9128,6 +9666,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -9156,7 +9728,7 @@
-
+
@@ -9228,7 +9800,7 @@
-
+
@@ -9833,6 +10405,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r f4b4be1332ed src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Thu May 28 13:24:12 2015 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Thu May 28 17:33:20 2015 +0200
@@ -106,6 +106,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -170,6 +182,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -340,6 +364,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -430,6 +466,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -524,6 +572,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -579,6 +639,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -631,6 +703,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -765,6 +849,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1180,6 +1276,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1192,6 +1300,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1524,6 +1644,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1649,6 +1781,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff -r f4b4be1332ed src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Thu May 28 13:24:12 2015 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml Thu May 28 17:33:20 2015 +0200
@@ -58,6 +58,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -339,6 +367,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -848,6 +902,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1069,6 +1175,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1156,6 +1288,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2200,6 +2358,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2929,6 +3115,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3446,6 +3658,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3972,6 +4210,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4311,6 +4601,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4839,6 +5157,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4896,6 +5240,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5128,6 +5498,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5245,6 +5641,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6008,6 +6430,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r f4b4be1332ed src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Thu May 28 13:24:12 2015 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Thu May 28 17:33:20 2015 +0200
@@ -984,6 +984,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff -r f4b4be1332ed src-db/database/sourcedata/AD_REFERENCE.xml
--- a/src-db/database/sourcedata/AD_REFERENCE.xml Thu May 28 13:24:12 2015 +0200
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml Thu May 28 17:33:20 2015 +0200
@@ -39,6 +39,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -91,6 +105,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -127,6 +153,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r f4b4be1332ed src-db/database/sourcedata/AD_REF_TABLE.xml
--- a/src-db/database/sourcedata/AD_REF_TABLE.xml Thu May 28 13:24:12 2015 +0200
+++ b/src-db/database/sourcedata/AD_REF_TABLE.xml Thu May 28 17:33:20 2015 +0200
@@ -33,6 +33,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r f4b4be1332ed src-db/database/sourcedata/AD_TAB.xml
--- a/src-db/database/sourcedata/AD_TAB.xml Thu May 28 13:24:12 2015 +0200
+++ b/src-db/database/sourcedata/AD_TAB.xml Thu May 28 17:33:20 2015 +0200
@@ -58,6 +58,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -241,6 +270,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r f4b4be1332ed src-db/database/sourcedata/AD_TABLE.xml
--- a/src-db/database/sourcedata/AD_TABLE.xml Thu May 28 13:24:12 2015 +0200
+++ b/src-db/database/sourcedata/AD_TABLE.xml Thu May 28 17:33:20 2015 +0200
@@ -113,6 +113,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -225,6 +256,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r f4b4be1332ed src-db/database/sourcedata/AD_WINDOW.xml
--- a/src-db/database/sourcedata/AD_WINDOW.xml Thu May 28 13:24:12 2015 +0200
+++ b/src-db/database/sourcedata/AD_WINDOW.xml Thu May 28 17:33:20 2015 +0200
@@ -67,6 +67,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r f4b4be1332ed src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml Thu May 28 17:33:20 2015 +0200
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r f4b4be1332ed src-db/database/sourcedata/OBUIAPP_PROCESS.xml
--- a/src-db/database/sourcedata/OBUIAPP_PROCESS.xml Thu May 28 13:24:12 2015 +0200
+++ b/src-db/database/sourcedata/OBUIAPP_PROCESS.xml Thu May 28 17:33:20 2015 +0200
@@ -39,6 +39,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r f4b4be1332ed src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml Thu May 28 17:33:20 2015 +0200
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff -r f4b4be1332ed src/org/openbravo/retail/posterminal/POSConstants.java
--- a/src/org/openbravo/retail/posterminal/POSConstants.java Thu May 28 13:24:12 2015 +0200
+++ b/src/org/openbravo/retail/posterminal/POSConstants.java Thu May 28 17:33:20 2015 +0200
@@ -1,7 +1,16 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2015 Openbravo S.L.U.
+ * Licensed under the Openbravo Commercial License version 1.0
+ * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
+ * or in the legal folder of this module distribution.
+ ************************************************************************************
+ */
+
package org.openbravo.retail.posterminal;
public class POSConstants {
public static final String MODULE_ID = "FF808181326CC34901326D53DBCF0018";
public static final String APP_NAME = "WebPOS";
-
+ public static final String CROSS_CHANNEL = "cross_channel";
}
diff -r f4b4be1332ed src/org/openbravo/retail/posterminal/actionHandler/ChooseWarehouseActionHandler.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/retail/posterminal/actionHandler/ChooseWarehouseActionHandler.java Thu May 28 17:33:20 2015 +0200
@@ -0,0 +1,108 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2015 Openbravo S.L.U.
+ * Licensed under the Openbravo Commercial License version 1.0
+ * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
+ * or in the legal folder of this module distribution.
+ ************************************************************************************
+ */
+package org.openbravo.retail.posterminal.actionHandler;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+import org.hibernate.criterion.Restrictions;
+import org.openbravo.base.provider.OBProvider;
+import org.openbravo.client.kernel.BaseActionHandler;
+import org.openbravo.dal.service.OBCriteria;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.common.enterprise.OrgWarehouse;
+import org.openbravo.model.common.enterprise.Organization;
+import org.openbravo.model.common.enterprise.Warehouse;
+import org.openbravo.retail.posterminal.POSConstants;
+
+public class ChooseWarehouseActionHandler extends BaseActionHandler {
+
+ @Override
+ protected JSONObject execute(Map parameters, String content) {
+ JSONObject JSONObject = null;
+ JSONObject result = new JSONObject();
+ JSONArray actions = new JSONArray();
+ JSONObject msg = new JSONObject();
+ JSONObject showMsgInView = new JSONObject();
+ JSONObject refreshAction = new JSONObject();
+ JSONObject selectedObject = new JSONObject();
+ JSONObject selectedTed = new JSONObject();
+ ArrayList selectedWarehouseList = new ArrayList();
+ try {
+ // Create refresh action
+ refreshAction.put("refreshGrid", new JSONObject());
+ actions.put(refreshAction);
+
+ selectedObject = new JSONObject(content);
+ Organization organization = OBDal.getInstance().get(Organization.class,
+ selectedObject.getString("AD_Org_ID"));
+ JSONArray selectArray = selectedObject.getJSONObject("_params").getJSONObject("select_CC")
+ .getJSONArray("_selection");
+
+ for (int i = 0; i < selectArray.length(); i++) {
+ selectedTed = selectArray.getJSONObject(i);
+ selectedWarehouseList.add(selectedTed.getString("id"));
+ }
+ OBCriteria orgWarehouseCrit = OBDal.getInstance().createCriteria(
+ OrgWarehouse.class);
+ orgWarehouseCrit.add(Restrictions.eq(OrgWarehouse.PROPERTY_ORGANIZATION, organization));
+ orgWarehouseCrit.add(Restrictions.eq(OrgWarehouse.PROPERTY_WAREHOUSETYPE,
+ POSConstants.CROSS_CHANNEL));
+
+ List currentOrgWarehouseList = orgWarehouseCrit.list();
+ boolean isInTheList = false;
+ for (OrgWarehouse warehouse : currentOrgWarehouseList) {
+ isInTheList = false;
+ for (String warehouseSelected : selectedWarehouseList) {
+ if (warehouse.getWarehouse().getId().equals(warehouseSelected)) {
+ isInTheList = true;
+ }
+ }
+ if (!isInTheList) {
+ OBDal.getInstance().remove(warehouse);
+ }
+ }
+
+ for (String warehouseSelected : selectedWarehouseList) {
+ isInTheList = false;
+ for (OrgWarehouse warehouse : currentOrgWarehouseList) {
+ if (warehouse.getWarehouse().getId().equals(warehouseSelected)) {
+ isInTheList = true;
+ }
+ }
+ if (!isInTheList) {
+ createWarehouseEntry(warehouseSelected, organization);
+ }
+ }
+
+ OBDal.getInstance().getConnection().commit();
+ result.put("responseActions", actions);
+ } catch (Exception e) {
+ try {
+ result.put("responseActions", actions);
+ return result;
+ } catch (JSONException e1) {
+ // won't happen
+ }
+ }
+ return result;
+ }
+
+ private void createWarehouseEntry(String warehouseSelected, Organization organization) {
+ OrgWarehouse orgWarehouse = OBProvider.getInstance().get(OrgWarehouse.class);
+ orgWarehouse.setOrganization(organization);
+ orgWarehouse.setWarehouseType(POSConstants.CROSS_CHANNEL);
+ orgWarehouse.setWarehouse(OBDal.getInstance().get(Warehouse.class, warehouseSelected));
+ OBDal.getInstance().save(orgWarehouse);
+ }
+}
\ No newline at end of file
diff -r f4b4be1332ed src/org/openbravo/retail/posterminal/datasource/CCSelectWarehouseQueryTransformer.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/retail/posterminal/datasource/CCSelectWarehouseQueryTransformer.java Thu May 28 17:33:20 2015 +0200
@@ -0,0 +1,50 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2015 Openbravo S.L.U.
+ * Licensed under the Openbravo Commercial License version 1.0
+ * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
+ * or in the legal folder of this module distribution.
+ ************************************************************************************
+ */
+package org.openbravo.retail.posterminal.datasource;
+
+import java.util.Map;
+
+import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.client.kernel.ComponentProvider;
+import org.openbravo.client.kernel.RequestContext;
+import org.openbravo.service.datasource.hql.HqlQueryTransformer;
+
+@ComponentProvider.Qualifier("28BE992AF4EF44728E1C7E72377B3785")
+public class CCSelectWarehouseQueryTransformer extends HqlQueryTransformer {
+
+ /**
+ * Returns the transformed hql query
+ *
+ * @param hqlQuery
+ * original hql query
+ * @param requestParameters
+ * the parameters of the request
+ * @param queryNamedParameters
+ * the named parameters of the hql query that will be used to fetch the table data. If
+ * the transformed hql query uses named parameters that did not exist in the original hql
+ * query, the named parameters must be added to this map
+ * @return the transformed hql query
+ */
+ public String transformHqlQuery(String hqlQuery, Map requestParameters,
+ Map queryNamedParameters) {
+ VariablesSecureApp vars = RequestContext.get().getVariablesSecureApp();
+ String organizationId = vars.getStringParameter("@Organization.id@");
+ hqlQuery = hqlQuery
+ .replaceAll(
+ "where e.client",
+ "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", "e.locationAddress");
+ hqlQuery = hqlQuery.replaceAll("join_1", "e.locationAddress.region");
+ hqlQuery = hqlQuery.replaceAll("join_2", "e.locationAddress.country");
+ hqlQuery = hqlQuery.replaceAll("AND e.organization in \\(.*?\\)", "");
+ return hqlQuery;
+ }
+}
diff -r f4b4be1332ed src/org/openbravo/retail/posterminal/datasource/CCWarehouseQueryTransformer.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/retail/posterminal/datasource/CCWarehouseQueryTransformer.java Thu May 28 17:33:20 2015 +0200
@@ -0,0 +1,49 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2015 Openbravo S.L.U.
+ * Licensed under the Openbravo Commercial License version 1.0
+ * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
+ * or in the legal folder of this module distribution.
+ ************************************************************************************
+ */
+package org.openbravo.retail.posterminal.datasource;
+
+import java.util.Map;
+
+import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.client.kernel.ComponentProvider;
+import org.openbravo.client.kernel.RequestContext;
+import org.openbravo.service.datasource.hql.HqlQueryTransformer;
+
+@ComponentProvider.Qualifier("BD2096E0DEEB431C8E704143DA4DA6CF")
+public class CCWarehouseQueryTransformer extends HqlQueryTransformer {
+
+ /**
+ * Returns the transformed hql query
+ *
+ * @param hqlQuery
+ * original hql query
+ * @param requestParameters
+ * the parameters of the request
+ * @param queryNamedParameters
+ * the named parameters of the hql query that will be used to fetch the table data. If
+ * the transformed hql query uses named parameters that did not exist in the original hql
+ * query, the named parameters must be added to this map
+ * @return the transformed hql query
+ */
+ public String transformHqlQuery(String hqlQuery, Map requestParameters,
+ Map queryNamedParameters) {
+ VariablesSecureApp vars = RequestContext.get().getVariablesSecureApp();
+ String[] hqlStringArray = hqlQuery.split("ORDER BY");
+ if (hqlStringArray.length > 1) {
+ hqlQuery = hqlStringArray[0].concat(" and e.organization.id = '"
+ + vars.getStringParameter("@Organization.id@") + "'")
+ + " ORDER BY " + hqlStringArray[1];
+ } else {
+ hqlQuery = hqlQuery.concat(" and e.organization.id = '"
+ + vars.getStringParameter("@Organization.id@") + "'");
+ }
+ return hqlQuery.replace("@Organization.id@", "'" + vars.getStringParameter("@Organization.id@")
+ + "'");
+ }
+}
diff -r f4b4be1332ed src/org/openbravo/retail/posterminal/stock/OtherStoresDetailedStock.java
--- a/src/org/openbravo/retail/posterminal/stock/OtherStoresDetailedStock.java Thu May 28 13:24:12 2015 +0200
+++ b/src/org/openbravo/retail/posterminal/stock/OtherStoresDetailedStock.java Thu May 28 17:33:20 2015 +0200
@@ -16,12 +16,14 @@
import org.openbravo.base.exception.OBException;
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.common.enterprise.Organization;
import org.openbravo.retail.posterminal.JSONProcessSimple;
+import org.openbravo.retail.posterminal.POSConstants;
public class OtherStoresDetailedStock extends JSONProcessSimple {
@Override
public JSONObject exec(JSONObject jsonData) throws JSONException, ServletException {
- String orgId, prodId;
+ String orgId, prodId, hqlQuery;
OBContext.setAdminMode(true);
JSONArray responseArray = new JSONArray();
BigDecimal totalQtyCounter = BigDecimal.ZERO;
@@ -31,25 +33,28 @@
orgId = jsonData.getString("organization");
prodId = jsonData.getString("product");
- String hqlQuery = "select ow.organization.id, ow.organization.name, ow.warehouse.id, ow.warehouse.name, sum(ms.quantityOnHand) as qtyonhand "
- + "from OrganizationWarehouse as ow, MaterialMgmtStorageDetail as ms "
- + "where ow.organization.id <> ' "
- + orgId
- + "' and "
- + "ow.warehouse.id = ms.storageBin.warehouse.id and "
- + "ms.storageBin.warehouse in ( "
- + "select oww.warehouse.id from OrganizationWarehouse as oww where oww.organization.id <> '"
- + orgId
- + "' "
- + ") and ms.storageBin.warehouse not in ( "
- + "select owww.warehouse.id from OrganizationWarehouse as owww where owww.organization.id = '"
- + orgId
- + "') "
+ Organization organization = OBDal.getInstance().get(Organization.class, orgId);
+ String hqlQueryGetWarehouseList;
+ if ("N".equals(organization.getObposIncludedCCWarehouses())) {
+ hqlQueryGetWarehouseList = "exists (SELECT 1 " + "FROM OrganizationWarehouse as ow "
+ + "WHERE " + "ow.organization.id = '" + orgId + "' and ow.warehouseType = '"
+ + POSConstants.CROSS_CHANNEL + "' "
+ + "AND ms.storageBin.warehouse.id= ow.warehouse.id ) ";
+ } else {
+ hqlQueryGetWarehouseList = "not exists (SELECT 1 FROM OrganizationWarehouse as ow WHERE ow.organization.id = '"
+ + orgId + "' AND ow.warehouse.id = ms.storageBin.warehouse.id) ";
+ }
+
+ hqlQuery = "select ms.storageBin.warehouse.id, ms.storageBin.warehouse.name, ms.storageBin.id, ms.storageBin.searchKey, "
+ + "sum(ms.quantityOnHand - ms.reservedQty) as qtyonhand "
+ + "from MaterialMgmtStorageDetail ms "
+ + "where "
+ + hqlQueryGetWarehouseList
+ "and ms.product.id = '"
+ prodId
+ "' "
- + "group by ow.organization.id, ow.organization.name, ow.warehouse.id, ow.warehouse.name "
- + "order by ow.organization.id ";
+ + "group by ms.storageBin.warehouse.id, ms.storageBin.warehouse.name, ms.storageBin.warehouse.id, ms.storageBin.id, ms.storageBin.searchKey "
+ + "order by ms.storageBin.warehouse.name";
final Session session = OBDal.getInstance().getSession();
final Query query = session.createQuery(hqlQuery);
diff -r f4b4be1332ed src/org/openbravo/retail/posterminal/stock/StoreDetailedStock.java
--- a/src/org/openbravo/retail/posterminal/stock/StoreDetailedStock.java Thu May 28 13:24:12 2015 +0200
+++ b/src/org/openbravo/retail/posterminal/stock/StoreDetailedStock.java Thu May 28 17:33:20 2015 +0200
@@ -15,6 +15,7 @@
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBDal;
import org.openbravo.retail.posterminal.JSONProcessSimple;
+import org.openbravo.retail.posterminal.POSConstants;
public class StoreDetailedStock extends JSONProcessSimple {
@Override
@@ -36,7 +37,9 @@
+ "WHERE "
+ "ow.organization.id = '"
+ orgId
- + "') "
+ + "' and ow.warehouseType <> '"
+ + POSConstants.CROSS_CHANNEL
+ + "' ) "
+ "and ms.product.id = '"
+ prodId
+ "'"
diff -r f4b4be1332ed web/org.openbravo.retail.posterminal/js/pointofsale/view/ps-productdetailsview.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/ps-productdetailsview.js Thu May 28 13:24:12 2015 +0200
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/ps-productdetailsview.js Thu May 28 17:33:20 2015 +0200
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2013 Openbravo S.L.U.
+ * Copyright (C) 2013-2015 Openbravo S.L.U.
* Licensed under the Openbravo Commercial License version 1.0
* You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
* or in the legal folder of this module distribution.
@@ -39,7 +39,29 @@
classes: 'btnlink-green',
style: 'min-width: 200px; margin: 2px 5px 2px 5px;',
tap: function () {
- this.doOpenOtherStoresStockModal();
+ var me = this;
+ if (OB.MobileApp.model.hasPermission('OBPOS_highVolume.product', true)) {
+ var serverCallStoreDetailedStock = new OB.DS.Process('org.openbravo.retail.posterminal.stock.OtherStoresDetailedStock'),
+ leftSubWindow = this.parent.leftSubWindow;
+ leftSubWindow.bodyComponent.$.stockOthers.setContent(OB.I18N.getLabel('OBPOS_loadingStock'));
+ serverCallStoreDetailedStock.exec({
+ organization: OB.MobileApp.model.get('terminal').organization,
+ product: leftSubWindow.product.get('id')
+ }, function (data) {
+ if (data && data.exception) {
+ leftSubWindow.bodyComponent.$.stockOthers.setContent(OB.I18N.getLabel('OBPOS_stockCannotBeRetrieved'));
+ leftSubWindow.bodyComponent.$.stockOthers.addClass('error');
+ } else if (data.product === leftSubWindow.product.get('id') && leftSubWindow.showing && (data.qty || data.qty === 0)) {
+ data.product = leftSubWindow.product;
+ leftSubWindow.otherStoresStockModel = new OB.OBPOSPointOfSale.UsedModels.OtherStoresWarehousesStock(data);
+ me.doOpenOtherStoresStockModal();
+ leftSubWindow.bodyComponent.$.stockOthers.removeClass('error');
+ leftSubWindow.bodyComponent.$.stockOthers.setContent(OB.I18N.getLabel('OBPOS_otherStoresStock') + data.qty);
+ }
+ });
+ } else {
+ this.doOpenOtherStoresStockModal();
+ }
}
});
@@ -79,7 +101,7 @@
enyo.kind({
name: 'OB.OBPOSPointOfSale.UI.ProductDetailsView_ButtonClose',
style: 'float: right; cursor: pointer; font-size: 150%; font-weight: bold; color: #CCCCCC; width: 40px; height: 40px; margin: -10px; text-align: right; padding: 8px;',
- content: '×',
+ content: '??',
tap: function () {
this.leftSubWindow.doCloseLeftSubWindow();
}
@@ -219,7 +241,7 @@
}, function (data) {
if (data && data.exception) {
me.bodyComponent.$.stockHere.setContent(OB.I18N.getLabel('OBPOS_stockCannotBeRetrieved'));
- me.bodyComponent.$.stockHere.addClass("error");
+ me.bodyComponent.$.stockHere.addClass('error');
} else if (data.product === me.product.get('id') && me.showing) {
if (data.qty || data.qty === 0) {
data.product = me.product;
@@ -231,7 +253,7 @@
me.loadDefaultWarehouseData(me.localStockModel.getWarehouseById(me.warehouse.id));
}
}
- me.bodyComponent.$.stockHere.removeClass("error");
+ me.bodyComponent.$.stockHere.removeClass('error');
me.bodyComponent.$.stockHere.setContent(OB.I18N.getLabel('OBPOS_storeStock') + data.qty);
}
}
@@ -240,23 +262,25 @@
getOtherStock: function () {
var serverCallStoreDetailedStock = new OB.DS.Process('org.openbravo.retail.posterminal.stock.OtherStoresDetailedStock'),
me = this;
- this.bodyComponent.$.stockOthers.setContent(OB.I18N.getLabel('OBPOS_loadingStock'));
- serverCallStoreDetailedStock.exec({
- organization: OB.MobileApp.model.get('terminal').organization,
- product: this.product.get('id')
- }, function (data) {
- if (data && data.exception) {
- me.bodyComponent.$.stockOthers.setContent(OB.I18N.getLabel('OBPOS_stockCannotBeRetrieved'));
- me.bodyComponent.$.stockOthers.addClass("error");
- } else if (data.product === me.product.get('id') && me.showing) {
- if (data.qty || data.qty === 0) {
+ if (OB.MobileApp.model.hasPermission('OBPOS_highVolume.product', true)) {
+ this.bodyComponent.$.stockOthers.setContent(OB.I18N.getLabel('OBPOS_otherStoresStock_NotCalculated'));
+ } else {
+ this.bodyComponent.$.stockOthers.setContent(OB.I18N.getLabel('OBPOS_loadingStock'));
+ serverCallStoreDetailedStock.exec({
+ organization: OB.MobileApp.model.get('terminal').organization,
+ product: this.product.get('id')
+ }, function (data) {
+ if (data && data.exception) {
+ me.bodyComponent.$.stockOthers.setContent(OB.I18N.getLabel('OBPOS_stockCannotBeRetrieved'));
+ me.bodyComponent.$.stockOthers.addClass('error');
+ } else if (data.product === me.product.get('id') && me.showing && (data.qty || data.qty === 0)) {
data.product = me.product;
me.otherStoresStockModel = new OB.OBPOSPointOfSale.UsedModels.OtherStoresWarehousesStock(data);
- me.bodyComponent.$.stockOthers.removeClass("error");
+ me.bodyComponent.$.stockOthers.removeClass('error');
me.bodyComponent.$.stockOthers.setContent(OB.I18N.getLabel('OBPOS_otherStoresStock') + data.qty);
}
- }
- });
+ });
+ }
},
beforeSetShowing: function (params) {
if (!params.product || OB.MobileApp.model.get('warehouses').length === 0) {