details: /erp/devel/main/rev/6bc33d84f6dd
changeset: 11406:6bc33d84f6dd
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Mon Mar 21 09:59:15 2011 +0100
summary: Fixed issue 16392. @#Date@ defaults will be computed correctly in
case of non-standard date format
details: /erp/devel/main/rev/e3a7846219dd
changeset: 11407:e3a7846219dd
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Mar 22 15:09:17 2011 +0100
summary: Fixed issue 16422. dump/restore will no longer cause ad_db_modified
to detect non-existant db structure changes
details: /erp/devel/main/rev/dc872f8eff36
changeset: 11408:dc872f8eff36
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Thu Mar 24 23:16:40 2011 +0100
summary: Fixes bug 0016472: Cannot enter a process plan version. Tab gets
blocked
details: /erp/devel/main/rev/84898045cc70
changeset: 11409:84898045cc70
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Fri Mar 25 13:09:44 2011 +0100
summary: Fixes bug 0016486
details: /erp/devel/main/rev/5f47e83fbcb3
changeset: 11410:5f47e83fbcb3
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Mar 30 18:53:13 2011 +0200
summary: Update AD_MODULE version to 3.0RC5.1
details: /erp/devel/main/rev/290cb79e7e1b
changeset: 11411:290cb79e7e1b
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Mar 30 18:53:16 2011 +0200
summary: Added tag 3.0RC5.1 for changeset 5f47e83fbcb3
details: /erp/devel/main/rev/608d75a091e5
changeset: 11412:608d75a091e5
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Mar 30 18:53:18 2011 +0200
summary: Added signature for changeset 290cb79e7e1b
details: /erp/devel/main/rev/d868fedf4144
changeset: 11413:d868fedf4144
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Mar 31 21:40:31 2011 +0200
summary: Merge with 3.0RC5.1
diffstat:
.hgsigs
| 2 +
.hgtags
| 2 +
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.class
| 0
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPaymentsData.class
| 0
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.java
| 31 +-
modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments_data.xsql
| 9 +
modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPaymentsData.java
| 114 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ImportBankFile.html
| 17 +-
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
| 7 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
| 148 +
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml
| 12 +
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
| 114 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
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
| 9 -
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TAB.xml
| 24 +
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml
| 11 +
modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml
| 12 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java
| 7 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertManagementActionHandler.java
| 170 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
| 9 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java
|
15 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ModuleHandler.java
| 82 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/SetDocumentNoHandler.java
| 3 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 1 -
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/StandardWindowComponent.java
| 38 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
| 268 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js
| 209 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-alert-manager.js
| 10 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-application-menu.js
| 3 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
| 5 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
|
10 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-quick-launch.js
| 4 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-section-stack.js
| 27 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-tab.js
| 15 -
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-user-profile-widget.js
| 6 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
|
9 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
|
6 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
|
11 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-manager.js
| 6 +
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-menu-styles.js
| 3 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
| 36 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.js
| 73 +-
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
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
| 4 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml
| 2 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java
| 66 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/CSSMinimizer.java
| 658 ++
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StyleSheetResourceComponent.java
| 99 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/IDUIDefinition.java
| 65
+
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
|
13 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java
|
4 +-
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
| 2 +
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
| 14 +-
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
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
| 4 +-
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
| 4 +-
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
|
4 +-
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
| 4 +-
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
| 4 +-
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
|
1 +
modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java
| 8 +-
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
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
|
4 +-
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
| 4 +-
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
| 13 +
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/smartclient/images/CubeGrid/colHeaderDown.gif
| 0
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/smartclient/images/CubeGrid/rowHeaderDown.gif
| 0
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
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
| 4 +-
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
| 4 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 16 +-
referencedata/sampledata/F_B_International_Group.xml
| 2778 +++++++++-
referencedata/sampledata/QA_Testing.xml
| 1870 ++++++-
src-db/database/model/functions/AD_TABLE_IMPORT.xml
| 44 +-
src-db/database/model/functions/MRP_PURCHASEPLAN.xml
| 5 +-
src-db/database/model/prescript-PostgreSql.sql
| 16 -
src-db/database/model/tables/AD_ALERT.xml
| 4 +
src-db/database/model/tables/C_ELEMENTVALUE.xml
| 5 +
src-db/database/model/tables/GL_JOURNALLINE.xml
| 2 +-
src-db/database/model/tables/M_COSTING.xml
| 5 +
src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml
| 7 +
src-db/database/model/triggers/C_PERIOD_TRG2.xml
| 25 +-
src-db/database/model/triggers/GL_JL_CHK_RESTRICTIONS_TRG.xml
| 3 +-
src-db/database/model/triggers/GL_JOURNALLINE2_TRG.xml
| 9 +-
src-db/database/sourcedata/AD_COLUMN.xml
| 128 +-
src-db/database/sourcedata/AD_ELEMENT.xml
| 29 +
src-db/database/sourcedata/AD_FIELD.xml
| 94 +-
src-db/database/sourcedata/AD_MENU.xml
| 3 +-
src-db/database/sourcedata/AD_MESSAGE.xml
| 77 +
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
src-db/database/sourcedata/AD_REFERENCE.xml
| 13 +
src-db/database/sourcedata/AD_REF_LIST.xml
| 48 +
src-db/database/sourcedata/AD_TAB.xml
| 2 +-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 33 +
src-db/database/sourcedata/referencedData/C_CURRENCY.xml
| 588 +-
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CbpvendoracctData.class
|
0
src-util/buildvalidation/src/org/openbravo/buildvalidation/Cbpvendoracct_data.xsql
| 7 +-
src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeAlertStatus.class
| 0
src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeAlertStatusData.class
|
0
src-util/modulescript/src/org/openbravo/modulescript/InitializeAlertStatus.java
| 40 +
src-util/modulescript/src/org/openbravo/modulescript/InitializeAlertStatus_data.xsql
| 58 +
src-wad/src/org/openbravo/wad/javasource.javaxml
| 1 +
src/index.jsp
| 28 +-
src/org/openbravo/base/model/ModelProvider.java
| 9 +-
src/org/openbravo/base/secureApp/PopUp_Download.html
| 8 +-
src/org/openbravo/dal/security/OrganizationStructureProvider.java
| 3 +
src/org/openbravo/dal/xml/EntityXMLConverter.java
| 8 +-
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
| 4 +-
src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql
| 12 +-
src/org/openbravo/erpCommon/ad_forms/DocInOut.java
| 4 +-
src/org/openbravo/erpCommon/ad_forms/DocInventory.java
| 2 +-
src/org/openbravo/erpCommon/ad_forms/DocLineAmortization_data.xsql
| 2 +-
src/org/openbravo/erpCommon/ad_forms/DocMovement.java
| 2 +-
src/org/openbravo/erpCommon/ad_forms/DocProduction.java
| 2 +-
src/org/openbravo/erpCommon/ad_forms/FactLine.java
| 2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
| 17 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallLocal.html
| 5 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.html
| 9 +-
src/org/openbravo/erpCommon/ad_process/AlertProcess_data.xsql
| 18 +-
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportProductionRun.jrxml
| 1754 +++---
src/org/openbravo/erpCommon/businessUtility/AccountTree.java
| 10 +-
src/org/openbravo/erpCommon/businessUtility/AccountTree_data.xsql
| 4 +-
src/org/openbravo/erpCommon/info/SalesOrderLine.html
| 2 +-
src/org/openbravo/erpCommon/info/SalesOrderLine_data.xsql
| 2 +-
src/org/openbravo/erpCommon/info/ShipmentReceipt.html
| 2 +-
src/org/openbravo/erpCommon/info/ShipmentReceiptLine.html
| 2 +-
src/org/openbravo/erpCommon/info/ShipmentReceiptLine_data.xsql
| 6 +-
src/org/openbravo/erpCommon/modules/ImportModule.java
| 8 +
src/org/openbravo/erpCommon/modules/VersionUtility.java
| 49 +-
src/org/openbravo/erpCommon/modules/VersionUtility_data.xsql
| 32 +-
src/org/openbravo/erpCommon/obps/ActivationKey.java
| 68 +-
src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java
| 7 +-
src/org/openbravo/erpCommon/utility/Alert_data.xsql
| 7 +-
src/org/openbravo/erpReports/RptMA_ProcessPlan.jrxml
| 1490 ++--
155 files changed, 9582 insertions(+), 2563 deletions(-)
diffs (truncated from 46704 to 300 lines):
diff -r 2900108d13e7 -r d868fedf4144 .hgsigs
--- a/.hgsigs Fri Mar 18 23:16:00 2011 +0100
+++ b/.hgsigs Thu Mar 31 21:40:31 2011 +0200
@@ -29,3 +29,5 @@
b430637e3b9d96852ea55b4eaa8278c99a004584 0
iEYEABECAAYFAk1eSPQACgkQCX/oGf+2qkMc8wCfYXVRLMPbYeKhcUDJ1jjbGe/8E0kAnj3k1eojsxsUfLzurS6JsgaXVZ5c
668651fe8a81bcb9a55c3073d6a8f59d91d70b26 0
iEYEABECAAYFAk1eS8gACgkQCX/oGf+2qkOW4ACbB0zLCbzqWAECmpERhBOmSp+hrfAAoPfnoksz58TTrITz6vIdNLlOykKX
37f2d5f6122e0b7d404f15af699bbf517c8620f1 0
iEYEABECAAYFAk1e5jYACgkQCX/oGf+2qkNdOwCg+BZzm0X320yJPlglOs6S3meDeesAoI+GDdOqlwP0J3ZJxtwS2LYiC68K
+6b5829bdfb83a717983a5cc3d93cf23993504dee 0
iEYEABECAAYFAk2D2aIACgkQCX/oGf+2qkNw4ACgnusvXTfY7cwcF8JIyx3gMPDE18sAmQG/UCHIcT/mmqX1UcgpiCgEqUB3
+290cb79e7e1b40a7584920fa1ab2319bb6f36dd2 0
iEYEABECAAYFAk2TX/0ACgkQCX/oGf+2qkPETwCdF5Lxy/MMap+EFbYn3VPcBWjg6qUAoLYKMP5vkaxVXxQWqMrAEKJ+Tr3a
diff -r 2900108d13e7 -r d868fedf4144 .hgtags
--- a/.hgtags Fri Mar 18 23:16:00 2011 +0100
+++ b/.hgtags Thu Mar 31 21:40:31 2011 +0200
@@ -39,3 +39,5 @@
bdc0773576839de5e0f134020d57f5040bbf70e4 3.0RC2
379b55d7906ebbfe04b0d864a8b2543f437f7781 3.0RC3
72e872c1dee28e32260afb806938f730c73b6c8e 3.0RC4
+2900108d13e7c88366e2993a7e4ccae9a9a13618 3.0RC5
+5f47e83fbcb3746a754737199769a7edd6a9eee2 3.0RC5.1
diff -r 2900108d13e7 -r d868fedf4144
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.class
Binary file
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.class
has changed
diff -r 2900108d13e7 -r d868fedf4144
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPaymentsData.class
Binary file
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPaymentsData.class
has changed
diff -r 2900108d13e7 -r d868fedf4144
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Fri Mar 18 23:16:00 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Thu Mar 31 21:40:31 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.11297]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.11404]]></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>
@@ -25,7 +25,7 @@
<!--A918E3331C404B889D69AA9BFAFB23AC--> <UPDATEINFO><![CDATA[Fixed issue with
document sequence numbers reset in case of applying dataset second time.
Fixed issue 15305.]]></UPDATEINFO>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <REFERENCEDATAINFO><![CDATA[Document
types and default algorithm for bank statement auto
matching]]></REFERENCEDATAINFO>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION_LABEL><![CDATA[RC5]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--A918E3331C404B889D69AA9BFAFB23AC-->
<ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE>
diff -r 2900108d13e7 -r d868fedf4144
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
Fri Mar 18 23:16:00 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Thu Mar 31 21:40:31 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.11297]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.11404]]></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.11297]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.11404]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 2900108d13e7 -r d868fedf4144
modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.java
---
a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.java
Fri Mar 18 23:16:00 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.java
Thu Mar 31 21:40:31 2011 +0200
@@ -31,21 +31,26 @@
ConnectionProvider cp = getConnectionProvider();
ArrayList<String> errors = new ArrayList<String>();
try {
- if (UnpostRefundPaymentsData.existsPostedRefundPayments(cp )) {
- String errorClients = "";
- UnpostRefundPaymentsData[] clients =
UnpostRefundPaymentsData.clientsWithPayments(cp);
- for (int i = 0; i < clients.length; i++)
- errorClients += clients[i].name + ",";
- errorClients = errorClients.substring(0, errorClients.length()-1);
+ // Prevent error when upgrading from a pure 2.50
+ if (UnpostRefundPaymentsData.existAPRMbasetables(cp)) {
- errors
- .add("You can not apply this Advanced Payables and Receivables
Management module version because your instance fails in a pre-validation:
since APRM 1.0.5 version the accounting of refund payments has changed. So it
is not allowed to upgrade to the latest version having payments accounted with
the old rules. To fix this problem in your instance, you can know the
duplicated entries by reviewing Alerts in your system (Alert Rule: Posted
Refund Payments). Find the Posted Payments to unpost them, you should as well
disable the accounting background process. Once it is fixed you should be able
to apply this APRM module version. Clients with payments: " + errorClients);
- String alertRuleId = UnpostRefundPaymentsData.getUUID(cp);
- if (!UnpostRefundPaymentsData.existsAlertRule(cp)){
- UnpostRefundPaymentsData.insertAlertRule(cp, alertRuleId);
+ if (UnpostRefundPaymentsData.existsPostedRefundPayments(cp )) {
+ String errorClients = "";
+ UnpostRefundPaymentsData[] clients =
UnpostRefundPaymentsData.clientsWithPayments(cp);
+ for (int i = 0; i < clients.length; i++)
+ errorClients += clients[i].name + ",";
+ errorClients = errorClients.substring(0, errorClients.length()-1);
+
+ errors
+ .add("You can not apply this Advanced Payables and Receivables
Management module version because your instance fails in a pre-validation:
since APRM 1.0.5 version the accounting of refund payments has changed. So it
is not allowed to upgrade to the latest version having payments accounted with
the old rules. To fix this problem in your instance, you can know the
duplicated entries by reviewing Alerts in your system (Alert Rule: Posted
Refund Payments). Find the Posted Payments to unpost them, you should as well
disable the accounting background process. Once it is fixed you should be able
to apply this APRM module version. Clients with payments: " + errorClients);
+ String alertRuleId = UnpostRefundPaymentsData.getUUID(cp);
+ if (!UnpostRefundPaymentsData.existsAlertRule(cp)){
+ UnpostRefundPaymentsData.insertAlertRule(cp, alertRuleId);
+ }
+ alertRuleId = UnpostRefundPaymentsData.getAlertRuleId(cp);
+ processAlert(alertRuleId, cp);
}
- alertRuleId = UnpostRefundPaymentsData.getAlertRuleId(cp);
- processAlert(alertRuleId, cp);
+
}
} catch (Exception e) {
return handleError(e);
diff -r 2900108d13e7 -r d868fedf4144
modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments_data.xsql
---
a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments_data.xsql
Fri Mar 18 23:16:00 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments_data.xsql
Thu Mar 31 21:40:31 2011 +0200
@@ -143,4 +143,13 @@
]]></Sql>
<Parameter name="sql" type="replace" optional="true" after="FROM ("
text="SELECT '' AS DESCRIPTION, '' AS RECORD_ID, '' AS REFERENCEKEY_ID, '' AS
AD_CLIENT_ID FROM DUAL"/>
</SqlMethod>
+ <SqlMethod name="existAPRMbasetables" type="preparedStatement"
return="boolean">
+ <SqlMethodComment>Check if the FIN_Payment table exist</SqlMethodComment>
+ <Sql><![CDATA[
+ SELECT count(*) AS EXISTING
+ FROM ad_table
+ WHERE ad_table_id = 'D1A97202E832470285C9B1EB026D54E2'
+ ]]>
+ </Sql>
+ </SqlMethod>
</SqlClass>
diff -r 2900108d13e7 -r d868fedf4144
modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPaymentsData.java
---
a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPaymentsData.java
Fri Mar 18 23:16:00 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPaymentsData.java
Thu Mar 31 21:40:31 2011 +0200
@@ -35,33 +35,33 @@
}
public String getField(String fieldName) {
- if (fieldName.equalsIgnoreCase("AD_CLIENT_ID") ||
fieldName.equals("adClientId"))
+ if (fieldName.equalsIgnoreCase("ad_client_id") ||
fieldName.equals("adClientId"))
return adClientId;
- else if (fieldName.equalsIgnoreCase("AD_ORG_ID") ||
fieldName.equals("adOrgId"))
+ else if (fieldName.equalsIgnoreCase("ad_org_id") ||
fieldName.equals("adOrgId"))
return adOrgId;
- else if (fieldName.equalsIgnoreCase("CREATED"))
+ else if (fieldName.equalsIgnoreCase("created"))
return created;
- else if (fieldName.equalsIgnoreCase("CREATEDBY"))
+ else if (fieldName.equalsIgnoreCase("createdby"))
return createdby;
- else if (fieldName.equalsIgnoreCase("UPDATED"))
+ else if (fieldName.equalsIgnoreCase("updated"))
return updated;
- else if (fieldName.equalsIgnoreCase("UPDATEDBY"))
+ else if (fieldName.equalsIgnoreCase("updatedby"))
return updatedby;
- else if (fieldName.equalsIgnoreCase("ISACTIVE"))
+ else if (fieldName.equalsIgnoreCase("isactive"))
return isactive;
- else if (fieldName.equalsIgnoreCase("RECORD_ID") ||
fieldName.equals("recordId"))
+ else if (fieldName.equalsIgnoreCase("record_id") ||
fieldName.equals("recordId"))
return recordId;
- else if (fieldName.equalsIgnoreCase("DESCRIPTION"))
+ else if (fieldName.equalsIgnoreCase("description"))
return description;
- else if (fieldName.equalsIgnoreCase("REFERENCEKEY_ID") ||
fieldName.equals("referencekeyId"))
+ else if (fieldName.equalsIgnoreCase("referencekey_id") ||
fieldName.equals("referencekeyId"))
return referencekeyId;
- else if (fieldName.equalsIgnoreCase("AD_ROLE_ID") ||
fieldName.equals("adRoleId"))
+ else if (fieldName.equalsIgnoreCase("ad_role_id") ||
fieldName.equals("adRoleId"))
return adRoleId;
- else if (fieldName.equalsIgnoreCase("AD_ALERTRULE_ID") ||
fieldName.equals("adAlertruleId"))
+ else if (fieldName.equalsIgnoreCase("ad_alertrule_id") ||
fieldName.equals("adAlertruleId"))
return adAlertruleId;
- else if (fieldName.equalsIgnoreCase("SQL"))
+ else if (fieldName.equalsIgnoreCase("sql"))
return sql;
- else if (fieldName.equalsIgnoreCase("NAME"))
+ else if (fieldName.equalsIgnoreCase("name"))
return name;
else {
log4j.debug("Field does not exist: " + fieldName);
@@ -103,20 +103,20 @@
while(continueResult && result.next()) {
countRecord++;
UnpostRefundPaymentsData objectUnpostRefundPaymentsData = new
UnpostRefundPaymentsData();
- objectUnpostRefundPaymentsData.adClientId = UtilSql.getValue(result,
"AD_CLIENT_ID");
- objectUnpostRefundPaymentsData.adOrgId = UtilSql.getValue(result,
"AD_ORG_ID");
- objectUnpostRefundPaymentsData.created = UtilSql.getDateValue(result,
"CREATED", "dd-MM-yyyy");
- objectUnpostRefundPaymentsData.createdby = UtilSql.getValue(result,
"CREATEDBY");
- objectUnpostRefundPaymentsData.updated = UtilSql.getDateValue(result,
"UPDATED", "dd-MM-yyyy");
- objectUnpostRefundPaymentsData.updatedby = UtilSql.getValue(result,
"UPDATEDBY");
- objectUnpostRefundPaymentsData.isactive = UtilSql.getValue(result,
"ISACTIVE");
- objectUnpostRefundPaymentsData.recordId = UtilSql.getValue(result,
"RECORD_ID");
- objectUnpostRefundPaymentsData.description = UtilSql.getValue(result,
"DESCRIPTION");
- objectUnpostRefundPaymentsData.referencekeyId =
UtilSql.getValue(result, "REFERENCEKEY_ID");
- objectUnpostRefundPaymentsData.adRoleId = UtilSql.getValue(result,
"AD_ROLE_ID");
- objectUnpostRefundPaymentsData.adAlertruleId =
UtilSql.getValue(result, "AD_ALERTRULE_ID");
- objectUnpostRefundPaymentsData.sql = UtilSql.getValue(result, "SQL");
- objectUnpostRefundPaymentsData.name = UtilSql.getValue(result, "NAME");
+ objectUnpostRefundPaymentsData.adClientId = UtilSql.getValue(result,
"ad_client_id");
+ objectUnpostRefundPaymentsData.adOrgId = UtilSql.getValue(result,
"ad_org_id");
+ objectUnpostRefundPaymentsData.created = UtilSql.getDateValue(result,
"created", "dd-MM-yyyy");
+ objectUnpostRefundPaymentsData.createdby = UtilSql.getValue(result,
"createdby");
+ objectUnpostRefundPaymentsData.updated = UtilSql.getDateValue(result,
"updated", "dd-MM-yyyy");
+ objectUnpostRefundPaymentsData.updatedby = UtilSql.getValue(result,
"updatedby");
+ objectUnpostRefundPaymentsData.isactive = UtilSql.getValue(result,
"isactive");
+ objectUnpostRefundPaymentsData.recordId = UtilSql.getValue(result,
"record_id");
+ objectUnpostRefundPaymentsData.description = UtilSql.getValue(result,
"description");
+ objectUnpostRefundPaymentsData.referencekeyId =
UtilSql.getValue(result, "referencekey_id");
+ objectUnpostRefundPaymentsData.adRoleId = UtilSql.getValue(result,
"ad_role_id");
+ objectUnpostRefundPaymentsData.adAlertruleId =
UtilSql.getValue(result, "ad_alertrule_id");
+ objectUnpostRefundPaymentsData.sql = UtilSql.getValue(result, "sql");
+ objectUnpostRefundPaymentsData.name = UtilSql.getValue(result, "name");
objectUnpostRefundPaymentsData.InitRecordNumber =
Integer.toString(firstRegister);
vector.addElement(objectUnpostRefundPaymentsData);
if (countRecord >= numberRegisters && numberRegisters != 0) {
@@ -159,7 +159,7 @@
result = st.executeQuery();
if(result.next()) {
- boolReturn = !UtilSql.getValue(result, "EXISTING").equals("0");
+ boolReturn = !UtilSql.getValue(result, "existing").equals("0");
}
result.close();
} catch(SQLException e){
@@ -195,7 +195,7 @@
result = st.executeQuery();
if(result.next()) {
- strReturn = UtilSql.getValue(result, "NAME");
+ strReturn = UtilSql.getValue(result, "name");
}
result.close();
} catch(SQLException e){
@@ -235,7 +235,7 @@
result = st.executeQuery();
if(result.next()) {
- boolReturn = !UtilSql.getValue(result, "EXISTING").equals("0");
+ boolReturn = !UtilSql.getValue(result, "existing").equals("0");
}
result.close();
} catch(SQLException e){
@@ -269,7 +269,7 @@
result = st.executeQuery();
if(result.next()) {
- strReturn = UtilSql.getValue(result, "NAME");
+ strReturn = UtilSql.getValue(result, "name");
}
result.close();
} catch(SQLException e){
@@ -326,7 +326,7 @@
while(continueResult && result.next()) {
countRecord++;
UnpostRefundPaymentsData objectUnpostRefundPaymentsData = new
UnpostRefundPaymentsData();
- objectUnpostRefundPaymentsData.name = UtilSql.getValue(result, "NAME");
+ objectUnpostRefundPaymentsData.name = UtilSql.getValue(result, "name");
objectUnpostRefundPaymentsData.InitRecordNumber =
Integer.toString(firstRegister);
vector.addElement(objectUnpostRefundPaymentsData);
if (countRecord >= numberRegisters && numberRegisters != 0) {
@@ -374,7 +374,7 @@
result = st.executeQuery();
if(result.next()) {
- boolReturn = !UtilSql.getValue(result, "EXISTING").equals("0");
+ boolReturn = !UtilSql.getValue(result, "existing").equals("0");
}
result.close();
} catch(SQLException e){
@@ -516,10 +516,10 @@
while(continueResult && result.next()) {
countRecord++;
UnpostRefundPaymentsData objectUnpostRefundPaymentsData = new
UnpostRefundPaymentsData();
- objectUnpostRefundPaymentsData.description = UtilSql.getValue(result,
"DESCRIPTION");
- objectUnpostRefundPaymentsData.recordId = UtilSql.getValue(result,
"RECORD_ID");
- objectUnpostRefundPaymentsData.referencekeyId =
UtilSql.getValue(result, "REFERENCEKEY_ID");
- objectUnpostRefundPaymentsData.adClientId = UtilSql.getValue(result,
"AD_CLIENT_ID");
+ objectUnpostRefundPaymentsData.description = UtilSql.getValue(result,
"description");
+ objectUnpostRefundPaymentsData.recordId = UtilSql.getValue(result,
"record_id");
+ objectUnpostRefundPaymentsData.referencekeyId =
UtilSql.getValue(result, "referencekey_id");
+ objectUnpostRefundPaymentsData.adClientId = UtilSql.getValue(result,
"ad_client_id");
objectUnpostRefundPaymentsData.InitRecordNumber =
Integer.toString(firstRegister);
vector.addElement(objectUnpostRefundPaymentsData);
if (countRecord >= numberRegisters && numberRegisters != 0) {
@@ -544,4 +544,42 @@
vector.copyInto(objectUnpostRefundPaymentsData);
return(objectUnpostRefundPaymentsData);
}
+
+/**
+Check if the FIN_Payment table exist
+ */
+ public static boolean existAPRMbasetables(ConnectionProvider
connectionProvider) throws ServletException {
+ String strSql = "";
+ strSql = strSql +
+ " SELECT count(*) AS EXISTING" +
+ " FROM ad_table" +
+ " WHERE ad_table_id = 'D1A97202E832470285C9B1EB026D54E2'";
+
+ ResultSet result;
+ boolean boolReturn = false;
+ PreparedStatement st = null;
+
+ try {
+ st = connectionProvider.getPreparedStatement(strSql);
------------------------------------------------------------------------------
Create and publish websites with WebMatrix
Use the most popular FREE web apps or write code yourself;
WebMatrix provides all the features you need to develop and
publish your website. http://p.sf.net/sfu/ms-webmatrix-sf
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
