[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/63ea0df119a5 changeset: 24374:63ea0df119a5 user: RM packaging bot openbravo.com> date: Wed Sep 03 16:58:04 2014 + summary: CI: update AD_MODULE to version 24371 details: https://code.openbravo.com/erp/devel/pi/rev/559599bb222f changeset: 24375:559599bb222f user: RM packaging bot openbravo.com> date: Wed Sep 03 17:14:59 2014 + summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 2 - modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 ++-- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 ++-- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/s
[OpenbravoERP-commits] devel/main: 3 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/ebeb0fa75f2b changeset: 24370:ebeb0fa75f2b user: RM packaging bot openbravo.com> date: Wed Sep 03 02:15:56 2014 + summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/02687eeace5e changeset: 24371:02687eeace5e user: Asier Lostalé openbravo.com> date: Wed Sep 03 11:11:20 2014 +0200 summary: fixed bug 27533: context as a query string in defaults for process definition Now context information is sent as form data with the same format used when the actual process is invoked. details: https://code.openbravo.com/erp/devel/main/rev/63ea0df119a5 changeset: 24372:63ea0df119a5 user: RM packaging bot openbravo.com> date: Wed Sep 03 16:58:04 2014 + summary: CI: update AD_MODULE to version 24371 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java | 27 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/process/DefaultsProcessActionHandler.java | 16 - modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 14 +--- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.sele
[OpenbravoERP-commits] devel/pi: Fixes issue 26961 Added index to POSTED column of FIN_...
details: https://code.openbravo.com/erp/devel/pi/rev/26a03c68d7c8 changeset: 24373:26a03c68d7c8 user: Rafa Roda Palacios ubiquads.com> date: Wed Sep 03 10:06:34 2014 +0200 summary: Fixes issue 26961 Added index to POSTED column of FIN_FINACC_TRANSACTION table diffstat: src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r dac0cfbd526b -r 26a03c68d7c8 src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml --- a/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml Wed Sep 03 14:46:10 2014 +0200 +++ b/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml Wed Sep 03 10:06:34 2014 +0200 @@ -209,6 +209,9 @@ + + + -- Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/ ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 27265: 3rd level tab sometimes does not lo...
details: https://code.openbravo.com/erp/devel/pi/rev/dac0cfbd526b
changeset: 24372:dac0cfbd526b
user: Augusto Mauch openbravo.com>
date: Wed Sep 03 14:46:10 2014 +0200
summary: Fixes issue 27265: 3rd level tab sometimes does not load any data
This issue was reproducible only in the Business Partner window, and only using
Chrome.
It has been solved by removing two lines from the OBStarndardView.setHalfSplit
function. Removing these lines fix the problem, and apparently have no other
functional impact in the resizing of the tabs (see issue test plan).
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
| 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diffs (19 lines):
diff -r 02687eeace5e -r dac0cfbd526b
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
Wed Sep 03 11:11:20 2014 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
Wed Sep 03 14:46:10 2014 +0200
@@ -2332,7 +2332,6 @@
},
setHalfSplit: function () {
-this.setHeight('100%');
var i, tab, pane;
if (this.members[1]) {
// divide the space between the first and second level
@@ -2344,7 +2343,6 @@
// makes a difference what the order of resizing is, first resize the
// one which will be larger, then the one which will be smaller.
this.members[1].setHeight('50%');
-this.members[0].setHeight('50%');
}
this.members[1].setState(isc.OBStandardView.STATE_IN_MID);
} else {
--
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: fixed bug 27533: context as a query string in defaults...
details: https://code.openbravo.com/erp/devel/pi/rev/02687eeace5e
changeset: 24371:02687eeace5e
user: Asier Lostalé openbravo.com>
date: Wed Sep 03 11:11:20 2014 +0200
summary: fixed bug 27533: context as a query string in defaults for process
definition
Now context information is sent as form data with the same format used when
the actual process is invoked.
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java
| 27 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/process/DefaultsProcessActionHandler.java
| 16 -
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js
| 14 +---
3 files changed, 41 insertions(+), 16 deletions(-)
diffs (150 lines):
diff -r ebeb0fa75f2b -r 02687eeace5e
modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java
Wed Sep 03 02:15:56 2014 +
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java
Wed Sep 03 11:11:20 2014 +0200
@@ -22,7 +22,9 @@
import java.util.Map;
import java.util.Map.Entry;
+import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
+import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
import org.hibernate.criterion.Restrictions;
import org.openbravo.base.util.Check;
@@ -77,11 +79,19 @@
return jsonRequest;
}
+ JSONObject context = null;
+ if (StringUtils.isNotEmpty(content)) {
+try {
+ context = new JSONObject(content);
+} catch (JSONException e) {
+ log.error("Error getting context for process definition " +
processDefinition, e);
+}
+ }
for (Parameter param : processDefinition.getOBUIAPPParameterList()) {
if (param.isFixed()) {
if (param.isEvaluateFixedValue()) {
parameters.put(param.getDBColumnName(),
-
ParameterUtils.getParameterFixedValue(fixRequestMap(parameters), param));
+
ParameterUtils.getParameterFixedValue(fixRequestMap(parameters, context),
param));
} else {
parameters.put(param.getDBColumnName(), param.getFixedValue());
}
@@ -200,11 +210,21 @@
return qAccess.count() > 0;
}
- /*
+ /**
* The request map is because includes the HTTP request and
HTTP session, is not
* required to handle process parameters
+ *
+ * @deprecated use {@link BaseProcessActionHandler#fixRequestMap(Map,
JSONObject)}
*/
protected Map fixRequestMap(Map parameters) {
+return fixRequestMap(parameters, null);
+ }
+
+ /**
+ * Fixes the request map adding an "context" key to include context info in
order to make it
+ * available to be evaluated by FilterExpression
+ */
+ protected Map fixRequestMap(Map parameters,
JSONObject context) {
final Map retval = new HashMap();
for (Entry entries : parameters.entrySet()) {
if (entries.getKey().equals(KernelConstants.HTTP_REQUEST)
@@ -213,6 +233,9 @@
}
retval.put(entries.getKey(), entries.getValue().toString());
}
+if (context != null) {
+ retval.put("context", context.toString());
+}
return retval;
}
diff -r ebeb0fa75f2b -r 02687eeace5e
modules/org.openbravo.client.application/src/org/openbravo/client/application/process/DefaultsProcessActionHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/DefaultsProcessActionHandler.java
Wed Sep 03 02:15:56 2014 +
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/DefaultsProcessActionHandler.java
Wed Sep 03 11:11:20 2014 +0200
@@ -24,6 +24,7 @@
import javax.servlet.http.HttpSession;
+import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
@@ -67,12 +68,17 @@
OBContext.setAdminMode(true);
final String processId = (String) parameters.get("processId");
+ final Process processDefinition = OBDal.getInstance().get(Process.class,
processId);
JSONObject context = null;
- if (parameters.get("context") != null) {
-context = new JSONObject((String) parameters.get("context"));
+ if (StringUtils.isNotEmpty(content)) {
+try {
+ context = new JSONObject(content);
+} catch (JSONException e) {
+ log.error("Error getting context for process definition " +
processDefinition, e);
+}
}
- final Process processDefinition = OBDal.getInstance().get(Process.class,
p
