diff --git a/src-db/database/model/tables/OBPOS_ERRORS_LINE.xml b/src-db/database/model/tables/OBPOS_ERRORS_LINE.xml
new file mode 100644
--- /dev/null
+++ b/src-db/database/model/tables/OBPOS_ERRORS_LINE.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -230,6 +230,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1257,6 +1295,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2403,6 +2479,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2583,7 +2695,7 @@
-
+
@@ -4361,6 +4473,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -8392,6 +8543,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -10038,6 +10227,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -12650,6 +12875,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -12920,6 +13184,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -13575,6 +13880,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -14803,6 +15147,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml
@@ -2121,6 +2121,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
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
@@ -5933,6 +5933,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_TABLE.xml b/src-db/database/sourcedata/AD_TABLE.xml
--- a/src-db/database/sourcedata/AD_TABLE.xml
+++ b/src-db/database/sourcedata/AD_TABLE.xml
@@ -327,6 +327,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/org/openbravo/retail/posterminal/ClearErrorActionHandler.java b/src/org/openbravo/retail/posterminal/ClearErrorActionHandler.java
--- a/src/org/openbravo/retail/posterminal/ClearErrorActionHandler.java
+++ b/src/org/openbravo/retail/posterminal/ClearErrorActionHandler.java
@@ -15,6 +15,7 @@
import org.codehaus.jettison.json.JSONObject;
import org.openbravo.client.kernel.BaseActionHandler;
import org.openbravo.client.kernel.RequestContext;
+import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBDal;
import org.openbravo.erpCommon.utility.Utility;
import org.openbravo.service.db.DalConnectionProvider;
@@ -24,21 +25,23 @@
@Override
protected JSONObject execute(Map parameters, String content) {
JSONArray errorIds = null;
+ JSONObject result = new JSONObject();
try {
+ OBContext.setAdminMode(true);
+
errorIds = new JSONArray(content);
for (int i = 0; i < errorIds.length(); i++) {
String errorId = errorIds.getString(i);
OBPOSErrors error = OBDal.getInstance().get(OBPOSErrors.class, errorId);
OBDal.getInstance().remove(error);
}
- JSONObject result = new JSONObject();
+ OBDal.getInstance().flush();
result.put(
"message",
Utility.messageBD(new DalConnectionProvider(false), "Success", RequestContext.get()
.getVariablesSecureApp().getLanguage()));
return result;
- } catch (Exception e) {
- JSONObject result = new JSONObject();
+ } catch (final Exception e) {
try {
result.put(
"message",
@@ -47,8 +50,10 @@
} catch (JSONException e1) {
// won't happen
}
- return result;
+ } finally {
+ OBContext.restorePreviousMode();
}
+ return result;
}
}
diff --git a/src/org/openbravo/retail/posterminal/POSDataSynchronizationErrorHandler.java b/src/org/openbravo/retail/posterminal/POSDataSynchronizationErrorHandler.java
--- a/src/org/openbravo/retail/posterminal/POSDataSynchronizationErrorHandler.java
+++ b/src/org/openbravo/retail/posterminal/POSDataSynchronizationErrorHandler.java
@@ -8,9 +8,12 @@
*/
package org.openbravo.retail.posterminal;
+import java.util.HashSet;
+
import javax.enterprise.context.ApplicationScoped;
import org.apache.log4j.Logger;
+import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
import org.openbravo.base.model.Entity;
@@ -19,6 +22,7 @@
import org.openbravo.dal.service.OBDal;
import org.openbravo.mobile.core.process.DataSynchronizationErrorHandler;
import org.openbravo.mobile.core.process.DataSynchronizationProcess;
+import org.openbravo.model.common.order.OrderLine;
@ApplicationScoped
@Qualifier(POSConstants.APP_NAME)
@@ -47,6 +51,7 @@
// and a new one will be created
try {
errorEntry = OBDal.getInstance().get(OBPOSErrors.class, jsonRecord.getString("posErrorId"));
+ errorEntry.getOBPOSErrorsLineList().clear();
} catch (JSONException e1) {
// won't happen
}
@@ -61,6 +66,31 @@
errorEntry
.setObposApplications(OBDal.getInstance().get(OBPOSApplications.class, posTerminalId));
OBDal.getInstance().save(errorEntry);
+
+ // save order_id, order_id from verified return in error line
+ HashSet orderIdList = new HashSet();
+ orderIdList.add(jsonRecord.optString("id", null));
+
+ JSONArray orderlines = jsonRecord.optJSONArray("lines");
+ if (orderlines != null) {
+ for (int i = 0; i < orderlines.length(); i++) {
+ JSONObject jsonOrderLine = orderlines.optJSONObject(i);
+ if (jsonOrderLine != null && jsonOrderLine.has("originalOrderLineId")) {
+ OrderLine orderLine = OBDal.getInstance().get(OrderLine.class,
+ jsonOrderLine.optString("originalOrderLineId"));
+ orderIdList.add(orderLine.getSalesOrder().getId());
+ }
+ }
+ }
+ orderIdList.remove(null);
+
+ for (String orderId : orderIdList) {
+ OBPOSErrorsLine errorLineEntry = OBProvider.getInstance().get(OBPOSErrorsLine.class);
+ errorLineEntry.setObposErrors(errorEntry);
+ errorLineEntry.setRecordID(orderId);
+ OBDal.getInstance().save(errorLineEntry);
+ }
+
OBDal.getInstance().flush();
log.error("Error while loading order", t);
diff --git a/src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java b/src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java
--- a/src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java
+++ b/src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java
@@ -56,6 +56,8 @@
add(new HQLProperty("ordLine.product.productType", "productType"));
add(new HQLProperty("ordLine.product.returnable", "returnable"));
add(new HQLProperty("ordLine.returnReason.id", "returnReason"));
+ add(new HQLProperty("ordLine.goodsShipmentLine.id", "goodsShipmentLine"));
+ add(new HQLProperty("ordLine.salesOrder.id", "orderId"));
}
};
diff --git a/src/org/openbravo/retail/posterminal/PaidReceipts.java b/src/org/openbravo/retail/posterminal/PaidReceipts.java
--- a/src/org/openbravo/retail/posterminal/PaidReceipts.java
+++ b/src/org/openbravo/retail/posterminal/PaidReceipts.java
@@ -12,8 +12,10 @@
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
+import java.util.List;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Instance;
@@ -73,6 +75,7 @@
OBContext.setAdminMode(true);
try {
JSONArray respArray = new JSONArray();
+ List orderIds = new ArrayList();
final DateFormat parseDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
@@ -94,6 +97,10 @@
for (int receipt = 0; receipt < paidReceipts.length(); receipt++) {
JSONObject paidReceipt = paidReceipts.getJSONObject(receipt);
+ if (orderIds.indexOf(orderid) == -1) {
+ orderIds.add(orderid);
+ }
+
paidReceipt.put("orderid", orderid);
// get the Invoice for the Order
@@ -121,7 +128,9 @@
for (int receiptLine = 0; receiptLine < paidReceiptsLines.length(); receiptLine++) {
JSONObject paidReceiptLine = paidReceiptsLines.getJSONObject(receiptLine);
-
+ if (orderIds.indexOf((String) paidReceiptLine.get("orderId")) == -1) {
+ orderIds.add((String) paidReceiptLine.get("orderId"));
+ }
paidReceiptLine.put("priceIncludesTax", paidReceipt.getBoolean("priceIncludesTax"));
// get shipmentLines for returns
@@ -138,6 +147,21 @@
paidReceiptLine.put("shipmentlines",
hqlPropertiesShipLines.getJSONArray(paidReceiptsShipLinesQuery));
+ if (paidReceiptLine.has("goodsShipmentLine")
+ && !paidReceiptLine.getString("goodsShipmentLine").equals("null")) {
+ String hqlShipLines = "select ordLine.goodsShipmentLine.salesOrderLine.salesOrder.documentNo, ordLine.goodsShipmentLine.salesOrderLine.id "
+ + "from OrderLine as ordLine where ordLine.id = ? ";
+ OBDal.getInstance().getSession().createQuery(hqlShipLines);
+ Query shipLines = OBDal.getInstance().getSession().createQuery(hqlShipLines);
+ shipLines.setString(0, paidReceiptLine.getString("lineId"));
+
+ for (Object obj : shipLines.list()) {
+ Object[] line = (Object[]) obj;
+ paidReceiptLine.put("originalDocumentNo", line[0]);
+ paidReceiptLine.put("originalOrderLineId", line[1]);
+ }
+ }
+
// promotions per line
OBCriteria qPromotions = OBDal.getInstance().createCriteria(
OrderLineOffer.class);
@@ -197,6 +221,9 @@
JSONObject jsonObject = relatedLines.getJSONObject(r);
if (!jsonObject.getString("orderId").equals(orderid)) {
jsonObject.put("otherTicket", "true");
+ if (orderIds.indexOf((String) jsonObject.getString("orderId")) == -1) {
+ orderIds.add((String) jsonObject.getString("orderId"));
+ }
}
String hqlRelatedLinePromotions = "select olo.totalAmount from OrderLineOffer olo where olo.salesOrderLine.id = ?";
Query relatedLinePromotionsQuery = OBDal.getInstance().getSession()
@@ -408,6 +435,8 @@
paidReceipt.put("receiptTaxes", jsonListTaxes);
+ paidReceipt.put("recordInImportEntry", checkOrderInErrorEntry(orderIds));
+
respArray.put(paidReceipt);
result.put(JsonConstants.RESPONSE_DATA, respArray);
@@ -420,9 +449,56 @@
return result;
}
+ private boolean checkOrderInErrorEntry(List orderIds) {
+ boolean hasRecord = false;
+ final String COMMA = ",";
+ StringBuilder idsBuilder = new StringBuilder();
+ final String OR = "OR";
+ StringBuilder orBuilder = new StringBuilder();
+ try {
+ for (String id : orderIds) {
+ idsBuilder.append(id);
+ idsBuilder.append(COMMA);
+
+ orBuilder.append(" imp.jsonInfo like '%" + id + "%' ");
+ orBuilder.append(OR);
+ }
+ String ids = idsBuilder.toString();
+ // Remove last comma
+ ids = ids.substring(0, ids.length() - COMMA.length());
+
+ String orIds = orBuilder.toString();
+ // Remove last OR
+ orIds = orIds.substring(0, orIds.length() - OR.length());
+
+ // OBPOS Errors
+ String hqlError = "select line.id from OBPOS_Errors_Line line inner join line.obposErrors error "
+ + "where error.client.id = ? and line.recordID in (?) and error.typeofdata = 'Order' and error.orderstatus = 'N' ";
+ Query errorQuery = OBDal.getInstance().getSession().createQuery(hqlError);
+ errorQuery.setString(0, OBContext.getOBContext().getCurrentClient().getId());
+ errorQuery.setString(1, ids);
+ if (errorQuery.list().size() > 0) {
+ return true;
+ }
+
+ String hqlError2 = "select imp.id from C_IMPORT_ENTRY imp "
+ + "where imp.client.id = ? and imp.typeofdata = 'Order' and imp.importStatus = 'Error' "
+ + "and (" + orIds + ")";
+ Query errorQuery2 = OBDal.getInstance().getSession().createQuery(hqlError2);
+ errorQuery2.setString(0, OBContext.getOBContext().getCurrentClient().getId());
+ if (errorQuery2.list().size() > 0) {
+ return true;
+ }
+
+ } catch (final Exception e) {
+ log.error("Error while checking order in ErrorEntry", e);
+ }
+ return hasRecord;
+ }
+
@Override
protected boolean bypassPreferenceCheck() {
return true;
}
-}
\ No newline at end of file
+}
diff --git a/web/org.openbravo.retail.posterminal/js/components/modalpaidreceipts.js b/web/org.openbravo.retail.posterminal/js/components/modalpaidreceipts.js
--- a/web/org.openbravo.retail.posterminal/js/components/modalpaidreceipts.js
+++ b/web/org.openbravo.retail.posterminal/js/components/modalpaidreceipts.js
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2014-2016 Openbravo S.L.U.
+ * Copyright (C) 2014-2017 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.
@@ -380,29 +380,34 @@
process.exec({
orderid: model.get('id')
}, function (data) {
- if (data) {
+ if (data && data[0]) {
if (me.model.get('leftColumnViewManager').isMultiOrder()) {
if (me.model.get('multiorders')) {
me.model.get('multiorders').resetValues();
}
me.model.get('leftColumnViewManager').setOrderMode();
}
- OB.UTIL.HookManager.executeHooks('OBRETUR_ReturnFromOrig', {
- order: data[0],
- context: me,
- params: me.parent.parent.params
- }, function (args) {
- if (!args.cancelOperation) {
- var synchId = OB.UTIL.SynchronizationHelper.busyUntilFinishes('clickSearchNewReceipt');
- me.model.get('orderList').newPaidReceipt(data[0], function (order) {
- me.doChangePaidReceipt({
- newPaidReceipt: order
+ if (data[0].recordInImportEntry) {
+ OB.UTIL.showLoading(false);
+ OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBMOBC_Error'), OB.I18N.getLabel('OBPOS_ReceiptNotSynced', [data[0].documentNo]));
+ } else {
+ OB.UTIL.HookManager.executeHooks('OBRETUR_ReturnFromOrig', {
+ order: data[0],
+ context: me,
+ params: me.parent.parent.params
+ }, function (args) {
+ if (!args.cancelOperation) {
+ var synchId = OB.UTIL.SynchronizationHelper.busyUntilFinishes('clickSearchNewReceipt');
+ me.model.get('orderList').newPaidReceipt(data[0], function (order) {
+ me.doChangePaidReceipt({
+ newPaidReceipt: order
+ });
+ OB.UTIL.SynchronizationHelper.finished(synchId, 'clickSearchNewReceipt');
+
});
- OB.UTIL.SynchronizationHelper.finished(synchId, 'clickSearchNewReceipt');
-
- });
- }
- });
+ }
+ });
+ }
} else {
OB.UTIL.showError(OB.I18N.getLabel('OBPOS_MsgErrorDropDep'));
}