details: /erp/devel/pi/rev/6188d360d994
changeset: 11647:6188d360d994
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Tue Apr 26 10:27:15 2011 +0200
summary: [lib-update] Remove use of semi-deprecated class Expression (use
Restrictions)
The class org.hibernate.criterion.Expression is already semi-deprecated in
hibernate version 3.2.5 (as mentioned in its javadoc). Newer hibernate versions
deprecate it officially. This changes all users to its superclass Restrictions.
Purely technical change with no functional impact.
diffstat:
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java
| 5 +-
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentMethodTest.java
| 4 +-
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java
| 10 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
| 6 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
| 4 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
| 4 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
| 10 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java
| 6 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java
| 4 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java
| 28 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
| 69 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/MatchTransactionDao.java
| 42 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java
| 18 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
| 23 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java
| 24 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
| 4 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java
| 10 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
| 46 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java
| 10 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java
| 6 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowsInClassicModeTask.java
| 4 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 60 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/TemplateResolver.java
| 4 +-
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
| 46 +-
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/URLWidgetProvider.java
| 10 +-
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java
| 4 +-
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java
| 17 +-
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java
| 4 +-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
| 4 +-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
| 13 +-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java
| 6 +-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java
| 6 +-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorFieldPropertyCallout.java
| 6 +-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/model/domaintype/SelectorDomainType.java
| 6 +-
src-test/org/openbravo/test/base/BaseTest.java
| 6 +-
src-test/org/openbravo/test/dal/DalPerformanceInventoryLineTest.java
| 6 +-
src-test/org/openbravo/test/dal/DalQueryTest.java
| 6 +-
src-test/org/openbravo/test/dal/DalTest.java
| 22 +-
src-test/org/openbravo/test/dal/DynamicEntityTest.java
| 8 +-
src-test/org/openbravo/test/dal/IssuesTest.java
| 4 +-
src-test/org/openbravo/test/dal/ReadByNameTest.java
| 4 +-
src-test/org/openbravo/test/dal/ValidationTest.java
| 4 +-
src-test/org/openbravo/test/doc/GenerateEntityModelWiki.java
| 6 +-
src-test/org/openbravo/test/model/ClassLoaderTest.java
| 12 +-
src-test/org/openbravo/test/model/OneToManyTest.java
| 10 +-
src-test/org/openbravo/test/modularity/DBPrefixTest.java
| 6 +-
src-test/org/openbravo/test/modularity/TableNameTest.java
| 14 +-
src-test/org/openbravo/test/preference/PreferenceTest.java
| 20 +-
src-test/org/openbravo/test/security/EntityAccessTest.java
| 10 +-
src-test/org/openbravo/test/security/WritableReadableOrganizationClientTest.java
| 6 +-
src-test/org/openbravo/test/xml/ClientExportImportTest.java
| 4 +-
src-test/org/openbravo/test/xml/DatasetExportTest.java
| 9 +-
src-test/org/openbravo/test/xml/EntityXMLImportTestBusinessObject.java
| 4 +-
src-test/org/openbravo/test/xml/EntityXMLImportTestReference.java
| 12 +-
src-test/org/openbravo/test/xml/EntityXMLImportTestSingle.java
| 6 +-
src-test/org/openbravo/test/xml/UniqueConstraintImportTest.java
| 8 +-
src-test/org/openbravo/test/xml/XMLBaseTest.java
| 6 +-
src/org/openbravo/base/model/ModelProvider.java
| 4 +-
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
| 14 +-
src/org/openbravo/base/secureApp/UserLock.java
| 4 +-
src/org/openbravo/dal/service/OBDal.java
| 6 +-
src/org/openbravo/dal/xml/EntityResolver.java
| 22 +-
src/org/openbravo/erpCommon/ad_callouts/SE_FinancialAccount_BSAccounts.java
| 4 +-
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java
| 7 +-
src/org/openbravo/erpCommon/ad_callouts/SE_PaymentMethod_FinAccount.java
| 8 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Column.java
| 6 +-
src/org/openbravo/erpCommon/ad_callouts/SL_ModuleCallout.java
| 8 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Preference.java
| 34 +-
src/org/openbravo/erpCommon/ad_callouts/SL_TableAudit.java
| 6 +-
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
| 21 +-
src/org/openbravo/erpCommon/ad_forms/DocFINBankStatement.java
| 8 +-
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
| 52 +-
src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java
| 18 +-
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java
| 65 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java
| 8 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
| 11 +-
src/org/openbravo/erpCommon/ad_process/AcctServerProcess.java
| 4 +-
src/org/openbravo/erpCommon/ad_process/CreateCustomModule.java
| 6 +-
src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java
| 8 +-
src/org/openbravo/erpCommon/ad_process/PaymentMonitor.java
| 4 +-
src/org/openbravo/erpCommon/ad_process/TestHeartbeat.java
| 20 +-
src/org/openbravo/erpCommon/businessUtility/AuditTrailPopup.java
| 98 +-
src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java
| 320 +++++-----
src/org/openbravo/erpCommon/info/PriceListVersionFilterExpression.java
| 16 +-
src/org/openbravo/erpCommon/modules/ImportModule.java
| 5 +-
src/org/openbravo/erpCommon/obps/ActivationKey.java
| 20 +-
src/org/openbravo/erpCommon/obps/DisabledModules.java
| 12 +-
src/org/openbravo/erpCommon/utility/SystemInfo.java
| 14 +-
src/org/openbravo/erpReports/RptC_Bpartner.java
| 12 +-
src/org/openbravo/service/dataset/DataSetService.java
| 12 +-
src/org/openbravo/service/db/CallProcess.java
| 4 +-
src/org/openbravo/service/db/DataExportService.java
| 4 +-
src/org/openbravo/service/db/ExportReferenceDataTask.java
| 4 +-
src/org/openbravo/service/system/DatabaseValidator.java
| 16 +-
src/org/openbravo/service/system/ModuleValidator.java
| 10 +-
src/org/openbravo/service/system/SystemService.java
| 6 +-
src/org/openbravo/service/system/SystemValidationTask.java
| 4 +-
97 files changed, 816 insertions(+), 805 deletions(-)
diffs (truncated from 4941 to 300 lines):
diff -r 11053ddb29cd -r 6188d360d994
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java
---
a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java
Fri Apr 15 14:51:26 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java
Tue Apr 26 10:27:15 2011 +0200
@@ -22,7 +22,7 @@
import java.math.BigDecimal;
import java.util.List;
-import org.hibernate.criterion.Expression;
+import org.hibernate.criterion.Restrictions;
import org.openbravo.dal.service.OBCriteria;
import org.openbravo.dal.service.OBDal;
import org.openbravo.model.common.businesspartner.BusinessPartner;
@@ -82,7 +82,8 @@
public void testDeleteFinancialAccounts() {
final OBCriteria<FIN_FinancialAccount> obCriteria =
OBDal.getInstance().createCriteria(
FIN_FinancialAccount.class);
- obCriteria.add(Expression.eq(FIN_FinancialAccount.PROPERTY_DESCRIPTION,
STANDARD_DESCRIPTION));
+ obCriteria
+ .add(Restrictions.eq(FIN_FinancialAccount.PROPERTY_DESCRIPTION,
STANDARD_DESCRIPTION));
final List<FIN_FinancialAccount> finAccs = obCriteria.list();
for (FIN_FinancialAccount fa : finAccs) {
System.out.println("Removing payment method: " + fa.getName());
diff -r 11053ddb29cd -r 6188d360d994
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentMethodTest.java
---
a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentMethodTest.java
Fri Apr 15 14:51:26 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentMethodTest.java
Tue Apr 26 10:27:15 2011 +0200
@@ -21,7 +21,7 @@
import java.util.List;
-import org.hibernate.criterion.Expression;
+import org.hibernate.criterion.Restrictions;
import org.openbravo.dal.service.OBCriteria;
import org.openbravo.dal.service.OBDal;
import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod;
@@ -85,7 +85,7 @@
public void testDeletePaymentMethod() {
final OBCriteria<FIN_PaymentMethod> obCriteria =
OBDal.getInstance().createCriteria(
FIN_PaymentMethod.class);
- obCriteria.add(Expression.eq(FIN_PaymentMethod.PROPERTY_DESCRIPTION,
STANDARD_DESCRIPTION));
+ obCriteria.add(Restrictions.eq(FIN_PaymentMethod.PROPERTY_DESCRIPTION,
STANDARD_DESCRIPTION));
final List<FIN_PaymentMethod> paymentMethods = obCriteria.list();
for (FIN_PaymentMethod pm : paymentMethods) {
System.out.println("Removing payment method: " + pm.getName());
diff -r 11053ddb29cd -r 6188d360d994
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java
---
a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java
Fri Apr 15 14:51:26 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java
Tue Apr 26 10:27:15 2011 +0200
@@ -25,7 +25,7 @@
import java.util.List;
import org.apache.log4j.Logger;
-import org.hibernate.criterion.Expression;
+import org.hibernate.criterion.Restrictions;
import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
import org.openbravo.advpaymentmngt.process.FIN_AddPayment;
import org.openbravo.advpaymentmngt.utility.FIN_Utility;
@@ -79,7 +79,7 @@
if (checkIfExist) {
final OBCriteria<FIN_FinancialAccount> obc =
OBDal.getInstance().createCriteria(
FIN_FinancialAccount.class);
- obc.add(Expression.eq(FIN_FinancialAccount.PROPERTY_NAME, name));
+ obc.add(Restrictions.eq(FIN_FinancialAccount.PROPERTY_NAME, name));
if (obc.list() != null && obc.list().size() > 0) {
return obc.list().get(0);
}
@@ -149,7 +149,7 @@
if (checkIfExist) {
final OBCriteria<FIN_PaymentMethod> obc =
OBDal.getInstance().createCriteria(
FIN_PaymentMethod.class);
- obc.add(Expression.eq(FIN_PaymentMethod.PROPERTY_NAME, name));
+ obc.add(Restrictions.eq(FIN_PaymentMethod.PROPERTY_NAME, name));
if (obc.list() != null && obc.list().size() > 0) {
return obc.list().get(0);
}
@@ -419,9 +419,9 @@
for (Value value : values) {
if (value.getValue() == null) {
- obCriteria.add(Expression.isNull(value.getField()));
+ obCriteria.add(Restrictions.isNull(value.getField()));
} else {
- obCriteria.add(Expression.eq(value.getField(), value.getValue()));
+ obCriteria.add(Restrictions.eq(value.getField(), value.getValue()));
}
}
diff -r 11053ddb29cd -r 6188d360d994
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
Fri Apr 15 14:51:26 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
Tue Apr 26 10:27:15 2011 +0200
@@ -29,7 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.hibernate.criterion.Expression;
+import org.hibernate.criterion.Restrictions;
import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
import org.openbravo.advpaymentmngt.process.FIN_AddPayment;
import org.openbravo.advpaymentmngt.utility.FIN_Utility;
@@ -457,8 +457,8 @@
strPmtMethodId);
OBCriteria<FinAccPaymentMethod> psdFilter =
OBDal.getInstance().createCriteria(
FinAccPaymentMethod.class);
- psdFilter.add(Expression.eq(FinAccPaymentMethod.PROPERTY_ACCOUNT, finAcc));
- psdFilter.add(Expression.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD,
finPmtMethod));
+ psdFilter.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_ACCOUNT,
finAcc));
+ psdFilter.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD,
finPmtMethod));
for (FinAccPaymentMethod paymentMethod : psdFilter.list()) {
return isReceipt ? paymentMethod.isAutomaticDeposit() :
paymentMethod.isAutomaticWithdrawn();
}
diff -r 11053ddb29cd -r 6188d360d994
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
Fri Apr 15 14:51:26 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
Tue Apr 26 10:27:15 2011 +0200
@@ -30,7 +30,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.hibernate.criterion.Expression;
+import org.hibernate.criterion.Restrictions;
import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
import org.openbravo.advpaymentmngt.process.FIN_AddPayment;
import org.openbravo.advpaymentmngt.utility.FIN_Utility;
@@ -255,7 +255,7 @@
if (bsline.getBusinessPartner() == null) {
OBCriteria<BusinessPartner> obcBP = OBDal.getInstance().createCriteria(
BusinessPartner.class);
- obcBP.add(Expression.eq(BusinessPartner.PROPERTY_NAME,
bsline.getBpartnername()));
+ obcBP.add(Restrictions.eq(BusinessPartner.PROPERTY_NAME,
bsline.getBpartnername()));
if (obcBP.list() != null && obcBP.list().size() > 0) {
xmlDocument.setParameter("businessPartner",
obcBP.list().get(0).getId());
defaultPaymentMethod = (obcBP.list().get(0).getPaymentMethod() !=
null) ? obcBP.list()
diff -r 11053ddb29cd -r 6188d360d994
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
Fri Apr 15 14:51:26 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
Tue Apr 26 10:27:15 2011 +0200
@@ -33,7 +33,7 @@
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
-import org.hibernate.criterion.Expression;
+import org.hibernate.criterion.Restrictions;
import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
import org.openbravo.advpaymentmngt.dao.TransactionsDao;
import org.openbravo.advpaymentmngt.utility.FIN_Utility;
@@ -318,7 +318,7 @@
FIN_Payment payment = OBDal.getInstance().get(FIN_Payment.class,
paymentWithTransaction);
OBCriteria<FIN_FinaccTransaction> obcTrans =
OBDal.getInstance().createCriteria(
FIN_FinaccTransaction.class);
- obcTrans.add(Expression.eq(FIN_FinaccTransaction.PROPERTY_FINPAYMENT,
payment));
+
obcTrans.add(Restrictions.eq(FIN_FinaccTransaction.PROPERTY_FINPAYMENT,
payment));
FIN_FinaccTransaction finTrans = obcTrans.list().get(0);
matchBankStatementLine(vars, finTrans, strFinBankStatementLineId);
diff -r 11053ddb29cd -r 6188d360d994
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
Fri Apr 15 14:51:26 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
Tue Apr 26 10:27:15 2011 +0200
@@ -33,7 +33,7 @@
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
-import org.hibernate.criterion.Expression;
+import org.hibernate.criterion.Restrictions;
import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
import org.openbravo.advpaymentmngt.dao.MatchTransactionDao;
import org.openbravo.advpaymentmngt.dao.TransactionsDao;
@@ -587,8 +587,8 @@
try {
final OBCriteria<FIN_ReconciliationLine_v> obc =
OBDal.getInstance().createCriteria(
FIN_ReconciliationLine_v.class);
- obc.add(Expression.eq(FIN_ReconciliationLine_v.PROPERTY_RECONCILIATION,
reconciliation));
-
obc.add(Expression.isNull(FIN_ReconciliationLine_v.PROPERTY_BANKSTATEMENTLINE));
+
obc.add(Restrictions.eq(FIN_ReconciliationLine_v.PROPERTY_RECONCILIATION,
reconciliation));
+
obc.add(Restrictions.isNull(FIN_ReconciliationLine_v.PROPERTY_BANKSTATEMENTLINE));
obc.setMaxResults(1);
final List<FIN_ReconciliationLine_v> rec = obc.list();
return (rec.size() != 0);
@@ -831,8 +831,8 @@
private FIN_Payment getAlreadyExistingPayment(String strPaymentDocumentNo,
Organization organization) {
final OBCriteria<FIN_Payment> obc =
OBDal.getInstance().createCriteria(FIN_Payment.class);
- obc.add(Expression.eq(FIN_Payment.PROPERTY_DOCUMENTNO,
strPaymentDocumentNo));
- obc.add(Expression.eq(FIN_Payment.PROPERTY_ORGANIZATION, organization));
+ obc.add(Restrictions.eq(FIN_Payment.PROPERTY_DOCUMENTNO,
strPaymentDocumentNo));
+ obc.add(Restrictions.eq(FIN_Payment.PROPERTY_ORGANIZATION, organization));
obc.setMaxResults(1);
final List<FIN_Payment> payments = obc.list();
if (payments.size() == 0) {
diff -r 11053ddb29cd -r 6188d360d994
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java
Fri Apr 15 14:51:26 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java
Tue Apr 26 10:27:15 2011 +0200
@@ -32,7 +32,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.hibernate.criterion.Expression;
+import org.hibernate.criterion.Restrictions;
import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
import org.openbravo.advpaymentmngt.dao.TransactionsDao;
import org.openbravo.advpaymentmngt.utility.FIN_Utility;
@@ -442,8 +442,8 @@
try {
final OBCriteria<FIN_ReconciliationLine_v> obc =
OBDal.getInstance().createCriteria(
FIN_ReconciliationLine_v.class);
- obc.add(Expression.eq(FIN_ReconciliationLine_v.PROPERTY_RECONCILIATION,
reconciliation));
-
obc.add(Expression.isNotNull(FIN_ReconciliationLine_v.PROPERTY_BANKSTATEMENTLINE));
+
obc.add(Restrictions.eq(FIN_ReconciliationLine_v.PROPERTY_RECONCILIATION,
reconciliation));
+
obc.add(Restrictions.isNotNull(FIN_ReconciliationLine_v.PROPERTY_BANKSTATEMENTLINE));
obc.setMaxResults(1);
final List<FIN_ReconciliationLine_v> rec = obc.list();
return (rec.size() != 0);
diff -r 11053ddb29cd -r 6188d360d994
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
Fri Apr 15 14:51:26 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java
Tue Apr 26 10:27:15 2011 +0200
@@ -28,7 +28,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.hibernate.criterion.Expression;
+import org.hibernate.criterion.Restrictions;
import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
import org.openbravo.advpaymentmngt.utility.FIN_Utility;
import org.openbravo.base.exception.OBException;
@@ -468,7 +468,7 @@
OBContext.setAdminMode();
try {
OBCriteria<Form> obc = OBDal.getInstance().createCriteria(Form.class);
- obc.add(Expression.eq(Form.PROPERTY_JAVACLASSNAME, formClassName));
+ obc.add(Restrictions.eq(Form.PROPERTY_JAVACLASSNAME, formClassName));
if (obc.list() == null || obc.list().size() == 0) {
throw new OBException(formClassName + ": Error on window data");
}
diff -r 11053ddb29cd -r 6188d360d994
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java
Fri Apr 15 14:51:26 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java
Tue Apr 26 10:27:15 2011 +0200
@@ -35,9 +35,9 @@
import net.sf.jasperreports.engine.design.JasperDesign;
import net.sf.jasperreports.engine.xml.JRXmlLoader;
-import org.hibernate.criterion.Expression;
import org.hibernate.criterion.ProjectionList;
import org.hibernate.criterion.Projections;
+import org.hibernate.criterion.Restrictions;
import org.openbravo.advpaymentmngt.dao.MatchTransactionDao;
import org.openbravo.base.secureApp.HttpSecureAppServlet;
import org.openbravo.base.secureApp.VariablesSecureApp;
@@ -189,17 +189,17 @@
try {
OBCriteria<FIN_FinaccTransaction> obcTrans =
OBDal.getInstance().createCriteria(
FIN_FinaccTransaction.class);
- obcTrans.add(Expression.eq(FIN_FinaccTransaction.PROPERTY_ACCOUNT,
recon.getAccount()));
-
obcTrans.add(Expression.le(FIN_FinaccTransaction.PROPERTY_TRANSACTIONDATE, recon
+ obcTrans.add(Restrictions.eq(FIN_FinaccTransaction.PROPERTY_ACCOUNT,
recon.getAccount()));
+
obcTrans.add(Restrictions.le(FIN_FinaccTransaction.PROPERTY_TRANSACTIONDATE,
recon
.getEndingDate()));
List<FIN_Reconciliation> afterReconciliations = MatchTransactionDao
.getReconciliationListAfterDate(recon);
if (afterReconciliations.size() > 0) {
- obcTrans.add(Expression.or(
- Expression.isNull(FIN_FinaccTransaction.PROPERTY_RECONCILIATION),
Expression.in(
- FIN_FinaccTransaction.PROPERTY_RECONCILIATION,
afterReconciliations)));
+ obcTrans.add(Restrictions.or(Restrictions
+ .isNull(FIN_FinaccTransaction.PROPERTY_RECONCILIATION),
Restrictions.in(
+ FIN_FinaccTransaction.PROPERTY_RECONCILIATION,
afterReconciliations)));
} else {
-
obcTrans.add(Expression.isNull(FIN_FinaccTransaction.PROPERTY_RECONCILIATION));
+
obcTrans.add(Restrictions.isNull(FIN_FinaccTransaction.PROPERTY_RECONCILIATION));
}
ProjectionList projections = Projections.projectionList();
@@ -248,18 +248,18 @@
obcBsl.createAlias(FIN_BankStatementLine.PROPERTY_BANKSTATEMENT, "bs");
obcBsl.createAlias(FIN_BankStatementLine.PROPERTY_FINANCIALACCOUNTTRANSACTION,
"tr",
OBCriteria.LEFT_JOIN);
- obcBsl.add(Expression.le(FIN_BankStatementLine.PROPERTY_TRANSACTIONDATE,
recon
+
obcBsl.add(Restrictions.le(FIN_BankStatementLine.PROPERTY_TRANSACTIONDATE, recon
.getEndingDate()));
List<FIN_Reconciliation> afterReconciliations = MatchTransactionDao
.getReconciliationListAfterDate(recon);
if (afterReconciliations.size() > 0) {
- obcBsl.add(Expression.or(Expression
-
.isNull(FIN_BankStatementLine.PROPERTY_FINANCIALACCOUNTTRANSACTION),
Expression.in(
+ obcBsl.add(Restrictions.or(Restrictions
+
.isNull(FIN_BankStatementLine.PROPERTY_FINANCIALACCOUNTTRANSACTION),
Restrictions.in(
"tr." + FIN_FinaccTransaction.PROPERTY_RECONCILIATION,
afterReconciliations)));
} else {
-
obcBsl.add(Expression.isNull(FIN_BankStatementLine.PROPERTY_FINANCIALACCOUNTTRANSACTION));
+
obcBsl.add(Restrictions.isNull(FIN_BankStatementLine.PROPERTY_FINANCIALACCOUNTTRANSACTION));
}
- obcBsl.add(Expression.eq("bs." + FIN_BankStatement.PROPERTY_ACCOUNT,
recon.getAccount()));
+ obcBsl.add(Restrictions.eq("bs." + FIN_BankStatement.PROPERTY_ACCOUNT,
recon.getAccount()));
ProjectionList projections = Projections.projectionList();
projections.add(Projections.sum(FIN_BankStatementLine.PROPERTY_CRAMOUNT));
projections.add(Projections.sum(FIN_BankStatementLine.PROPERTY_DRAMOUNT));
@@ -296,8 +296,8 @@
try {
OBCriteria<FIN_FinaccTransaction> obcTrans =
OBDal.getInstance().createCriteria(
FIN_FinaccTransaction.class);
- obcTrans.add(Expression.eq(FIN_FinaccTransaction.PROPERTY_ACCOUNT,
recon.getAccount()));
-
obcTrans.add(Expression.gt(FIN_FinaccTransaction.PROPERTY_TRANSACTIONDATE, recon
+ obcTrans.add(Restrictions.eq(FIN_FinaccTransaction.PROPERTY_ACCOUNT,
recon.getAccount()));
+
obcTrans.add(Restrictions.gt(FIN_FinaccTransaction.PROPERTY_TRANSACTIONDATE,
recon
.getEndingDate()));
ProjectionList projections = Projections.projectionList();
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
