details: /erp/devel/pi/rev/c9ecc9f3821d
changeset: 10157:c9ecc9f3821d
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Wed Jan 26 13:53:13 2011 +0100
summary: Fixes posting of bankstatements
details: /erp/devel/pi/rev/117ed736cce4
changeset: 10158:117ed736cce4
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Wed Jan 26 18:08:41 2011 +0100
summary: Fixes unmatching of transaction with no payment
details: /erp/devel/pi/rev/cd86af3f3207
changeset: 10159:cd86af3f3207
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Thu Jan 27 10:28:26 2011 +0100
summary: Increased description length for matching algorithm + posted button
in BS: now does not trigger autosave
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
| 8 +++++++-
src-db/database/model/tables/FIN_MATCHING_ALGORITHM.xml
| 2 +-
src-db/database/sourcedata/AD_COLUMN.xml
| 4 ++--
src-db/database/sourcedata/AD_FIELD.xml
| 2 +-
src/org/openbravo/erpCommon/ad_forms/DocFINBankStatement.java
| 2 +-
5 files changed, 12 insertions(+), 6 deletions(-)
diffs (75 lines):
diff -r 6059f819fda4 -r cd86af3f3207
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
Thu Jan 27 09:46:19 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
Thu Jan 27 10:28:26 2011 +0100
@@ -411,7 +411,13 @@
finTrans.getFinPayment().setStatus(
(finTrans.getFinPayment().isReceipt()) ? "RDNC" : "PWNC");
}
- finTrans.setStatus((finTrans.getFinPayment().isReceipt()) ? "RDNC" :
"PWNC");
+ boolean isReceipt = false;
+ if (finTrans.getFinPayment() != null) {
+ isReceipt = finTrans.getFinPayment().isReceipt();
+ } else {
+ isReceipt =
finTrans.getDepositAmount().compareTo(finTrans.getPaymentAmount()) > 0;
+ }
+ finTrans.setStatus(isReceipt ? "RDNC" : "PWNC");
finTrans.setReconciliation(null);
OBDal.getInstance().save(finTrans);
OBDal.getInstance().flush();
diff -r 6059f819fda4 -r cd86af3f3207
src-db/database/model/tables/FIN_MATCHING_ALGORITHM.xml
--- a/src-db/database/model/tables/FIN_MATCHING_ALGORITHM.xml Thu Jan 27
09:46:19 2011 +0100
+++ b/src-db/database/model/tables/FIN_MATCHING_ALGORITHM.xml Thu Jan 27
10:28:26 2011 +0100
@@ -37,7 +37,7 @@
<default/>
<onCreateDefault/>
</column>
- <column name="DESCRIPTION" primaryKey="false" required="false"
type="NVARCHAR" size="255" autoIncrement="false">
+ <column name="DESCRIPTION" primaryKey="false" required="false"
type="NVARCHAR" size="2000" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
diff -r 6059f819fda4 -r cd86af3f3207 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Jan 27 09:46:19 2011 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Jan 27 10:28:26 2011 +0100
@@ -266020,7 +266020,7 @@
<!--32A68D6F70BB4D53A8179838640BFAD0-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--32A68D6F70BB4D53A8179838640BFAD0--> <POSITION><![CDATA[20]]></POSITION>
<!--32A68D6F70BB4D53A8179838640BFAD0-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--32A68D6F70BB4D53A8179838640BFAD0--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--32A68D6F70BB4D53A8179838640BFAD0--> <ISAUTOSAVE><![CDATA[N]]></ISAUTOSAVE>
<!--32A68D6F70BB4D53A8179838640BFAD0-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--32A68D6F70BB4D53A8179838640BFAD0--></AD_COLUMN>
@@ -300225,7 +300225,7 @@
<!--828EE0AE7FD65FA1E040007F010067C7-->
<COLUMNNAME><![CDATA[Description]]></COLUMNNAME>
<!--828EE0AE7FD65FA1E040007F010067C7-->
<AD_TABLE_ID><![CDATA[8EABE4230116400FA30CAF1A57BBC579]]></AD_TABLE_ID>
<!--828EE0AE7FD65FA1E040007F010067C7-->
<AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
-<!--828EE0AE7FD65FA1E040007F010067C7-->
<FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--828EE0AE7FD65FA1E040007F010067C7-->
<FIELDLENGTH><![CDATA[2000]]></FIELDLENGTH>
<!--828EE0AE7FD65FA1E040007F010067C7--> <ISKEY><![CDATA[N]]></ISKEY>
<!--828EE0AE7FD65FA1E040007F010067C7--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--828EE0AE7FD65FA1E040007F010067C7-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
diff -r 6059f819fda4 -r cd86af3f3207 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Thu Jan 27 09:46:19 2011 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml Thu Jan 27 10:28:26 2011 +0100
@@ -224047,7 +224047,7 @@
<!--FF6017DC061144718EB362D7DE06A614-->
<AD_TAB_ID><![CDATA[4764AA8524BC4D3DAA9A86181C778595]]></AD_TAB_ID>
<!--FF6017DC061144718EB362D7DE06A614-->
<AD_COLUMN_ID><![CDATA[828EE0AE7FD65FA1E040007F010067C7]]></AD_COLUMN_ID>
<!--FF6017DC061144718EB362D7DE06A614-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--FF6017DC061144718EB362D7DE06A614-->
<DISPLAYLENGTH><![CDATA[255]]></DISPLAYLENGTH>
+<!--FF6017DC061144718EB362D7DE06A614-->
<DISPLAYLENGTH><![CDATA[2000]]></DISPLAYLENGTH>
<!--FF6017DC061144718EB362D7DE06A614--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--FF6017DC061144718EB362D7DE06A614--> <SEQNO><![CDATA[40]]></SEQNO>
<!--FF6017DC061144718EB362D7DE06A614--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
diff -r 6059f819fda4 -r cd86af3f3207
src/org/openbravo/erpCommon/ad_forms/DocFINBankStatement.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINBankStatement.java Thu Jan
27 09:46:19 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINBankStatement.java Thu Jan
27 10:28:26 2011 +0100
@@ -131,7 +131,7 @@
(totalAmount.signum() > 0 ? totalAmount.abs().toString() :
ZERO.toString()), (totalAmount
.signum() < 0 ? totalAmount.abs().toString() : ZERO.toString()),
Fact_Acct_Group_ID,
nextSeqNo(SeqNo), DocumentType, conn);
- fact.createLine(null, getAccount(conn, bst.getAccount(), as,
totalAmount.signum() > 0),
+ fact.createLine(null, getAccount(conn, bst.getAccount(), as,
totalAmount.signum() < 0),
C_Currency_ID,
(totalAmount.signum() < 0 ? totalAmount.abs().toString() :
ZERO.toString()), (totalAmount
.signum() > 0 ? totalAmount.abs().toString() : ZERO.toString()),
Fact_Acct_Group_ID,
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
