[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/45daa25294c6 changeset: 28171:45daa25294c6 user: RM packaging bot openbravo.com> date: Mon Dec 28 17:35:33 2015 + summary: CI: update AD_MODULE to version 28170 details: https://code.openbravo.com/erp/devel/pi/rev/64dfe1cd7ea5 changeset: 28172:64dfe1cd7ea5 user: RM packaging bot openbravo.com> date: Mon Dec 28 17:49:06 2015 + 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.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- 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.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.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/
[OpenbravoERP-commits] devel/main: 3 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/e9300529e34a changeset: 28169:e9300529e34a user: RM packaging bot openbravo.com> date: Thu Dec 24 17:37:23 2015 + summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/4f71605143ec changeset: 28170:4f71605143ec user: Víctor Martínez Romanos openbravo.com> date: Mon Dec 28 12:15:18 2015 +0100 summary: Fixed bug 31760: Some labels in Add Payment can't be translated Solution partially based on ALO's one. The query for translation was wrongly using the element TRL ID instead of the Application Element ID. Avoid querying the database when language is en_US This piece of code is executed from Purchase Invoice, Sales Invoice, Payment In, Payment Out, Financial Account | Transaction, Financial Account | Match Statement. However, only in the Financial Account flows seem to be really useful, so we should think about not running it in the other places. details: https://code.openbravo.com/erp/devel/main/rev/45daa25294c6 changeset: 28171:45daa25294c6 user: RM packaging bot openbravo.com> date: Mon Dec 28 17:35:33 2015 + summary: CI: update AD_MODULE to version 28170 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.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentReloadLabelsActionHandler.java | 73 - modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- 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.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/databas
[OpenbravoERP-commits] devel/pi: Fixed bug 31760: Some labels in Add Payment can't be t...
details: https://code.openbravo.com/erp/devel/pi/rev/4f71605143ec
changeset: 28170:4f71605143ec
user: Víctor Martínez Romanos openbravo.com>
date: Mon Dec 28 12:15:18 2015 +0100
summary: Fixed bug 31760: Some labels in Add Payment can't be translated
Solution partially based on ALO's one.
The query for translation was wrongly using the element TRL ID instead of the
Application Element ID.
Avoid querying the database when language is en_US
This piece of code is executed from Purchase Invoice, Sales Invoice, Payment
In, Payment Out, Financial Account | Transaction, Financial Account | Match
Statement. However, only in the Financial Account flows seem to be really
useful, so we should think about not running it in the other places.
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentReloadLabelsActionHandler.java
| 73 -
1 files changed, 30 insertions(+), 43 deletions(-)
diffs (109 lines):
diff -r e9300529e34a -r 4f71605143ec
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentReloadLabelsActionHandler.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentReloadLabelsActionHandler.java
Thu Dec 24 17:37:23 2015 +
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentReloadLabelsActionHandler.java
Mon Dec 28 12:15:18 2015 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2014 Openbravo SLU
+ * All portions are Copyright (C) 2014-2015 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -21,6 +21,7 @@
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jettison.json.JSONObject;
import org.hibernate.criterion.Restrictions;
import org.openbravo.client.application.Parameter;
@@ -30,6 +31,7 @@
import org.openbravo.dal.service.OBDal;
import org.openbravo.erpCommon.utility.OBMessageUtils;
import org.openbravo.model.ad.system.Language;
+import org.openbravo.model.ad.ui.Element;
import org.openbravo.model.ad.ui.ElementTrl;
import org.openbravo.service.db.DbUtility;
import org.slf4j.Logger;
@@ -50,53 +52,38 @@
final String strFinancialAccount = (String)
parameters.get("financialAccount");
final String strIssotrx = (String) parameters.get("issotrx");
boolean issotrx = "true".equals(strIssotrx) ? true : false;
- final Parameter businessPartner = OBDal.getInstance()
- .get(Parameter.class, strBusinessPartner);
- final Parameter financialAccount =
OBDal.getInstance().get(Parameter.class,
- strFinancialAccount);
- final Language language = OBContext.getOBContext().getLanguage();
- final OBCriteria obcBP =
OBDal.getInstance().createCriteria(ElementTrl.class);
- obcBP.add(Restrictions.eq(ElementTrl.PROPERTY_ID,
businessPartner.getApplicationElement()
- .getId()));
- obcBP.add(Restrictions.eq(ElementTrl.PROPERTY_LANGUAGE, language));
- obcBP.setMaxResults(1);
- final ElementTrl elementBP = (ElementTrl) obcBP.uniqueResult();
- if (elementBP != null) {
-if (issotrx) {
- values.put("businessPartner", elementBP.getName());
-} else {
- values.put("businessPartner", elementBP.getPurchaseOrderName());
+ final String labelProperty = issotrx ? Element.PROPERTY_NAME
+ : Element.PROPERTY_PURCHASEORDERNAME;
+ final Language lang = OBContext.getOBContext().getLanguage();
+
+ final Element businessPartnerElement = OBDal.getInstance()
+ .get(Parameter.class, strBusinessPartner).getApplicationElement();
+ final Element financialAccountElement = OBDal.getInstance()
+ .get(Parameter.class, strFinancialAccount).getApplicationElement();
+
+ values.put("businessPartner", businessPartnerElement.get(labelProperty));
+ values.put("financialAccount",
financialAccountElement.get(labelProperty));
+ if (!StringUtils.equals(lang.getLanguage(), "en_US")) {
+final OBCriteria obcBP =
OBDal.getInstance().createCriteria(ElementTrl.class);
+obcBP.add(Restrictions.eq(ElementTrl.PROPERTY_APPLICATIONELEMENT,
businessPartnerElement));
+obcBP.add(Restrictions.eq(ElementTrl.PROPERTY_LANGUAGE, lang));
+obcBP.setMaxResults(1);
+final ElementTrl elementBP = (ElementTrl) obcBP.uniqueResult();
+if (elementBP != null) {
+ values.put("businessPartner", elementBP.get(labelProperty));
}
- } else {
-if (issotrx) {
- values.put("businessPartner",
businessPartner.getApplicationElement().getName());
-} else {
- values.put("businessPartne
