0031760: [SERQA 455] Some fields cannot be translated in Sales Invoice || Add Payment

diff -r 418ed88a6db0 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentReloadLabelsActionHandler.java
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentReloadLabelsActionHandler.java	Tue Dec 22 09:29:10 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentReloadLabelsActionHandler.java	Tue Dec 22 10:37:47 2015 +0100
@@ -57,8 +57,8 @@
       final Language language = OBContext.getOBContext().getLanguage();
 
       final OBCriteria<ElementTrl> obcBP = OBDal.getInstance().createCriteria(ElementTrl.class);
-      obcBP.add(Restrictions.eq(ElementTrl.PROPERTY_ID, businessPartner.getApplicationElement()
-          .getId()));
+      obcBP.add(Restrictions.eq(ElementTrl.PROPERTY_APPLICATIONELEMENT,
+          businessPartner.getApplicationElement()));
       obcBP.add(Restrictions.eq(ElementTrl.PROPERTY_LANGUAGE, language));
       obcBP.setMaxResults(1);
       final ElementTrl elementBP = (ElementTrl) obcBP.uniqueResult();
@@ -78,8 +78,8 @@
       }
 
       final OBCriteria<ElementTrl> obcFA = OBDal.getInstance().createCriteria(ElementTrl.class);
-      obcFA.add(Restrictions.eq(ElementTrl.PROPERTY_ID, financialAccount.getApplicationElement()
-          .getId()));
+      obcFA.add(Restrictions.eq(ElementTrl.PROPERTY_APPLICATIONELEMENT,
+          financialAccount.getApplicationElement()));
       obcFA.add(Restrictions.eq(ElementTrl.PROPERTY_LANGUAGE, language));
       obcFA.setMaxResults(1);
       final ElementTrl elementFA = (ElementTrl) obcFA.uniqueResult();

diff -r 418ed88a6db0 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentReloadLabelsActionHandler.java
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentReloadLabelsActionHandler.java	Tue Dec 22 09:29:10 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentReloadLabelsActionHandler.java	Tue Dec 22 11:02:48 2015 +0100
@@ -22,15 +22,12 @@
 import java.util.Map;
 
 import org.codehaus.jettison.json.JSONObject;
-import org.hibernate.criterion.Restrictions;
 import org.openbravo.client.application.Parameter;
 import org.openbravo.client.kernel.BaseActionHandler;
 import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBCriteria;
 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.ElementTrl;
+import org.openbravo.model.ad.ui.Element;
 import org.openbravo.service.db.DbUtility;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,49 +51,15 @@
           .get(Parameter.class, strBusinessPartner);
       final Parameter financialAccount = OBDal.getInstance().get(Parameter.class,
           strFinancialAccount);
-      final Language language = OBContext.getOBContext().getLanguage();
 
-      final OBCriteria<ElementTrl> 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());
-        }
-      } else {
-        if (issotrx) {
-          values.put("businessPartner", businessPartner.getApplicationElement().getName());
-        } else {
-          values.put("businessPartner", businessPartner.getApplicationElement()
-              .getPurchaseOrderName());
-        }
-      }
+      final String labelProperty = issotrx ? Element.PROPERTY_NAME
+          : Element.PROPERTY_PURCHASEORDERNAME;
 
-      final OBCriteria<ElementTrl> obcFA = OBDal.getInstance().createCriteria(ElementTrl.class);
-      obcFA.add(Restrictions.eq(ElementTrl.PROPERTY_ID, financialAccount.getApplicationElement()
-          .getId()));
-      obcFA.add(Restrictions.eq(ElementTrl.PROPERTY_LANGUAGE, language));
-      obcFA.setMaxResults(1);
-      final ElementTrl elementFA = (ElementTrl) obcFA.uniqueResult();
-      if (elementFA != null) {
-        if (issotrx) {
-          values.put("financialAccount", elementFA.getName());
-        } else {
-          values.put("financialAccount", elementFA.getPurchaseOrderName());
-        }
-      } else {
-        if (issotrx) {
-          values.put("financialAccount", financialAccount.getApplicationElement().getName());
-        } else {
-          values.put("financialAccount", financialAccount.getApplicationElement()
-              .getPurchaseOrderName());
-        }
-      }
+      values.put("businessPartner",
+          businessPartner.get(labelProperty, OBContext.getOBContext().getLanguage()));
+      values.put("financialAccount",
+          financialAccount.get(labelProperty, OBContext.getOBContext().getLanguage()));
+
       result.put("values", values);
     } catch (Exception e) {
       OBDal.getInstance().rollbackAndClose();