details: /erp/devel/pi/rev/28482e1c9149
changeset: 12557:28482e1c9149
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue May 31 11:49:52 2011 +0200
summary: Fixes import bank statement when name is too long
details: /erp/devel/pi/rev/e52f1320f382
changeset: 12558:e52f1320f382
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue May 31 11:50:13 2011 +0200
summary: Fixes accounting for reconciliation when payment containg gl item
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
| 2 +-
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java
| 15 ++++++++--
2 files changed, 13 insertions(+), 4 deletions(-)
diffs (44 lines):
diff -r dc925425b26c -r e52f1320f382
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
Mon May 30 12:16:58 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
Tue May 31 11:50:13 2011 +0200
@@ -107,7 +107,7 @@
newBankStatement.setDocumentType(doc);
newBankStatement.setDocumentNo(documentNo);
newBankStatement.setOrganization(financialAccount.getOrganization());
- newBankStatement.setName(documentNo + " - " + filename);
+ newBankStatement.setName((documentNo + " - " + filename).substring(0, 60));
newBankStatement.setImportdate(new Date());
newBankStatement.setTransactionDate(new Date());
newBankStatement.setFileName(filename);
diff -r dc925425b26c -r e52f1320f382
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java Mon May
30 12:16:58 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java Tue May
31 11:50:13 2011 +0200
@@ -490,6 +490,8 @@
for (int i = 0; i < data.length; i++) {
if (data[i] == null)
continue;
+ line.setCGlItemId(data[i].getField("cGlItemId"));
+ line.m_C_BPartner_ID = data[i].getField("cBpartnerId");
// Cambiar line to reflect BPs
FIN_PaymentDetail paymentDetail =
OBDal.getInstance().get(FIN_PaymentDetail.class,
data[i].getField("FIN_Payment_Detail_ID"));
@@ -580,9 +582,16 @@
:
paymentDetail.getFINPaymentScheduleDetailList().get(0).getOrderPaymentSchedule()
.getOrder().getBusinessPartner().getId();
}
- fact.createLine(line, getAccountBPartner(bpartnerId, as, isReceipt,
isPrepayment, conn),
- C_Currency_ID, !isReceipt ? bpAmount.toString() : "", isReceipt ?
bpAmount.toString() : "",
- Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
+ if (line.cGlItemId != null && !"".equals(line.cGlItemId)) {
+ fact.createLine(line,
getAccountGLItem(OBDal.getInstance().get(GLItem.class, line.cGlItemId),
+ as, isReceipt, conn), C_Currency_ID, (isReceipt ? "" :
bpAmount.toString()),
+ (isReceipt ? bpAmount.toString() : ""), Fact_Acct_Group_ID,
nextSeqNo(SeqNo),
+ DocumentType, conn);
+ } else {
+ fact.createLine(line, getAccountBPartner(bpartnerId, as, isReceipt,
isPrepayment, conn),
+ C_Currency_ID, !isReceipt ? bpAmount.toString() : "", isReceipt ?
bpAmount.toString()
+ : "", Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
+ }
SeqNo = "0";
return fact;
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
