details: https://code.openbravo.com/erp/devel/main/rev/0175279b4dbe
changeset: 20177:0175279b4dbe
user: Augusto Mauch <augusto.mauch <at> openbravo.com>
date: Tue Apr 23 10:54:40 2013 +0200
summary: Related to issue 20422: Adds the new Insert Audits fields
This changeset contains all the changes related to the addition of the new
Insert Audits field:
- Creation of the new column in the database
- Changes in the Application Dictionary (AD_COLUMN, AD_FIELD; AD_ELEMENT)
- It is a mandatory column, so it has been created in all AD_TABLES with its
default value ('Y')
details: https://code.openbravo.com/erp/devel/main/rev/d8c6a9c2b6ac
changeset: 20178:d8c6a9c2b6ac
user: Augusto Mauch <augusto.mauch <at> openbravo.com>
date: Tue Apr 23 11:03:37 2013 +0200
summary: Related to issue 20422: Updates the ad_create_audit_triggers SQL
function
The ad_create_audit_triggers SQL function has been updated to use the new
AD_TABLE.ISAUDITINSERTS column,
The behaviour of the triggers when a record is updated or deleted has not been
changed. When a record is inserted, if the ISAUDITINSERTS column of the audit
column is'Y' (default value), the behaviour will be the same as the previous
one. If ISAUDITINSERTS is 'N', then only the key column of the audited table
will be inserted in the audit table.
details: https://code.openbravo.com/erp/devel/main/rev/c33d0871c1d8
changeset: 20179:c33d0871c1d8
user: Augusto Mauch <augusto.mauch <at> openbravo.com>
date: Tue Apr 23 11:08:42 2013 +0200
summary: Related to issue 20422: Updates AD_TABLE_MOD_TRG trigger
The AD_TABLE_MOD_TRG has been updated, so that the Updated column of the table
is not changed if the only modified column is ISFULLYAUDITED or ISAUDITINSERTS.
details: https://code.openbravo.com/erp/devel/main/rev/c0c3d4e9feab
changeset: 20180:c0c3d4e9feab
user: Augusto Mauch <augusto.mauch <at> openbravo.com>
date: Tue Apr 23 11:12:29 2013 +0200
summary: Fixes issue 20422: Updates the AuditTrailPopup to consider show ID
column
The AuditTrailPopup has been updated to show the ID column of the audit table.
This is needed because now if an audited table is flagged as
ISAUDITINSERTS='N', only the ID column of the table will be inserted in the
audit table. Originally the popup did not show the records of the audit table
belonging to its id column.
details: https://code.openbravo.com/erp/devel/main/rev/423380e4f7ea
changeset: 20181:423380e4f7ea
user: David Miguelez <david.miguelez <at> openbravo.com>
date: Tue Apr 23 12:52:24 2013 +0200
summary: Related to Issue 23012: Orders Accounting Tab below Transactions
Tab by Debit and Credit.
details: https://code.openbravo.com/erp/devel/main/rev/e1f39d8fd8c2
changeset: 20182:e1f39d8fd8c2
user: Sandra Huguet <sandra.huguet <at> openbravo.com>
date: Fri Apr 19 15:01:29 2013 +0200
summary: Fixed bug 23593
details: https://code.openbravo.com/erp/devel/main/rev/51ad74e87865
changeset: 20183:51ad74e87865
user: Sandra Huguet <sandra.huguet <at> openbravo.com>
date: Mon Apr 22 13:21:47 2013 +0200
summary: Related to issue 23593
details: https://code.openbravo.com/erp/devel/main/rev/a9de8a0c8af8
changeset: 20184:a9de8a0c8af8
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue Apr 23 13:23:20 2013 +0200
summary: Fixes bug 23110
details: https://code.openbravo.com/erp/devel/main/rev/d4a9088f6a09
changeset: 20185:d4a9088f6a09
user: Augusto Mauch <augusto.mauch <at> openbravo.com>
date: Tue Apr 23 16:14:34 2013 +0200
summary: Fixes issue 23619: P&E grids remember the selection when grid is
sorted
details: https://code.openbravo.com/erp/devel/main/rev/f2798a936ca5
changeset: 20186:f2798a936ca5
user: David Miguelez <david.miguelez <at> openbravo.com>
date: Tue Apr 23 17:26:44 2013 +0200
summary: Fixes Issue 23610. Fixes Query so it retrieves values correctly.
details: https://code.openbravo.com/erp/devel/main/rev/c4cdf13ff45e
changeset: 20187:c4cdf13ff45e
user: David Miguelez <david.miguelez <at> openbravo.com>
date: Thu Apr 18 18:27:14 2013 +0200
summary: Fixes Issue 23584. Creates a new OBUISel_Selector for Element Values.
details: https://code.openbravo.com/erp/devel/main/rev/98249a01fff0
changeset: 20188:98249a01fff0
user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at>
openbravo.com>
date: Thu Apr 18 10:17:54 2013 +0530
summary: Fixes Issue 23540: Combo boxes that load huge data are causing
performance issue
details: https://code.openbravo.com/erp/devel/main/rev/03f22c0f86a0
changeset: 20189:03f22c0f86a0
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue Apr 23 19:28:04 2013 +0200
summary: Fixes bug 23590
details: https://code.openbravo.com/erp/devel/main/rev/4d9fc1600da5
changeset: 20190:4d9fc1600da5
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue Apr 23 21:03:07 2013 +0200
summary: CI: merge back from main
details: https://code.openbravo.com/erp/devel/main/rev/fe669254024a
changeset: 20191:fe669254024a
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Wed Apr 24 00:58:21 2013 +0200
summary: Fixes issue 23235: Wrong selector in Product BOM tab
details: https://code.openbravo.com/erp/devel/main/rev/0136b85e15e3
changeset: 20192:0136b85e15e3
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Wed Apr 24 01:20:49 2013 +0200
summary: Fixes issue 23164: It is possible to create a two price list versions
with same name and same valid from date
details: https://code.openbravo.com/erp/devel/main/rev/53ca1adce250
changeset: 20193:53ca1adce250
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Wed Apr 24 10:27:58 2013 +0200
summary: backout issue issue 23164: It is possible to create a two price list
version with same name and validfrom date
details: https://code.openbravo.com/erp/devel/main/rev/b1183f88c4a6
changeset: 20194:b1183f88c4a6
user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at>
openbravo.com>
date: Tue Apr 23 22:28:03 2013 +0530
summary: Fixes issue 23376: Exchange rate is rounded when adding payment for
a transaction
details: https://code.openbravo.com/erp/devel/main/rev/8add402536e8
changeset: 20195:8add402536e8
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Wed Apr 24 11:48:55 2013 +0200
summary: Adds matching logic for Standard matching algorithm when using
GLItems
details: https://code.openbravo.com/erp/devel/main/rev/ae04c3e9f188
changeset: 20196:ae04c3e9f188
user: Sandra Huguet <sandra.huguet <at> openbravo.com>
date: Thu Apr 18 16:59:28 2013 +0200
summary: Fixed issue 23559 Sample data (F&B client) monthly update
details: https://code.openbravo.com/erp/devel/main/rev/ae68a1eca827
changeset: 20197:ae68a1eca827
user: Sandra Huguet <sandra.huguet <at> openbravo.com>
date: Fri Apr 19 09:35:38 2013 +0200
summary: Fixed issue 23225 Change Profit & Loss structure of F&B International
Change Profit & Loss structure of F&B International and close 2012 year
details: https://code.openbravo.com/erp/devel/main/rev/533959c7261a
changeset: 20198:533959c7261a
user: Sandra Huguet <sandra.huguet <at> openbravo.com>
date: Wed Apr 24 08:59:48 2013 +0200
summary: Fixed bug 23537 Increase the frequency of background processes
details: https://code.openbravo.com/erp/devel/main/rev/ff801b2d25fa
changeset: 20199:ff801b2d25fa
user: Sandra Huguet <sandra.huguet <at> openbravo.com>
date: Wed Apr 24 09:03:13 2013 +0200
summary: Related to bug 23537 Increase the frequency of background processes
details: https://code.openbravo.com/erp/devel/main/rev/9d69821c5afd
changeset: 20200:9d69821c5afd
user: Sandra Huguet <sandra.huguet <at> openbravo.com>
date: Wed Apr 24 12:15:08 2013 +0200
summary: Related to issue 23593
details: https://code.openbravo.com/erp/devel/main/rev/574c4d2cb52c
changeset: 20201:574c4d2cb52c
user: Sandra Huguet <sandra.huguet <at> openbravo.com>
date: Wed Apr 24 12:26:03 2013 +0200
summary: Fixed bug 23425 Uncheck central maintenance in F&B España
details: https://code.openbravo.com/erp/devel/main/rev/9fa1ecafd560
changeset: 20202:9fa1ecafd560
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Apr 25 01:10:32 2013 +0200
summary: CI: update AD_MODULE to version 20201
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
| 2 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
| 2 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml
| 12 +
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
| 2 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml
| 7 +
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml
| 2 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
| 15 +
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
| 31 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/StandardMatchingAlgorithm.java
| 18 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
| 6 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java
| 23 +
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
| 10 +-
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 8 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TABLE.xml
| 13 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
| 2 +-
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TABLE.xml
| 4 +
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_TABLE.xml
| 9 +
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_TABLE.xml
| 3 +
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 10 +-
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_TABLE.xml
| 2 +
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_TABLE.xml
| 1 +
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_TABLE.xml
| 1 +
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 12 +-
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_TABLE.xml
| 4 +
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 24 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 18 +-
referencedata/sampledata/F_B_International_Group.xml
| 1385322 +++++----
src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml
| 11 +-
src-db/database/model/postscript-Oracle.sql
| 14 +
src-db/database/model/postscript-PostgreSql.sql
| 14 +
src-db/database/model/tables/AD_TABLE.xml
| 5 +
src-db/database/model/triggers/AD_TABLE_MOD_TRG.xml
| 2 +-
src-db/database/sourcedata/AD_COLUMN.xml
| 65 +-
src-db/database/sourcedata/AD_ELEMENT.xml
| 14 +
src-db/database/sourcedata/AD_FIELD.xml
| 29 +
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
src-db/database/sourcedata/AD_REFERENCE.xml
| 48 +
src-db/database/sourcedata/AD_TABLE.xml
| 483 +
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
| 63 +
src-db/database/sourcedata/referencedData/AD_PROCESS_REQUEST.xml
| 5 +-
src-util/modulescript/src/org/openbravo/modulescript/UpdateOpenClosePeriodsButton_data.xsql
| 18 +-
src/org/openbravo/erpCommon/businessUtility/AuditTrailPopup.java
| 3 +-
src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility.java
| 4 +-
78 files changed, 728430 insertions(+), 658003 deletions(-)
diffs (truncated from 1463295 to 300 lines):
diff -r 191b774fbb86 -r 9fa1ecafd560
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Mon Apr 22 19:17:06 2013 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Thu Apr 25 01:10:32 2013 +0200
@@ -7878,7 +7878,7 @@
<!--7DFD1BBEC2F60C48E040007F01004674-->
<AD_COLUMN_ID><![CDATA[7DC34559B3F2B45BE040007F0100784A]]></AD_COLUMN_ID>
<!--7DFD1BBEC2F60C48E040007F01004674-->
<IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
<!--7DFD1BBEC2F60C48E040007F01004674-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--7DFD1BBEC2F60C48E040007F01004674-->
<DISPLAYLOGIC><![CDATA[@Processed@='Y' & @Status@!'RPVOID']]></DISPLAYLOGIC>
+<!--7DFD1BBEC2F60C48E040007F01004674-->
<DISPLAYLOGIC><![CDATA[@Processed@='Y' & @Status@!'RPVOID' &
@FIN_Rev_Payment_ID@ = '']]></DISPLAYLOGIC>
<!--7DFD1BBEC2F60C48E040007F01004674-->
<DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
<!--7DFD1BBEC2F60C48E040007F01004674--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--7DFD1BBEC2F60C48E040007F01004674--> <SEQNO><![CDATA[130]]></SEQNO>
diff -r 191b774fbb86 -r 9fa1ecafd560
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
Mon Apr 22 19:17:06 2013 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
Thu Apr 25 01:10:32 2013 +0200
@@ -294,7 +294,7 @@
<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F-->
<VALUE><![CDATA[APRM_PeriodNotAvailableClearedItem]]></VALUE>
-<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <MSGTEXT><![CDATA[The period of the
cleared item (%s) is not open or available.]]></MSGTEXT>
+<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <MSGTEXT><![CDATA[The reconciliation
cannot be completed because it contains one or more items in a closed
period.<BR>The period of the cleared item (%s) is not open or
available.]]></MSGTEXT>
<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F-->
<ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
diff -r 191b774fbb86 -r 9fa1ecafd560
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Mon Apr 22 19:17:06 2013 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Thu Apr 25 01:10:32 2013 +0200
@@ -6,7 +6,7 @@
<!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and
Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.20165]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.20201]]></VERSION>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your
finances with an ERP does not have to be difficult. Enjoy a radically improved
user experience that combines the power of an enterprise grade financial
application with the simplicity and ease of a web 2.0 personal accounting
service.]]></DESCRIPTION>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and
Receivables Management simplifies and automates the business processes around
the management of financial accounts, from the receipt and issue of payment, to
the reconciliation of those events with bank statements.
If you would like to help shape this module you are welcome to take part in
the forum discussions or register feature requests or issues in the
corresponding (Forum and Bug Tracking) sections in the Advanced Payables and
Receivable project in the OB Forge.]]></HELP>
diff -r 191b774fbb86 -r 9fa1ecafd560
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Mon Apr 22 19:17:06 2013 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Thu Apr 25 01:10:32 2013 +0200
@@ -7,7 +7,7 @@
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.20165]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.20201]]></STARTVERSION>
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User
Interface Selector]]></DEPENDANT_MODULE_NAME>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
<!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--B97FC854C6DD41E692161585645A900F-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--B97FC854C6DD41E692161585645A900F-->
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.20165]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.20201]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 191b774fbb86 -r 9fa1ecafd560
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml
Mon Apr 22 19:17:06 2013 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml
Thu Apr 25 01:10:32 2013 +0200
@@ -157,6 +157,18 @@
<!--DB71FC312327430EAEACF42918405BF9-->
<ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
<!--DB71FC312327430EAEACF42918405BF9--></AD_REFERENCE>
+<!--E1C0B1C7D7C84E85903409A39A53E855--><AD_REFERENCE>
+<!--E1C0B1C7D7C84E85903409A39A53E855-->
<AD_REFERENCE_ID><![CDATA[E1C0B1C7D7C84E85903409A39A53E855]]></AD_REFERENCE_ID>
+<!--E1C0B1C7D7C84E85903409A39A53E855-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E1C0B1C7D7C84E85903409A39A53E855--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E1C0B1C7D7C84E85903409A39A53E855--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E1C0B1C7D7C84E85903409A39A53E855--> <NAME><![CDATA[FIN_Payment no
combo]]></NAME>
+<!--E1C0B1C7D7C84E85903409A39A53E855-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--E1C0B1C7D7C84E85903409A39A53E855-->
<ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--E1C0B1C7D7C84E85903409A39A53E855-->
<PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID>
+<!--E1C0B1C7D7C84E85903409A39A53E855-->
<ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--E1C0B1C7D7C84E85903409A39A53E855--></AD_REFERENCE>
+
<!--E91B038ABF4F4A2280264C4A475852A4--><AD_REFERENCE>
<!--E91B038ABF4F4A2280264C4A475852A4-->
<AD_REFERENCE_ID><![CDATA[E91B038ABF4F4A2280264C4A475852A4]]></AD_REFERENCE_ID>
<!--E91B038ABF4F4A2280264C4A475852A4-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 191b774fbb86 -r 9fa1ecafd560
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
Mon Apr 22 19:17:06 2013 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
Thu Apr 25 01:10:32 2013 +0200
@@ -85,7 +85,7 @@
<!--2A9BA5FDA0F8470D881F8EA9DEDCC598--> <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
<!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--2A9BA5FDA0F8470D881F8EA9DEDCC598--> <UIPATTERN><![CDATA[RO]]></UIPATTERN>
-<!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->
<HQLORDERBYCLAUSE><![CDATA[-accountingDate,financialAccountTransaction,groupID,-sequenceNumber]]></HQLORDERBYCLAUSE>
+<!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->
<HQLORDERBYCLAUSE><![CDATA[accountingSchema.name, accountingDate, abs(debit)
desc, credit desc, value]]></HQLORDERBYCLAUSE>
<!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->
<SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
<!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->
<EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
<!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->
<EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
diff -r 191b774fbb86 -r 9fa1ecafd560
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml
Mon Apr 22 19:17:06 2013 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml
Thu Apr 25 01:10:32 2013 +0200
@@ -19,6 +19,7 @@
<!--0DFF5BACFB964FDABAA5042C8809C813-->
<ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
<!--0DFF5BACFB964FDABAA5042C8809C813-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--0DFF5BACFB964FDABAA5042C8809C813-->
<AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
+<!--0DFF5BACFB964FDABAA5042C8809C813-->
<ISAUDITINSERTS><![CDATA[Y]]></ISAUDITINSERTS>
<!--0DFF5BACFB964FDABAA5042C8809C813--></AD_TABLE>
<!--1BAA61D216CB4A62838AA785658EE092--><AD_TABLE>
@@ -42,6 +43,7 @@
<!--1BAA61D216CB4A62838AA785658EE092-->
<ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
<!--1BAA61D216CB4A62838AA785658EE092-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--1BAA61D216CB4A62838AA785658EE092-->
<AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
+<!--1BAA61D216CB4A62838AA785658EE092-->
<ISAUDITINSERTS><![CDATA[Y]]></ISAUDITINSERTS>
<!--1BAA61D216CB4A62838AA785658EE092--></AD_TABLE>
<!--5AAFAB80FB6740D2A6190CB3939D90EC--><AD_TABLE>
@@ -63,6 +65,7 @@
<!--5AAFAB80FB6740D2A6190CB3939D90EC-->
<ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
<!--5AAFAB80FB6740D2A6190CB3939D90EC-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--5AAFAB80FB6740D2A6190CB3939D90EC-->
<AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
+<!--5AAFAB80FB6740D2A6190CB3939D90EC-->
<ISAUDITINSERTS><![CDATA[Y]]></ISAUDITINSERTS>
<!--5AAFAB80FB6740D2A6190CB3939D90EC--></AD_TABLE>
<!--DC814AB3BC84486CA5411131724BC95A--><AD_TABLE>
@@ -84,6 +87,7 @@
<!--DC814AB3BC84486CA5411131724BC95A-->
<ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
<!--DC814AB3BC84486CA5411131724BC95A-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--DC814AB3BC84486CA5411131724BC95A-->
<AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
+<!--DC814AB3BC84486CA5411131724BC95A-->
<ISAUDITINSERTS><![CDATA[Y]]></ISAUDITINSERTS>
<!--DC814AB3BC84486CA5411131724BC95A--></AD_TABLE>
<!--FF8080812FFEC82D012FFECCE3400030--><AD_TABLE>
@@ -105,6 +109,7 @@
<!--FF8080812FFEC82D012FFECCE3400030-->
<ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
<!--FF8080812FFEC82D012FFECCE3400030-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--FF8080812FFEC82D012FFECCE3400030-->
<AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
+<!--FF8080812FFEC82D012FFECCE3400030-->
<ISAUDITINSERTS><![CDATA[Y]]></ISAUDITINSERTS>
<!--FF8080812FFEC82D012FFECCE3400030--></AD_TABLE>
<!--FF80808130BB89090130BB8E3D7E0012--><AD_TABLE>
@@ -128,6 +133,7 @@
<!--FF80808130BB89090130BB8E3D7E0012-->
<ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
<!--FF80808130BB89090130BB8E3D7E0012-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--FF80808130BB89090130BB8E3D7E0012-->
<AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
+<!--FF80808130BB89090130BB8E3D7E0012-->
<ISAUDITINSERTS><![CDATA[Y]]></ISAUDITINSERTS>
<!--FF80808130BB89090130BB8E3D7E0012--></AD_TABLE>
<!--FF808081331848750133184B38D20009--><AD_TABLE>
@@ -148,6 +154,7 @@
<!--FF808081331848750133184B38D20009-->
<ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
<!--FF808081331848750133184B38D20009-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--FF808081331848750133184B38D20009-->
<AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
+<!--FF808081331848750133184B38D20009-->
<ISAUDITINSERTS><![CDATA[Y]]></ISAUDITINSERTS>
<!--FF808081331848750133184B38D20009--></AD_TABLE>
</data>
diff -r 191b774fbb86 -r 9fa1ecafd560
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml
Mon Apr 22 19:17:06 2013 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml
Thu Apr 25 01:10:32 2013 +0200
@@ -51,7 +51,7 @@
<!--575E470ABADB4C278132C957A78C47E3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--575E470ABADB4C278132C957A78C47E3--> <NAME><![CDATA[Process Payment valid
actions]]></NAME>
<!--575E470ABADB4C278132C957A78C47E3--> <TYPE><![CDATA[S]]></TYPE>
-<!--575E470ABADB4C278132C957A78C47E3-->
<CODE><![CDATA[((@EM_APRM_Process_Payment@ = 'P' AND AD_Ref_List.value='P') OR
(@EM_APRM_Process_Payment@ in ('R','RE') AND AD_Ref_List.value IN ('RE','R'))
OR (@EM_APRM_Process_Payment@ in ('R','RE') AND AD_Ref_List.value IN ('V') AND
@Status@='RPAE') OR (@EM_APRM_Process_Payment@ is null)) AND
AD_Ref_List.IsActive = 'Y']]></CODE>
+<!--575E470ABADB4C278132C957A78C47E3-->
<CODE><![CDATA[((@EM_APRM_Process_Payment@ = 'P' AND AD_Ref_List.value='P') OR
(@EM_APRM_Process_Payment@ in ('R','RE') AND AD_Ref_List.value IN ('RE','R')
AND NOT EXISTS (SELECT 1 FROM FIN_PAYMENT WHERE FIN_Rev_Payment_ID =
@FIN_Payment_ID@)) OR (@EM_APRM_Process_Payment@ in ('R','RE') AND
AD_Ref_List.value IN ('R') AND EXISTS (SELECT 1 FROM FIN_PAYMENT WHERE
FIN_Rev_Payment_ID = @FIN_Payment_ID@)) OR (@EM_APRM_Process_Payment@ in
('R','RE') AND AD_Ref_List.value IN ('V') AND @Status@='RPAE') OR
(@EM_APRM_Process_Payment@ is null)) AND AD_Ref_List.IsActive = 'Y']]></CODE>
<!--575E470ABADB4C278132C957A78C47E3-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--575E470ABADB4C278132C957A78C47E3--></AD_VAL_RULE>
diff -r 191b774fbb86 -r 9fa1ecafd560
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
Mon Apr 22 19:17:06 2013 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
Thu Apr 25 01:10:32 2013 +0200
@@ -38,6 +38,21 @@
<!--9FAD469CE4414A25974CF45C0AD22D35-->
<CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
<!--9FAD469CE4414A25974CF45C0AD22D35--></OBUISEL_SELECTOR>
+<!--A021037EAFFA49D299E4B6886E6A811C--><OBUISEL_SELECTOR>
+<!--A021037EAFFA49D299E4B6886E6A811C-->
<OBUISEL_SELECTOR_ID><![CDATA[A021037EAFFA49D299E4B6886E6A811C]]></OBUISEL_SELECTOR_ID>
+<!--A021037EAFFA49D299E4B6886E6A811C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A021037EAFFA49D299E4B6886E6A811C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A021037EAFFA49D299E4B6886E6A811C-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A021037EAFFA49D299E4B6886E6A811C--> <NAME><![CDATA[FIN_Payment no
combo]]></NAME>
+<!--A021037EAFFA49D299E4B6886E6A811C-->
<AD_REFERENCE_ID><![CDATA[E1C0B1C7D7C84E85903409A39A53E855]]></AD_REFERENCE_ID>
+<!--A021037EAFFA49D299E4B6886E6A811C-->
<AD_TABLE_ID><![CDATA[D1A97202E832470285C9B1EB026D54E2]]></AD_TABLE_ID>
+<!--A021037EAFFA49D299E4B6886E6A811C-->
<OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
+<!--A021037EAFFA49D299E4B6886E6A811C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A021037EAFFA49D299E4B6886E6A811C-->
<SUGGESTIONTEXTMATCHSTYLE><![CDATA[substring]]></SUGGESTIONTEXTMATCHSTYLE>
+<!--A021037EAFFA49D299E4B6886E6A811C-->
<POPUPTEXTMATCHSTYLE><![CDATA[substring]]></POPUPTEXTMATCHSTYLE>
+<!--A021037EAFFA49D299E4B6886E6A811C-->
<CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
+<!--A021037EAFFA49D299E4B6886E6A811C--></OBUISEL_SELECTOR>
+
<!--A98899B1C75A4F4EBD3414F1B654EFAB--><OBUISEL_SELECTOR>
<!--A98899B1C75A4F4EBD3414F1B654EFAB-->
<OBUISEL_SELECTOR_ID><![CDATA[A98899B1C75A4F4EBD3414F1B654EFAB]]></OBUISEL_SELECTOR_ID>
<!--A98899B1C75A4F4EBD3414F1B654EFAB-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 191b774fbb86 -r 9fa1ecafd560
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
Mon Apr 22 19:17:06 2013 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
Thu Apr 25 01:10:32 2013 +0200
@@ -40,6 +40,7 @@
import org.openbravo.advpaymentmngt.dao.MatchTransactionDao;
import org.openbravo.advpaymentmngt.dao.TransactionsDao;
import org.openbravo.advpaymentmngt.process.FIN_AddPayment;
+import org.openbravo.advpaymentmngt.process.FIN_ReconciliationProcess;
import org.openbravo.advpaymentmngt.process.FIN_TransactionProcess;
import org.openbravo.advpaymentmngt.utility.FIN_MatchedTransaction;
import org.openbravo.advpaymentmngt.utility.FIN_MatchingTransaction;
@@ -317,12 +318,21 @@
.getBankStatementLineMaxDate(financialAccount));
reconciliation.setTransactionDate(MatchTransactionDao
.getBankStatementLineMaxDate(financialAccount));
- reconciliation.setProcessed(process);
- reconciliation.setDocumentStatus(process ? "CO" : "DR");
- reconciliation.setAPRMProcessReconciliation(process ? "R" : "P");
- reconciliation.setAprmProcessRec(process ? "R" : "P");
+ if (!process) {
+ reconciliation.setProcessed(false);
+ reconciliation.setDocumentStatus("DR");
+ reconciliation.setAPRMProcessReconciliation("P");
+ reconciliation.setAprmProcessRec("P");
+ }
OBDal.getInstance().save(reconciliation);
OBDal.getInstance().flush();
+ if (process) {
+ // Process Reconciliation
+ OBError myError = processReconciliation(this, "P", reconciliation);
+ if (myError != null && myError.getType().equalsIgnoreCase("error")) {
+ throw new OBException(myError.getMessage());
+ }
+ }
} catch (Exception ex) {
OBError menssage = Utility.translateError(this, vars,
vars.getLanguage(), ex.getMessage());
vars.setMessage(strTabId, menssage);
@@ -1267,6 +1277,19 @@
return false;
}
+ private OBError processReconciliation(ConnectionProvider conn, String
strAction,
+ FIN_Reconciliation reconciliation) throws Exception {
+ ProcessBundle pb = new ProcessBundle("FF8080812E2F8EAE012E2F94CF470014",
vars).init(conn);
+ HashMap<String, Object> parameters = new HashMap<String, Object>();
+ parameters.put("action", strAction);
+ parameters.put("FIN_Reconciliation_ID", reconciliation.getId());
+ pb.setParams(parameters);
+ OBError myMessage = null;
+ new FIN_ReconciliationProcess().execute(pb);
+ myMessage = (OBError) pb.getResult();
+ return myMessage;
+ }
+
public String getServletInfo() {
return "This servlet match imported bank statement lines for a financial
account";
}
diff -r 191b774fbb86 -r 9fa1ecafd560
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/StandardMatchingAlgorithm.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/StandardMatchingAlgorithm.java
Mon Apr 22 19:17:06 2013 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/StandardMatchingAlgorithm.java
Thu Apr 25 01:10:32 2013 +0200
@@ -19,6 +19,7 @@
package org.openbravo.advpaymentmngt.algorithm;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -41,7 +42,22 @@
Date transactionDate = (algorithm.isMatchtransactiondate()) ?
line.getTransactionDate() : null;
String reference = (algorithm.isMatchreference()) ? line.getReferenceNo()
: "";
- List<FIN_FinaccTransaction> transactions;
+ List<FIN_FinaccTransaction> transactions = new
ArrayList<FIN_FinaccTransaction>();
+ if (line.getGLItem() != null) {
+ transactions =
MatchTransactionDao.getMatchingGLItemTransaction(line.getBankStatement()
+ .getAccount().getId(), line.getGLItem(), line.getTransactionDate(),
+ (line.getCramount().subtract(line.getDramount())), excluded);
+ if (transactions.isEmpty()) {
+ transactions =
MatchTransactionDao.getMatchingGLItemTransaction(line.getBankStatement()
+ .getAccount().getId(), line.getGLItem(), null,
+ (line.getCramount().subtract(line.getDramount())), excluded);
+ if (!transactions.isEmpty()) {
+ return new FIN_MatchedTransaction(transactions.get(0),
FIN_MatchedTransaction.WEAK);
+ }
+ } else {
+ return new FIN_MatchedTransaction(transactions.get(0),
FIN_MatchedTransaction.STRONG);
+ }
+ }
if (algorithm.isMatchbpname()) {
transactions =
MatchTransactionDao.getMatchingFinancialTransaction(line.getBankStatement()
.getAccount().getId(), transactionDate, reference,
diff -r 191b774fbb86 -r 9fa1ecafd560
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
Mon Apr 22 19:17:06 2013 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
Thu Apr 25 01:10:32 2013 +0200
@@ -604,7 +604,7 @@
return;
}
// Reverse Payment
- if (FIN_Utility.isReversePayment(payment)) {
+ if (strAction.equals("RE") && FIN_Utility.isReversePayment(payment)) {
msg.setType("Error");
msg.setTitle(Utility.messageBD(conProvider, "Error", language));
msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
@@ -793,6 +793,10 @@
&& BigDecimal.ZERO.compareTo(psd.getWriteoffAmount()) == 0) {
paymentDetail.getFINPaymentScheduleDetailList().remove(psd);
OBDal.getInstance().getSession().refresh(paymentDetail);
+ psd.getInvoicePaymentSchedule()
+
.getFINPaymentScheduleDetailInvoicePaymentScheduleList().remove(psd);
+
psd.getOrderPaymentSchedule().getFINPaymentScheduleDetailOrderPaymentScheduleList()
+ .remove(psd);
OBDal.getInstance().remove(psd);
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
