details: /erp/devel/pi/rev/b7e7d64488f5
changeset: 12577:b7e7d64488f5
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue May 31 21:18:22 2011 +0200
summary: CI: update AD_MODULE to version 12565
details: /erp/devel/pi/rev/ffc24c6b1780
changeset: 12578:ffc24c6b1780
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue May 31 21:35:20 2011 +0200
summary: CI: merge back from main
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
| 15 +-
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_PROCESS.xml
| 8 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
| 6 +-
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_PREFERENCE.xml
| 6 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
| 1 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 21 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
| 4 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js
| 4 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
| 4 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
| 29 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
| 6 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js
| 7 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js
| 9 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quickrun-widget.js
| 9 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
| 36 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-keyboard-manager.js
| 36 +
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.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.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.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.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.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
| 14 +-
src-db/database/sourcedata/AD_FIELD.xml
| 467 ++++++++++
src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
| 173 ++-
src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java
| 99 +-
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java
| 247 +++-
57 files changed, 1034 insertions(+), 301 deletions(-)
diffs (truncated from 5962 to 300 lines):
diff -r 6f30131e9922 -r ffc24c6b1780
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Tue May 31 14:05:20 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Tue May 31 21:35:20 2011 +0200
@@ -1365,6 +1365,7 @@
<!--576653206CA64C59BF19A53B94AEDBA8-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--576653206CA64C59BF19A53B94AEDBA8-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--576653206CA64C59BF19A53B94AEDBA8--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--576653206CA64C59BF19A53B94AEDBA8--> <SEQNO><![CDATA[160]]></SEQNO>
<!--576653206CA64C59BF19A53B94AEDBA8--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--576653206CA64C59BF19A53B94AEDBA8-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--576653206CA64C59BF19A53B94AEDBA8-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -1524,6 +1525,7 @@
<!--5E7451300D254B11B582F0FBA8F11D2A-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--5E7451300D254B11B582F0FBA8F11D2A-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--5E7451300D254B11B582F0FBA8F11D2A--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--5E7451300D254B11B582F0FBA8F11D2A--> <SEQNO><![CDATA[170]]></SEQNO>
<!--5E7451300D254B11B582F0FBA8F11D2A--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--5E7451300D254B11B582F0FBA8F11D2A-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--5E7451300D254B11B582F0FBA8F11D2A-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -2040,6 +2042,7 @@
<!--6D4222062B0040F0879E23FBC99CE55B-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--6D4222062B0040F0879E23FBC99CE55B-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--6D4222062B0040F0879E23FBC99CE55B--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6D4222062B0040F0879E23FBC99CE55B--> <SEQNO><![CDATA[180]]></SEQNO>
<!--6D4222062B0040F0879E23FBC99CE55B--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--6D4222062B0040F0879E23FBC99CE55B-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--6D4222062B0040F0879E23FBC99CE55B-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -3310,6 +3313,7 @@
<!--81B33EDA88214F5DA19A5557B12857A2-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--81B33EDA88214F5DA19A5557B12857A2-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--81B33EDA88214F5DA19A5557B12857A2--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--81B33EDA88214F5DA19A5557B12857A2--> <SEQNO><![CDATA[190]]></SEQNO>
<!--81B33EDA88214F5DA19A5557B12857A2--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--81B33EDA88214F5DA19A5557B12857A2-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--81B33EDA88214F5DA19A5557B12857A2-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -3813,7 +3817,7 @@
<!--82F2E8A160DB472CE040007F01005324-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--82F2E8A160DB472CE040007F01005324--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--82F2E8A160DB472CE040007F01005324--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--82F2E8A160DB472CE040007F01005324--> <NAME><![CDATA[Print Reconciliation
Detail Report]]></NAME>
+<!--82F2E8A160DB472CE040007F01005324--> <NAME><![CDATA[Reconciliation
Details]]></NAME>
<!--82F2E8A160DB472CE040007F01005324-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--82F2E8A160DB472CE040007F01005324-->
<AD_TAB_ID><![CDATA[C095D2CC39704DBE8B906B7CD7710968]]></AD_TAB_ID>
<!--82F2E8A160DB472CE040007F01005324-->
<AD_COLUMN_ID><![CDATA[82EFB8E4045119C9E040007F01003778]]></AD_COLUMN_ID>
@@ -3837,7 +3841,7 @@
<!--82F2E8A160DC472CE040007F01005324-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--82F2E8A160DC472CE040007F01005324--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--82F2E8A160DC472CE040007F01005324--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--82F2E8A160DC472CE040007F01005324--> <NAME><![CDATA[Print Reconciliation
Summary Report]]></NAME>
+<!--82F2E8A160DC472CE040007F01005324--> <NAME><![CDATA[Reconciliation
Summary]]></NAME>
<!--82F2E8A160DC472CE040007F01005324-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--82F2E8A160DC472CE040007F01005324-->
<AD_TAB_ID><![CDATA[C095D2CC39704DBE8B906B7CD7710968]]></AD_TAB_ID>
<!--82F2E8A160DC472CE040007F01005324-->
<AD_COLUMN_ID><![CDATA[82EFB8E4045219C9E040007F01003778]]></AD_COLUMN_ID>
@@ -5432,6 +5436,7 @@
<!--970254B3E03D4A009FE4BF179AC61703-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--970254B3E03D4A009FE4BF179AC61703-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--970254B3E03D4A009FE4BF179AC61703--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--970254B3E03D4A009FE4BF179AC61703--> <SEQNO><![CDATA[200]]></SEQNO>
<!--970254B3E03D4A009FE4BF179AC61703--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--970254B3E03D4A009FE4BF179AC61703-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--970254B3E03D4A009FE4BF179AC61703-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -5604,7 +5609,7 @@
<!--A0417A0E9254CA28E040007F01003C18-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--A0417A0E9254CA28E040007F01003C18--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--A0417A0E9254CA28E040007F01003C18--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A0417A0E9254CA28E040007F01003C18--> <NAME><![CDATA[Import Bank
Statement]]></NAME>
+<!--A0417A0E9254CA28E040007F01003C18--> <NAME><![CDATA[Import
Statement]]></NAME>
<!--A0417A0E9254CA28E040007F01003C18-->
<DESCRIPTION><![CDATA[ImportBankFile]]></DESCRIPTION>
<!--A0417A0E9254CA28E040007F01003C18-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--A0417A0E9254CA28E040007F01003C18-->
<AD_TAB_ID><![CDATA[2845D761A8394468BD3BA4710AA888D4]]></AD_TAB_ID>
@@ -5630,7 +5635,7 @@
<!--A0417A0E9255CA28E040007F01003C18-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--A0417A0E9255CA28E040007F01003C18--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--A0417A0E9255CA28E040007F01003C18--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A0417A0E9255CA28E040007F01003C18--> <NAME><![CDATA[Match Using Imported
Bank Statement]]></NAME>
+<!--A0417A0E9255CA28E040007F01003C18--> <NAME><![CDATA[Match
Statement]]></NAME>
<!--A0417A0E9255CA28E040007F01003C18-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--A0417A0E9255CA28E040007F01003C18-->
<AD_TAB_ID><![CDATA[2845D761A8394468BD3BA4710AA888D4]]></AD_TAB_ID>
<!--A0417A0E9255CA28E040007F01003C18-->
<AD_COLUMN_ID><![CDATA[A04179EAC69DF848E040007F01004523]]></AD_COLUMN_ID>
@@ -6458,6 +6463,7 @@
<!--A37C70FE6BA1C015E040007F01006DF4-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--A37C70FE6BA1C015E040007F01006DF4-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--A37C70FE6BA1C015E040007F01006DF4--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--A37C70FE6BA1C015E040007F01006DF4--> <SEQNO><![CDATA[180]]></SEQNO>
<!--A37C70FE6BA1C015E040007F01006DF4--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--A37C70FE6BA1C015E040007F01006DF4-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--A37C70FE6BA1C015E040007F01006DF4-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -7952,6 +7958,7 @@
<!--E4755F06568943EAABB510542A7159A4-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--E4755F06568943EAABB510542A7159A4-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--E4755F06568943EAABB510542A7159A4--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--E4755F06568943EAABB510542A7159A4--> <SEQNO><![CDATA[120]]></SEQNO>
<!--E4755F06568943EAABB510542A7159A4--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--E4755F06568943EAABB510542A7159A4-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--E4755F06568943EAABB510542A7159A4-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
diff -r 6f30131e9922 -r ffc24c6b1780
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Tue May 31 14:05:20 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Tue May 31 21:35:20 2011 +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.12549]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.12565]]></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 6f30131e9922 -r ffc24c6b1780
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
Tue May 31 14:05:20 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue May 31 21:35:20 2011 +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.12549]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.12565]]></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.12549]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.12565]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 6f30131e9922 -r ffc24c6b1780
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml
Tue May 31 14:05:20 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml
Tue May 31 21:35:20 2011 +0200
@@ -45,7 +45,7 @@
<!--3C4A5FB206B74C3CA9FE20116FCA0464--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--3C4A5FB206B74C3CA9FE20116FCA0464--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--3C4A5FB206B74C3CA9FE20116FCA0464-->
<VALUE><![CDATA[APRM_ReconciliationDetailReport]]></VALUE>
-<!--3C4A5FB206B74C3CA9FE20116FCA0464--> <NAME><![CDATA[Print Reconciliation
Detail Report]]></NAME>
+<!--3C4A5FB206B74C3CA9FE20116FCA0464--> <NAME><![CDATA[Reconciliation
Details]]></NAME>
<!--3C4A5FB206B74C3CA9FE20116FCA0464-->
<ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
<!--3C4A5FB206B74C3CA9FE20116FCA0464-->
<ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
<!--3C4A5FB206B74C3CA9FE20116FCA0464--> <ISREPORT><![CDATA[N]]></ISREPORT>
@@ -138,7 +138,7 @@
<!--7AC7BE9024E448A0BB863C159DA762F9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--7AC7BE9024E448A0BB863C159DA762F9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--7AC7BE9024E448A0BB863C159DA762F9-->
<VALUE><![CDATA[APRM_ImportBankFile]]></VALUE>
-<!--7AC7BE9024E448A0BB863C159DA762F9--> <NAME><![CDATA[Import Bank
Statement]]></NAME>
+<!--7AC7BE9024E448A0BB863C159DA762F9--> <NAME><![CDATA[Import
Statement]]></NAME>
<!--7AC7BE9024E448A0BB863C159DA762F9-->
<DESCRIPTION><![CDATA[ImportBankFile]]></DESCRIPTION>
<!--7AC7BE9024E448A0BB863C159DA762F9-->
<ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
<!--7AC7BE9024E448A0BB863C159DA762F9-->
<ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
@@ -176,7 +176,7 @@
<!--BBA11D1A061346459AF6148920FE6629--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--BBA11D1A061346459AF6148920FE6629--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--BBA11D1A061346459AF6148920FE6629-->
<VALUE><![CDATA[APRM_ReconciliationSummaryReport]]></VALUE>
-<!--BBA11D1A061346459AF6148920FE6629--> <NAME><![CDATA[Print Reconciliation
Summary Report]]></NAME>
+<!--BBA11D1A061346459AF6148920FE6629--> <NAME><![CDATA[Reconciliation
Summary]]></NAME>
<!--BBA11D1A061346459AF6148920FE6629-->
<ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
<!--BBA11D1A061346459AF6148920FE6629-->
<ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
<!--BBA11D1A061346459AF6148920FE6629--> <ISREPORT><![CDATA[N]]></ISREPORT>
@@ -194,7 +194,7 @@
<!--C125EA7C85234D8B89FEA511FCCD2E9E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--C125EA7C85234D8B89FEA511FCCD2E9E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--C125EA7C85234D8B89FEA511FCCD2E9E-->
<VALUE><![CDATA[APRM_MatchTransaction]]></VALUE>
-<!--C125EA7C85234D8B89FEA511FCCD2E9E--> <NAME><![CDATA[Match Using Imported
Bank Statement]]></NAME>
+<!--C125EA7C85234D8B89FEA511FCCD2E9E--> <NAME><![CDATA[Match
Statement]]></NAME>
<!--C125EA7C85234D8B89FEA511FCCD2E9E-->
<ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
<!--C125EA7C85234D8B89FEA511FCCD2E9E-->
<ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
<!--C125EA7C85234D8B89FEA511FCCD2E9E--> <ISREPORT><![CDATA[N]]></ISREPORT>
diff -r 6f30131e9922 -r ffc24c6b1780
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 May 31 14:05:20 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
Tue May 31 21:35:20 2011 +0200
@@ -107,7 +107,11 @@
newBankStatement.setDocumentType(doc);
newBankStatement.setDocumentNo(documentNo);
newBankStatement.setOrganization(financialAccount.getOrganization());
- newBankStatement.setName((documentNo + " - " + filename).substring(0, 60));
+ String name = documentNo + " - " + filename;
+ if (name.length() > 60) {
+ name = name.substring(0, 60);
+ }
+ newBankStatement.setName(name);
newBankStatement.setImportdate(new Date());
newBankStatement.setTransactionDate(new Date());
newBankStatement.setFileName(filename);
diff -r 6f30131e9922 -r ffc24c6b1780
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Tue May 31 14:05:20 2011 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Tue May 31 21:35:20 2011 +0200
@@ -6,7 +6,7 @@
<!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.12549]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.12565]]></VERSION>
<!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss
Weld]]></DESCRIPTION>
<!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss
Weld framework: Java Contexts and Dependency Injection for the Java EE platform
(CDI). For more information see http://seamframework.org/Weld]]></HELP>
<!--C70732EA90A14EC0916078B85CC33D2D-->
<URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
diff -r 6f30131e9922 -r ffc24c6b1780
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue May 31 14:05:20 2011 +0200
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue May 31 21:35:20 2011 +0200
@@ -7,7 +7,7 @@
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.12549]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.12565]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 6f30131e9922 -r ffc24c6b1780
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Tue May 31 14:05:20 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Tue May 31 21:35:20 2011 +0200
@@ -6,7 +6,7 @@
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface
Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.12549]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.12565]]></VERSION>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the
main application components for the openbravo user interface]]></DESCRIPTION>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main
application components for the openbravo user interface. The main layout
incorporates a navigation bar and a main view area.]]></HELP>
<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>
diff -r 6f30131e9922 -r ffc24c6b1780
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue May 31 14:05:20 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue May 31 21:35:20 2011 +0200
@@ -7,7 +7,7 @@
<!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--15D7CE8D95D043189162DBABA54A1F61-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--15D7CE8D95D043189162DBABA54A1F61-->
<AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.12549]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.12565]]></STARTVERSION>
<!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON
Datasource]]></DEPENDANT_MODULE_NAME>
<!--15D7CE8D95D043189162DBABA54A1F61-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
<!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--60A170212F36499D83B8AD38D01F46B3-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--60A170212F36499D83B8AD38D01F46B3-->
<AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.12549]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.12565]]></STARTVERSION>
<!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User
Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
<!--60A170212F36499D83B8AD38D01F46B3-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
<!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--824D60CB352E4099B1D8C903CA139DAE-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--824D60CB352E4099B1D8C903CA139DAE-->
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.12549]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.12565]]></STARTVERSION>
<!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--824D60CB352E4099B1D8C903CA139DAE-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--824D60CB352E4099B1D8C903CA139DAE-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.12549]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.12565]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 6f30131e9922 -r ffc24c6b1780
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
Tue May 31 14:05:20 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
Tue May 31 21:35:20 2011 +0200
@@ -18,8 +18,10 @@
<!--5EE6D055A7FE4C4DA7EB557F6C61D0EA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--5EE6D055A7FE4C4DA7EB557F6C61D0EA--> <VALUE><![CDATA[[
{"id": "TabSet_closeAllTabs", "keyComb": {"ctrl": true, "alt": true, "key":
"0"}},
- {"id": "TabSet_ActivateRightTab", "keyComb": {"ctrl": true, "alt": true,
"key": "+"}},
- {"id": "TabSet_ActivateLeftTab", "keyComb": {"ctrl": true, "alt": true,
"key": "-"}},
+ {"id": "TabSet_ActivateParentTab", "keyComb": {"alt": true, "shift": true,
"key": "Arrow_Up"}},
+ {"id": "TabSet_ActivateChildTab", "keyComb": {"alt": true, "shift": true,
"key": "Arrow_Down"}},
+ {"id": "TabSet_ActivateLeftTab", "keyComb": {"alt": true, "shift": true,
"key": "Arrow_Left"}},
+ {"id": "TabSet_ActivateRightTab", "keyComb": {"alt": true, "shift": true,
"key": "Arrow_Right"}},
{"id": "Grid_EditInForm", "keyComb": {"ctrl": true, "alt": false, "key":
"f2"}},
{"id": "Grid_EditInGrid", "keyComb": {"ctrl": false, "alt": false, "key":
"f2"}}
]]]></VALUE>
diff -r 6f30131e9922 -r ffc24c6b1780
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
Tue May 31 14:05:20 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
Tue May 31 21:35:20 2011 +0200
@@ -18,6 +18,7 @@
*/
isc.OBViewGrid.create({
+ uiPattern: '${data.uiPattern}',
fields:[
<#list data.fields as field>
{
diff -r 6f30131e9922 -r ffc24c6b1780
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Tue May 31 14:05:20 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Tue May 31 21:35:20 2011 +0200
@@ -132,7 +132,7 @@
List<String> lastfieldChanged = new ArrayList<String>();
List<String> changeEventCols = new ArrayList<String>();
Map<String, List<String>> columnsInValidation = new HashMap<String,
List<String>>();
- List<String> calloutMessages = new ArrayList<String>();
+ List<JSONObject> calloutMessages = new ArrayList<JSONObject>();
List<String> jsExcuteCode = new ArrayList<String>();
log.debug("Form Initialization Component Execution. Tab Name: " +
tab.getWindow().getName()
@@ -313,7 +313,7 @@
}
------------------------------------------------------------------------------
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
