diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -8706,6 +8706,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_PREFERENCE.xml b/src-db/database/sourcedata/AD_PREFERENCE.xml
--- a/src-db/database/sourcedata/AD_PREFERENCE.xml
+++ b/src-db/database/sourcedata/AD_PREFERENCE.xml
@@ -363,6 +363,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_REF_LIST.xml b/src-db/database/sourcedata/AD_REF_LIST.xml
--- a/src-db/database/sourcedata/AD_REF_LIST.xml
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml
@@ -1696,6 +1696,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/org/openbravo/retail/posterminal/master/Product.java b/src/org/openbravo/retail/posterminal/master/Product.java
--- a/src/org/openbravo/retail/posterminal/master/Product.java
+++ b/src/org/openbravo/retail/posterminal/master/Product.java
@@ -191,6 +191,13 @@
@Override
protected List getQuery(JSONObject jsonsent) throws JSONException {
+
+ return prepareQuery(jsonsent);
+
+ }
+
+ protected List prepareQuery(JSONObject jsonsent) throws JSONException {
+
String orgId = OBContext.getOBContext().getCurrentOrganization().getId();
final OBRETCOProductList productList = POSUtils.getProductListByOrgId(orgId);
@@ -248,6 +255,19 @@
} finally {
OBContext.restorePreviousMode();
}
+ boolean allowNoPriceInMainPriceList = false;
+ try {
+ OBContext.setAdminMode(false);
+ allowNoPriceInMainPriceList = "Y".equals(Preferences.getPreferenceValue(
+ "OBPOS_allowProductsNoPriceInMainPricelist", true, OBContext.getOBContext()
+ .getCurrentClient(), OBContext.getOBContext().getCurrentOrganization(), OBContext
+ .getOBContext().getUser(), OBContext.getOBContext().getRole(), null));
+ } catch (PropertyException e) {
+ log.error(
+ "Error getting preference OBPOS_allowProductsNoPriceInMainPricelist " + e.getMessage(), e);
+ } finally {
+ OBContext.restorePreviousMode();
+ }
Map args = new HashMap();
args.put("posPrecision", posPrecision);
try {
@@ -277,22 +297,10 @@
&& !jsonsent.get("lastUpdated").equals("null") ? jsonsent.getLong("lastUpdated") : null;
// regular products
- String hql = "select" + regularProductsHQLProperties.getHqlSelect()
- + "FROM OBRETCO_Prol_Product as pli ";
- if (!useGetForProductImages) {
- hql += "left outer join pli.product.image img ";
- }
- hql += "inner join pli.product as product, PricingProductPrice ppp ";
- if (isRemote && isMultipricelist && jsonsent.has("remoteParams")) {
- hql += ", PricingProductPrice pp WHERE pp.product=pli.product and pp.priceListVersion.id= :multipriceListVersionId ";
- } else {
- hql += " WHERE 1=1";
- }
+ String hql = "select" + regularProductsHQLProperties.getHqlSelect();
- hql += " AND $filtersCriteria AND $hqlCriteria AND (pli.obretcoProductlist.id = :productListId) "
- + "AND (ppp.priceListVersion.id= :priceListVersionId ) "
- + " AND ("
- + "pli.product.id = ppp.product.id" + ") ";
+ hql += getRegularProductHql(isRemote, isMultipricelist, jsonsent, useGetForProductImages,
+ allowNoPriceInMainPriceList);
if (lastUpdated != null) {
hql += "AND ((pli.product.$incrementalUpdateCriteria) OR (pli.$incrementalUpdateCriteria) OR (ppp.$incrementalUpdateCriteria) OR (product.uOM.$incrementalUpdateCriteria))";
@@ -369,6 +377,45 @@
return products;
}
+ protected String getRegularProductHql(boolean isRemote, boolean isMultipricelist,
+ JSONObject jsonsent, boolean useGetForProductImages) {
+ return getRegularProductHql(isRemote, isMultipricelist, jsonsent, useGetForProductImages, false);
+ }
+
+ protected String getRegularProductHql(boolean isRemote, boolean isMultipricelist,
+ JSONObject jsonsent, boolean useGetForProductImages, boolean allowNoPriceInMainPriceList) {
+
+ String hql = "FROM OBRETCO_Prol_Product as pli ";
+ if (!useGetForProductImages) {
+ hql += "left outer join pli.product.image img ";
+ }
+ hql += "inner join pli.product as product ";
+ if (isMultipricelist && allowNoPriceInMainPriceList
+ && (!isRemote || jsonsent.has("remoteParams"))) {
+ hql += "left outer join product.pricingProductPriceList ppp with (ppp.priceListVersion.id = :priceListVersionId) ";
+ } else {
+ hql += "inner join product.pricingProductPriceList ppp ";
+ }
+
+ if (isRemote && isMultipricelist && jsonsent.has("remoteParams")) {
+ hql += ", PricingProductPrice pp WHERE pp.product=pli.product and pp.priceListVersion.id= :multipriceListVersionId ";
+ } else {
+ hql += " WHERE 1=1";
+ }
+
+ hql += " AND $filtersCriteria AND $hqlCriteria ";
+ if (isMultipricelist && allowNoPriceInMainPriceList
+ && (!isRemote || jsonsent.has("remoteParams"))) {
+ hql += "AND (pli.obretcoProductlist.id = :productListId) ";
+ } else {
+ hql += "AND (pli.obretcoProductlist.id = :productListId) ";
+ hql += "AND (ppp.priceListVersion.id= :priceListVersionId) ";
+
+ }
+
+ return hql;
+ }
+
@Override
protected boolean bypassPreferenceCheck() {
return true;
diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -1938,11 +1938,18 @@
modelsAffectedByCache: ['ProductPrice']
});
} else {
- me.addProductToOrder(p, qty, options, attrs, function (success, orderline) {
- if (callback) {
- callback(success, orderline);
- }
- });
+ // With the preference OBPOS_allowProductsNoPriceInMainPricelist
+ // it is possible to add product without price in the terminal's main list
+ if (OB.UTIL.isNullOrUndefined(p.get('listPrice')) && !p.get('ispack')) {
+ OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_productWithoutPriceInPriceList', [p.get('_identifier')]));
+ callback(false, null);
+ } else {
+ me.addProductToOrder(p, qty, options, attrs, function (success, orderline) {
+ if (callback) {
+ callback(success, orderline);
+ }
+ });
+ }
}
},
@@ -2702,6 +2709,11 @@
addProductsOfLines(receipt, lines, index, callback, promotionLines);
}
});
+ }, null, function () {
+ // Product doesn't exists, execute the same code as it was not included in pricelist
+ promotionLines.splice(index, 1);
+ lines.splice(index, 1);
+ addProductsOfLines(receipt, lines, index, callback, promotionLines);
});
};
_.each(me.get('lines').models, function (line) {