details: /erp/devel/pi/rev/95c0f9711201
changeset: 9307:95c0f9711201
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Wed Dec 22 16:31:14 2010 +0100
summary: [APRM] Fixes warnings, javadoc and refactor duplicated method
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java
| 5 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/Transactions.java
| 6 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
| 5 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
| 56 +---------
4 files changed, 15 insertions(+), 57 deletions(-)
diffs (172 lines):
diff -r 7473f16130c9 -r 95c0f9711201
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java
Wed Dec 22 16:26:14 2010 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java
Wed Dec 22 16:31:14 2010 +0100
@@ -282,6 +282,7 @@
int offset = Integer.valueOf(strOffset).intValue();
int pageSize = Integer.valueOf(strPageSize).intValue();
List<FIN_Payment> gridPayments = null;
+ String strNewFilterAux = strNewFilter;
if (headers != null) {
try {
@@ -307,12 +308,12 @@
page = TableSQLData.calcAndGetBackendPage(vars,
"BatchPaymentExecution.currentPage");
if (vars.getStringParameter("movePage", "").length() > 0) {
// on movePage action force executing countRows again
- strNewFilter = "";
+ strNewFilterAux = "";
}
int oldOffset = offset;
offset = (page * TableSQLData.maxRowsPerGridPage) + offset;
log4j.debug("relativeOffset: " + oldOffset + " absoluteOffset: " +
offset);
- if (strNewFilter.equals("1") || strNewFilter.equals("")) { // New
filter or first load
+ if (strNewFilterAux.equals("1") || strNewFilterAux.equals("")) { //
New filter or first load
gridPayments = dao.getPayExecRowCount(strOrgId, strPaymentMethodId,
strFinancialAccountId, FIN_Utility.getDate(strDateFrom),
FIN_Utility
.getDate(DateTimeData.nDaysAfter(this, strDateTo, "1")),
offset, pageSize, null,
diff -r 7473f16130c9 -r 95c0f9711201
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/Transactions.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/Transactions.java
Wed Dec 22 16:26:14 2010 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/Transactions.java
Wed Dec 22 16:31:14 2010 +0100
@@ -231,6 +231,7 @@
log4j.debug("Output: dataSheet");
String strCommand = "EDIT";
FieldProvider[] data =
TransactionsDao.getAccTrxData(strFinFinancialAccountId);
+
/*
* if (data == null || data.length == 0) { throw new
ServletException(formClassName +
* ": Error when getting data"); }
@@ -401,6 +402,7 @@
String strNumRows = "0";
int offset = Integer.valueOf(strOffset).intValue();
int pageSize = Integer.valueOf(strPageSize).intValue();
+ String strNewFilterAux = strNewFilter;
if (headers != null) {
try {
@@ -428,12 +430,12 @@
page = TableSQLData.calcAndGetBackendPage(vars,
"Transactions.currentPage");
if (vars.getStringParameter("movePage", "").length() > 0) {
// on movePage action force executing countRows again
- strNewFilter = "";
+ strNewFilterAux = "";
}
int oldOffset = offset;
offset = (page * TableSQLData.maxRowsPerGridPage) + offset;
log4j.debug("relativeOffset: " + oldOffset + " absoluteOffset: " +
offset);
- if (strNewFilter.equals("1") || strNewFilter.equals("")) { // New
filter or first load
+ if (strNewFilterAux.equals("1") || strNewFilterAux.equals("")) { //
New filter or first load
int dbNumRows =
dao.getTrxGridRowCount(dao.getObject(FIN_FinancialAccount.class,
strFinancialAccountId), hideReconciledTrx,
TableSQLData.maxRowsPerGridPage, offset);
strNumRows = Integer.toString(dbNumRows);
diff -r 7473f16130c9 -r 95c0f9711201
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
Wed Dec 22 16:26:14 2010 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
Wed Dec 22 16:31:14 2010 +0100
@@ -100,8 +100,8 @@
* @param isWriteoff
* Boolean to write off the difference when the payment amount is
lower than the Payment
* Scheduled PAyment Detail amount.
- * @param refundAmount
- * BigDecimal with the amount that needs to be refund to the
business partner.
+ * @param isRefund
+ * Not used.
* @return The FIN_Payment OBObject containing all the Payment Details.
*/
public static FIN_Payment savePayment(FIN_Payment _payment, boolean
isReceipt,
@@ -631,6 +631,7 @@
* @param paymentProposal
* @return List of payment identifiers
*/
+ @SuppressWarnings("unchecked")
public static List<String> getPaymentFromPaymentProposal(FIN_PaymentProposal
paymentProposal) {
// FIXME: added to access the FIN_PaymentSchedule and
FIN_PaymentScheduleDetail tables to be
// removed when new security implementation is done
diff -r 7473f16130c9 -r 95c0f9711201
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
Wed Dec 22 16:26:14 2010 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
Wed Dec 22 16:31:14 2010 +0100
@@ -34,7 +34,6 @@
import org.apache.commons.lang.time.DateUtils;
import org.apache.log4j.Logger;
import org.hibernate.criterion.Expression;
-import org.hibernate.criterion.Restrictions;
import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
import org.openbravo.base.secureApp.VariablesSecureApp;
import org.openbravo.base.session.OBPropertiesProvider;
@@ -43,14 +42,10 @@
import org.openbravo.dal.service.OBCriteria;
import org.openbravo.dal.service.OBDal;
import org.openbravo.data.FieldProvider;
+import org.openbravo.database.ConnectionProvider;
import org.openbravo.erpCommon.utility.FieldProviderFactory;
import org.openbravo.erpCommon.utility.Utility;
import org.openbravo.model.ad.system.Client;
-import org.openbravo.model.ad.system.Language;
-import org.openbravo.model.ad.ui.Element;
-import org.openbravo.model.ad.ui.ElementTrl;
-import org.openbravo.model.ad.ui.Message;
-import org.openbravo.model.ad.ui.MessageTrl;
import org.openbravo.model.ad.utility.Sequence;
import org.openbravo.model.common.enterprise.DocumentType;
import org.openbravo.model.common.enterprise.Organization;
@@ -60,6 +55,7 @@
import org.openbravo.model.financialmgmt.payment.FIN_PaymentProposal;
import org.openbravo.model.financialmgmt.payment.FIN_PaymentSchedule;
import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod;
+import org.openbravo.service.db.DalConnectionProvider;
import org.openbravo.utils.Replace;
public class FIN_Utility {
@@ -494,51 +490,9 @@
* @return String with the translated message.
*/
public static String messageBD(String strCode) {
- String strMessage = "";
-
- OBContext.setAdminMode(true);
- try {
- Language language = OBContext.getOBContext().getLanguage();
- if ("en_US".equals(language.getLanguage())) {
- OBCriteria<Message> obc =
OBDal.getInstance().createCriteria(Message.class);
- obc.add(Expression.eq(Message.PROPERTY_SEARCHKEY, strCode));
- strMessage = (obc.list() != null && obc.list().size() > 0) ?
obc.list().get(0)
- .getMessageText() : null;
-
- } else {
- OBCriteria<MessageTrl> obcTrl =
OBDal.getInstance().createCriteria(MessageTrl.class);
- obcTrl.add(Expression.eq(MessageTrl.PROPERTY_LANGUAGE, language));
- obcTrl.createAlias(MessageTrl.PROPERTY_MESSAGE, "msg");
- obcTrl.add(Restrictions.eq("msg.searchKey", strCode));
- strMessage = (obcTrl.list() != null && obcTrl.list().size() > 0) ?
obcTrl.list().get(0)
- .getMessageText() : null;
- }
-
- if (strMessage == null || strMessage.equals("")) {
- if ("en_US".equals(language.getLanguage())) {
- OBCriteria<Element> obcCol =
OBDal.getInstance().createCriteria(Element.class);
- obcCol.add(Expression.eq(Element.PROPERTY_DBCOLUMNNAME,
strCode).ignoreCase());
- strMessage = (obcCol.list() != null && obcCol.list().size() > 0) ?
obcCol.list().get(0)
- .getName() : null;
-
- } else {
- OBCriteria<ElementTrl> obcTrl =
OBDal.getInstance().createCriteria(ElementTrl.class);
- obcTrl.add(Expression.eq(ElementTrl.PROPERTY_LANGUAGE, language));
- obcTrl.createAlias(ElementTrl.PROPERTY_APPLICATIONELEMENT, "ele");
- obcTrl.add(Restrictions.eq("ele.dBColumnName",
strCode).ignoreCase());
- strMessage = (obcTrl.list() != null && obcTrl.list().size() > 0) ?
obcTrl.list().get(0)
- .getName() : null;
-
- }
- }
- } finally {
- OBContext.restorePreviousMode();
- }
-
- if (strMessage == null || strMessage.equals(""))
- strMessage = strCode;
- return Replace.replace(Replace.replace(strMessage, "\n", "\\n"), "\"",
""");
-
+ String language = OBContext.getOBContext().getLanguage().getLanguage();
+ ConnectionProvider conn = new DalConnectionProvider(false);
+ return Utility.messageBD(conn, strCode, language);
}
/**
------------------------------------------------------------------------------
Forrester recently released a report on the Return on Investment (ROI) of
Google Apps. They found a 300% ROI, 38%-56% cost savings, and break-even
within 7 months. Over 3 million businesses have gone Google with Google Apps:
an online email calendar, and document program that's accessible from your
browser. Read the Forrester report: http://p.sf.net/sfu/googleapps-sfnew
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
