details: /erp/devel/pi/rev/f5a5982fb9ed
changeset: 9909:f5a5982fb9ed
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue Jan 18 17:19:25 2011 +0100
summary: Fixes unmatching for invoice matching algorithm
details: /erp/devel/pi/rev/12b0523855e0
changeset: 9910:12b0523855e0
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue Jan 18 17:20:18 2011 +0100
summary: Removes unnecessary whereclause
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/InvoiceMatchingAlgorithm.java
| 10 ++++++----
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
| 2 --
2 files changed, 6 insertions(+), 6 deletions(-)
diffs (46 lines):
diff -r 8865c74fc6b9 -r 12b0523855e0
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/InvoiceMatchingAlgorithm.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/InvoiceMatchingAlgorithm.java
Tue Jan 18 17:19:12 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/InvoiceMatchingAlgorithm.java
Tue Jan 18 17:20:18 2011 +0100
@@ -44,6 +44,7 @@
import org.openbravo.dal.service.OBQuery;
import org.openbravo.database.ConnectionProvider;
import org.openbravo.erpCommon.utility.OBError;
+import org.openbravo.model.ad.datamodel.Table;
import org.openbravo.model.common.businesspartner.BusinessPartner;
import org.openbravo.model.common.enterprise.DocumentType;
import org.openbravo.model.common.invoice.Invoice;
@@ -507,8 +508,9 @@
try {
if ("Y".equals(transaction.getPosted())) {
List<AccountingFact> accountingEntries =
FIN_Utility.getAllInstances(AccountingFact.class,
- new Value(AccountingFact.PROPERTY_TABLE,
FIN_FINACC_TRANSACTION_TABLE), new Value(
- AccountingFact.PROPERTY_RECORDID, transaction.getId()));
+ new Value(AccountingFact.PROPERTY_TABLE,
OBDal.getInstance().get(Table.class,
+ FIN_FINACC_TRANSACTION_TABLE)), new
Value(AccountingFact.PROPERTY_RECORDID,
+ transaction.getId()));
for (AccountingFact accountingEntry : accountingEntries) {
OBDal.getInstance().remove(accountingEntry);
OBDal.getInstance().flush();
@@ -537,8 +539,8 @@
try {
if ("Y".equals(payment.getPosted())) {
List<AccountingFact> accountingEntries =
FIN_Utility.getAllInstances(AccountingFact.class,
- new Value(AccountingFact.PROPERTY_TABLE, FIN_PAYMENT_TABLE), new
Value(
- AccountingFact.PROPERTY_RECORDID, payment.getId()));
+ new Value(AccountingFact.PROPERTY_TABLE,
OBDal.getInstance().get(Table.class,
+ FIN_PAYMENT_TABLE)), new
Value(AccountingFact.PROPERTY_RECORDID, payment.getId()));
for (AccountingFact accountingEntry : accountingEntries) {
OBDal.getInstance().remove(accountingEntry);
OBDal.getInstance().flush();
diff -r 8865c74fc6b9 -r 12b0523855e0
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
Tue Jan 18 17:19:12 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
Tue Jan 18 17:20:18 2011 +0100
@@ -308,8 +308,6 @@
whereClause.append(" as bp ");
whereClause.append(" where bp." + BusinessPartner.PROPERTY_NAME + " = '"
+ partnername + "'");
- whereClause.append(" and bp." + BusinessPartner.PROPERTY_CLIENT + " = "
- + OBContext.getOBContext().getCurrentClient());
final OBQuery<BusinessPartner> bp =
OBDal.getInstance().createQuery(BusinessPartner.class,
whereClause.toString());
List<BusinessPartner> matchedBP = bp.list();
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
