| Attached Files |  issue_34006.patch [^] (14,015 bytes) 2016-09-17 12:03 [Show Content] [Hide Content]# HG changeset patch
# User Silambarasan Sekar<silambarasan@qualiantech.com>
# Date 1474106385 -19800
# Sat Sep 17 15:29:45 2016 +0530
# Node ID 78d829e0d89e5b3f87ab0992bf5169ba26a5f449
# Parent 027dc930d1761e778089716c0cae4b9f5c9d3cee
Related to issue 34006: button "Save Again" from "OBPOS errors" window allow to press it twice
diff -r 027dc930d176 -r 78d829e0d89e src-db/database/model/tables/OBPOS_ERRORS.xml
--- a/src-db/database/model/tables/OBPOS_ERRORS.xml Wed Sep 07 10:43:15 2016 -0600
+++ b/src-db/database/model/tables/OBPOS_ERRORS.xml Sat Sep 17 15:29:45 2016 +0530
@@ -65,6 +65,10 @@
<default><![CDATA[0]]></default>
<onCreateDefault/>
</column>
+ <column name="PROCESSING" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[N]]></default>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="OBPOS_ERRORS_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff -r 027dc930d176 -r 78d829e0d89e src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Sep 07 10:43:15 2016 -0600
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Sat Sep 17 15:29:45 2016 +0530
@@ -13343,6 +13343,45 @@
<!--F0D73C8D1D264A449E02E79610C52C10--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
<!--F0D73C8D1D264A449E02E79610C52C10--></AD_COLUMN>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--><AD_COLUMN>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <AD_COLUMN_ID><![CDATA[F2E852986C1041F3A7BBAA5A04382E0F]]></AD_COLUMN_ID>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <NAME><![CDATA[Process Now]]></NAME>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <DESCRIPTION><![CDATA[A request to process the respective document or task.]]></DESCRIPTION>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <HELP><![CDATA[When this field is set as 'Y' a process is being performed on this record.]]></HELP>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <COLUMNNAME><![CDATA[Processing]]></COLUMNNAME>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <AD_TABLE_ID><![CDATA[0469743705E3458299DF4293C1019E4F]]></AD_TABLE_ID>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <SEQNO><![CDATA[180]]></SEQNO>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <AD_ELEMENT_ID><![CDATA[524]]></AD_ELEMENT_ID>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <POSITION><![CDATA[17]]></POSITION>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--F2E852986C1041F3A7BBAA5A04382E0F--></AD_COLUMN>
+
<!--F319B587ACFE483986F48F2F2739B06B--><AD_COLUMN>
<!--F319B587ACFE483986F48F2F2739B06B--> <AD_COLUMN_ID><![CDATA[F319B587ACFE483986F48F2F2739B06B]]></AD_COLUMN_ID>
<!--F319B587ACFE483986F48F2F2739B06B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 027dc930d176 -r 78d829e0d89e src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Wed Sep 07 10:43:15 2016 -0600
+++ b/src-db/database/sourcedata/AD_FIELD.xml Sat Sep 17 15:29:45 2016 +0530
@@ -6562,6 +6562,34 @@
<!--C3A536DDD04641ECA2104E406259B060--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--C3A536DDD04641ECA2104E406259B060--></AD_FIELD>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--><AD_FIELD>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <AD_FIELD_ID><![CDATA[C3AD941C4E32489DAF0365FF0F6CD615]]></AD_FIELD_ID>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <NAME><![CDATA[Process Now]]></NAME>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <DESCRIPTION><![CDATA[A request to process the respective document or task.]]></DESCRIPTION>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <HELP><![CDATA[When this field is set as 'Y' a process is being performed on this record.]]></HELP>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <AD_TAB_ID><![CDATA[EC4D45180BCB4EB5A78FA8E8F319FD1C]]></AD_TAB_ID>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <AD_COLUMN_ID><![CDATA[F2E852986C1041F3A7BBAA5A04382E0F]]></AD_COLUMN_ID>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <SEQNO><![CDATA[110]]></SEQNO>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--C3AD941C4E32489DAF0365FF0F6CD615--></AD_FIELD>
+
<!--C406F942F4C54BEB86EA684F470A5842--><AD_FIELD>
<!--C406F942F4C54BEB86EA684F470A5842--> <AD_FIELD_ID><![CDATA[C406F942F4C54BEB86EA684F470A5842]]></AD_FIELD_ID>
<!--C406F942F4C54BEB86EA684F470A5842--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 027dc930d176 -r 78d829e0d89e src/org/openbravo/retail/posterminal/SaveDataActionHandler.java
--- a/src/org/openbravo/retail/posterminal/SaveDataActionHandler.java Wed Sep 07 10:43:15 2016 -0600
+++ b/src/org/openbravo/retail/posterminal/SaveDataActionHandler.java Sat Sep 17 15:29:45 2016 +0530
@@ -88,9 +88,19 @@
if (result.get(JsonConstants.RESPONSE_STATUS).equals(
JsonConstants.RPCREQUEST_STATUS_FAILURE)) {
errorb = true;
- // The process may have changed the error information, we need to commit and close the
- // transaction
- OBDal.getInstance().commitAndClose();
+
+ OBContext.setAdminMode(true);
+ try {
+ error = OBDal.getInstance().get(OBPOSErrors.class, errorId);
+ error.setProcessNow(false);
+ OBDal.getInstance().save(error);
+ OBDal.getInstance().flush();
+ // The process may have changed the error information, we need to commit and close the
+ // transaction
+ OBDal.getInstance().commitAndClose();
+ } finally {
+ OBContext.restorePreviousMode();
+ }
} else {
// Execute post process hooks.
for (ImportEntryPostProcessor importEntryPostProcessor : importEntryPostProcessors
@@ -102,6 +112,7 @@
try {
error = OBDal.getInstance().get(OBPOSErrors.class, errorId);
error.setOrderstatus("Y");
+ error.setProcessNow(false);
OBDal.getInstance().save(error);
OBDal.getInstance().flush();
OBDal.getInstance().commitAndClose();
diff -r 027dc930d176 -r 78d829e0d89e src/org/openbravo/retail/posterminal/SaveDataOnProcessHandler.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/retail/posterminal/SaveDataOnProcessHandler.java Sat Sep 17 15:29:45 2016 +0530
@@ -0,0 +1,67 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2012-2016 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;
+
+import java.util.Map;
+
+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.client.kernel.BaseActionHandler;
+import org.openbravo.client.kernel.RequestContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.service.db.DalConnectionProvider;
+
+@ApplicationScoped
+public class SaveDataOnProcessHandler extends BaseActionHandler {
+ private static final Logger log = Logger.getLogger(SaveDataOnProcessHandler.class);
+
+ @Override
+ public JSONObject execute(Map<String, Object> parameters, String content) {
+ JSONArray errorIds = null;
+ try {
+ errorIds = new JSONArray(content);
+ JSONObject result = new JSONObject();
+ for (int i = 0; i < errorIds.length(); i++) {
+ String errorId = errorIds.getString(i);
+ OBPOSErrors error = OBDal.getInstance().get(OBPOSErrors.class, errorId);
+ try {
+ if (error.isProcessNow()) {
+ result.put("title", "Error");
+ result.put("message", Utility.messageBD(new DalConnectionProvider(false),
+ "OtherProcessActive", RequestContext.get().getVariablesSecureApp().getLanguage()));
+ return result;
+ } else {
+ error.setProcessNow(true);
+ result.put("title", "Success");
+ }
+ } catch (JSONException e) {
+ // won't happen
+ }
+ }
+ return result;
+ } catch (Exception e) {
+ // won't happen
+ log.error("Error while Saving the record", e);
+ JSONObject result = new JSONObject();
+ try {
+ result.put("title", "Error");
+ result.put("message", Utility.messageBD(new DalConnectionProvider(false),
+ "OBPOS_ErrorWhileSaving", RequestContext.get().getVariablesSecureApp().getLanguage()));
+ } catch (JSONException je) {
+ // won't happen
+ }
+ return result;
+ }
+ }
+}
diff -r 027dc930d176 -r 78d829e0d89e web/org.openbravo.retail.posterminal/js/components/errors.js
--- a/web/org.openbravo.retail.posterminal/js/components/errors.js Wed Sep 07 10:43:15 2016 -0600
+++ b/web/org.openbravo.retail.posterminal/js/components/errors.js Sat Sep 17 15:29:45 2016 +0530
@@ -20,12 +20,18 @@
for (i = 0; i < selectedRecords.length; i++) {
recordIds.push(selectedRecords[i].id);
}
+ callback = function (response, data, request) {
+ if (data.title ==='Error') {
+ isc.say(data.message);
+ } else {
+ OB.RemoteCallManager.call('org.openbravo.retail.posterminal.SaveDataActionHandler', recordIds, {}, function (response, data, request) {
+ isc.say(data.message);
+ params.button.closeProcessPopup();
+ });
+ }
+ };
- OB.RemoteCallManager.call('org.openbravo.retail.posterminal.SaveDataActionHandler', recordIds, {}, function (response, data, request) {
- isc.say(data.message);
- params.button.closeProcessPopup();
- });
-
+ OB.RemoteCallManager.call('org.openbravo.retail.posterminal.SaveDataOnProcessHandler', recordIds, {}, callback);
return;
};
OB.OBPOS.Errors.clearError = function (params, view) {
|
Relationships [ Relation Graph ]
[ Dependency Graph ]
Relationships 