details: https://code.openbravo.com/erp/devel/main/rev/a39de38279ad changeset: 16680:a39de38279ad user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 28 15:18:44 2012 +0200 summary: [demand] Changed on demand platform port to 20290
details: https://code.openbravo.com/erp/devel/main/rev/d89c76a4681d changeset: 16681:d89c76a4681d user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 28 16:51:46 2012 +0200 summary: [demand] Fixed link in message details: https://code.openbravo.com/erp/devel/main/rev/661e839cd9ab changeset: 16682:661e839cd9ab user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 28 16:57:22 2012 +0200 summary: fixed bug 20625: Reload license as admin details: https://code.openbravo.com/erp/devel/main/rev/2f1eca1d8609 changeset: 16683:2f1eca1d8609 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Mon May 28 17:31:44 2012 +0200 summary: Fixed issue 20591. Fixed issue 20592. Several changes have been made: > - The table creation commands are now considered 'critical'. This means that > the process will fail automatically, with an specific message, if one of > these commands fails. > - The create fks and triggers methods now return whether there were errors or > not during the execution. > - This new boolean is now used by update.database to make the process fail in > the end, if some trigger or foreign key was not correctly enabled. This > failure is a normal exception which will be detected by the rebuild window as > an error in the process. > - Additionally (and unrelated to these issues actually) a new convenient > method to load a basic database model which includes only tables has been > included. details: https://code.openbravo.com/erp/devel/main/rev/237ce7d9967e changeset: 16684:237ce7d9967e user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Mon May 28 17:37:06 2012 +0200 summary: Fixed issue 20624. When installing/updating modules, the check for local changes will be done. This check will from now on be done early, before installing anything, to prevent a situation in which the user installs modules, but then the rebuild fails with local changes. If these changes are detected early, then the user can more easily fix them by just exporting his changes before proceeding with the installation. details: https://code.openbravo.com/erp/devel/main/rev/0ed463f70606 changeset: 16685:0ed463f70606 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue May 29 03:26:00 2012 +0200 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/f94acbb414d4 changeset: 16686:f94acbb414d4 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue May 29 08:46:02 2012 +0200 summary: fixed bug 20625: Set admin mode also to check if refresh is needed details: https://code.openbravo.com/erp/devel/main/rev/155508a56bac changeset: 16687:155508a56bac user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue May 29 09:00:49 2012 +0200 summary: Fixes issue 0020612: Now filters transactions using the due date field. details: https://code.openbravo.com/erp/devel/main/rev/0e2211ada03d changeset: 16688:0e2211ada03d user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue May 29 09:26:41 2012 +0200 summary: fixes issue 20620: ProcessRunError closing a year details: https://code.openbravo.com/erp/devel/main/rev/6f6aeb05d3bd changeset: 16689:6f6aeb05d3bd user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Tue May 29 09:59:25 2012 +0200 summary: Fixed issue 20455. Changed optimization level to avoid error. This change will effectively disable optimization in the js engine. However, it doesn't really matter in our usage because the javascript which the engine needs to process is very simple, and this part represents a tiny amount of the total execution time of the callout processes, and at the same time, it's the only way to avoid the reported issue. details: https://code.openbravo.com/erp/devel/main/rev/c29cfa7c9b71 changeset: 16690:c29cfa7c9b71 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Tue May 29 10:02:20 2012 +0200 summary: Related to issue 20455. Removed wrong debug line details: https://code.openbravo.com/erp/devel/main/rev/1554cc80c7f8 changeset: 16691:1554cc80c7f8 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Tue May 29 10:52:46 2012 +0200 summary: Related to issue 20592. Execute postscript and crc update even if there is a problem in a fk or trigger. details: https://code.openbravo.com/erp/devel/main/rev/5e3ad075603e changeset: 16692:5e3ad075603e user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Tue May 29 12:00:37 2012 +0200 summary: Related to issue 20591. Further clarified the message shown when a critical error happens details: https://code.openbravo.com/erp/devel/main/rev/b87d6a90f2db changeset: 16693:b87d6a90f2db user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Tue May 29 12:30:40 2012 +0200 summary: Fixed issue 20630. Maintenance flag will only be set if update.database finished correctly. details: https://code.openbravo.com/erp/devel/main/rev/faec5225c28a changeset: 16694:faec5225c28a user: Guillermo Álvarez de Eulate <guillermo.alvarez <at> openbravo.com> date: Tue May 29 12:38:36 2012 +0200 summary: Fixed issue 20540: Server calls are not allowed until the previous have finished details: https://code.openbravo.com/erp/devel/main/rev/541e0c29eb59 changeset: 16695:541e0c29eb59 user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Mon May 28 12:11:12 2012 +0200 summary: fixed bug 9614 Not require to create a new user in Initial Organization Setup details: https://code.openbravo.com/erp/devel/main/rev/57b7ee4c01b3 changeset: 16696:57b7ee4c01b3 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Tue May 29 13:51:51 2012 +0200 summary: Related to issue 9614: code review. Update license text year. Remove not needed parenthesis on inpConfirmPassword and inpPassword JS validation. Modify validation order: follow initial org setup window field order. If the Organization username is empty avoid other validations details: https://code.openbravo.com/erp/devel/main/rev/475e5dd573e7 changeset: 16697:475e5dd573e7 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Tue May 29 18:41:57 2012 +0200 summary: Fixes issue 20504: "Copy Lines" process should should shown proper error message instead of "Process failed during execution". Issue 20336: Should not be possible to create several periods for same date range in different years. I have updated the message with id 0FF0EC6915A04F4EA5FB2FD09DA82F14, because now the previous message was incomplete to new code details: https://code.openbravo.com/erp/devel/main/rev/346fe3bde4ad changeset: 16698:346fe3bde4ad user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue May 29 19:37:57 2012 +0200 summary: Merge back from main details: https://code.openbravo.com/erp/devel/main/rev/25447e74a93f changeset: 16699:25447e74a93f user: Martin Taal <martin.taal <at> openbravo.com> date: Wed May 30 07:36:48 2012 +0200 summary: Related to issue 20503: Wrong behaviour in form personalitation Reenabled record selection by explicitly updating the record selection details: https://code.openbravo.com/erp/devel/main/rev/3752a665362c changeset: 16700:3752a665362c user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed May 30 18:03:32 2012 +0200 summary: CI: update AD_MODULE to version 16699 diffstat: .hgsigs | 1 + .hgtags | 1 + build.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/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html | 52 ++- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt | 2 +- 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/org/openbravo/client/application/window/FormInitializationComponent.java | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization-treegrid.js | 10 +- 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.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 15 +- 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.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.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.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 | 18 +- src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/sourcedata/AD_MESSAGE.xml | 54 +++- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 22 + src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java | 67 ++++ src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct.java | 7 +- src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.html | 15 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 89 +++++ src/org/openbravo/erpCommon/ad_forms/ModuleManagement_LocalChanges.html | 154 ++++++++++ src/org/openbravo/erpCommon/ad_forms/ModuleManagement_LocalChanges.xml | 27 + src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java | 38 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 20 +- 60 files changed, 609 insertions(+), 145 deletions(-) diffs (truncated from 1904 to 300 lines): diff -r ceacf7881e57 -r 3752a665362c .hgsigs --- a/.hgsigs Mon May 21 17:16:25 2012 +0200 +++ b/.hgsigs Wed May 30 18:03:32 2012 +0200 @@ -70,4 +70,5 @@ ec66c54fad7f8821269266cd7de52b09a423cdae 0 iEYEABECAAYFAk99aVgACgkQCX/oGf+2qkOiDwCg+Ne5Dp5L0X34APNzA7rBeCmZVsQAoJ5AU9K9+Dhn7iuBHVyTisbUJ/oC 17bc2224a41a30d10472bd14581378201c1ca44b 0 iEYEABECAAYFAk+IHlMACgkQCX/oGf+2qkM3MACgoR2lLVuhzaAg2v0PAHTOsvCgEIoAoP5uBTyNv/CqYuf+XIwD6F9nxa+y 80da674a77f9339af5985c3ca3aa7fb7f817a114 0 iEYEABECAAYFAk+qnzoACgkQCX/oGf+2qkPyuQCfaHkf4c4QgZar7nuCzp84iUkxWPsAoOQyyXYJaWZwwbjUBzoPNbRIBLLE +a34b12cbb8a43db069a8ea2caab186b90ab2b8b5 0 iEYEABECAAYFAk++B4UACgkQCX/oGf+2qkNwWQCg2FdpFCBmDEU/VvuZskSHu1WB7A0AoNL6MUMZcwO8Uy37kn1kfliFCFyF 358b14e92651ccf4e020a1420bd0b25b662f35ba 0 iEYEABECAAYFAk+0CeUACgkQCX/oGf+2qkMSIQCg8m8XwFqk/oFw5Cq1odJNq3ZiHIEAn2MHDVw5hRV7eD+c/zNOnQnAnp1n diff -r ceacf7881e57 -r 3752a665362c .hgtags --- a/.hgtags Mon May 21 17:16:25 2012 +0200 +++ b/.hgtags Wed May 30 18:03:32 2012 +0200 @@ -81,4 +81,5 @@ 00280ab1ed3ab01d41ed048ccd01694af1223341 3.0MP10 4a4cc349c6babb0d72149613cc3e4988427ee0ff 3.0MP10.1 35a1ec14c74d970e083b2d195ea2eed784d5ac1c 3.0MP10.2 +40c4dd7ff48945d073007753a5f296207c0c0f22 3.0MP10.3 f96fd5be357082854f418944e69fb406ae0dcda6 3.0MP11 diff -r ceacf7881e57 -r 3752a665362c build.xml --- a/build.xml Mon May 21 17:16:25 2012 +0200 +++ b/build.xml Wed May 30 18:03:32 2012 +0200 @@ -325,6 +325,19 @@ </sequential> </macrodef> + <macrodef name="updatesystemstatuswhennot"> + <attribute name="v" default="NOT SET"/> + <attribute name="previous" default="NOT SET"/> + <sequential> + <sql driver="${bbdd.driver}" url="${bbdd.owner.url}" userid="${bbdd.user}" password="${bbdd.password}" onerror="continue" autocommit="true"> + <classpath> <fileset dir="${base.lib}"> <include name="**/*.jar"> </include> </fileset> </classpath> + <transaction> UPDATE ad_system_info SET system_status='@{v}' where system_status!='@{previous}' ; + DELETE FROM ad_error_log where system_status=(select system_status from ad_system_info) + </transaction> + </sql> + </sequential> + </macrodef> + <taskdef resource="axis-tasks.properties" classpathref="project.class.path" /> <target name="init" depends="code.rev"> @@ -383,7 +396,7 @@ <ant dir="${base.db}" target="setApplied" inheritAll="true" inheritRefs="true" /> <antcall target="build.deploy" /> - <updatesystemstatus v="RB51"/> + <updatesystemstatuswhennot v="RB51" previous="RB12"/> <!-- only restart tomcat if the restart prop was set to true --> <condition property="dorestart"> <istrue value="${restart}" /> diff -r ceacf7881e57 -r 3752a665362c modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon May 21 17:16:25 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed May 30 18:03:32 2012 +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.16662]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.16699]]></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 ceacf7881e57 -r 3752a665362c 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 May 21 17:16:25 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed May 30 18:03:32 2012 +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.16662]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.16699]]></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.16662]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.16699]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r ceacf7881e57 -r 3752a665362c modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html Mon May 21 17:16:25 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html Wed May 30 18:03:32 2012 +0200 @@ -53,7 +53,7 @@ </script> <script language="JavaScript" type="text/javascript"> var APRMMatchStatementIds; -var matchingTransaction; +var serverWorking=false; function transactionFind(selected) { var depositAmt = returnCalcToFormatted(selected.depositAmount, globalMaskNumeric, globalDecSeparator, globalGroupSeparator, globalGroupInterval); var paymentAmt = returnCalcToFormatted(selected.paymentAmount, globalMaskNumeric, globalDecSeparator, globalGroupSeparator, globalGroupInterval); @@ -83,7 +83,6 @@ } function openSelector(bslId) { - document.frmMain.buttonProcess.disabled = false; document.frmMain.inpFinBankStatementLineId.value = bslId; if(bslId) { sc_FIN_FinAcc_Transaction_ID.bslId = bslId; @@ -104,10 +103,20 @@ bslId: '' }); +function disableChecks(){ +var items = document.frmMain.getElementsByTagName("input"); + for(var i=0; i<items.length; i++){ + if(items[i].name === 'inpBankStatementLineId'){ + if(items[i].checked){ + items[i].disabled=true; + } + } + } +} + function unMatchLine(bankStatementLineId, isChecked) { if (!isChecked) { - matchingTransaction = true ; - document.frmMain.buttonProcess.disabled = true; + disableChecks(); APRMMatchStatementIds[bankStatementLineId]=false; document.frmMain.inpFinBankStatementLineId.value = bankStatementLineId; document.getElementById("inpMatchedDocument_" + bankStatementLineId).innerHTML = ""; @@ -122,7 +131,6 @@ } else { APRMMatchStatementIds[bankStatementLineId]=true; - document.frmMain.buttonProcess.disabled = false; } return true; } @@ -133,15 +141,16 @@ return true; } function submitThisPage(strCommand) { - APRMMatchStatementIds = null; - if (validate(strCommand)) { - submitCommandForm(strCommand, false, null, 'MatchTransaction.html', '_self'); + //if server is working the button should be disabled + if(serverWorking == false){ + APRMMatchStatementIds = null; + if (validate(strCommand)) { + submitCommandForm(strCommand, false, null, 'MatchTransaction.html', '_self'); + } return true; } - return true; } function openAddTransaction(bankStatementLineId){ - document.frmMain.buttonProcess.disabled = false; document.frmMain.inpFinBankStatementLineId.value = bankStatementLineId; openServletNewWindow('DEFAULT', false, '../org.openbravo.advpaymentmngt.ad_actionbutton/AddTransaction.html', 'ADDTRANSACTION', '2EED9BC16DB34D2B80BA40A21564BECF', false,600, 900, null, null, false, true, true); return true; @@ -152,6 +161,8 @@ try { var url = "../org.openbravo.advpaymentmngt.ad_actionbutton/MatchTransaction.html"; var paramXMLReq = null; + serverWorking = true; + document.frmMain.buttonProcess.disabled = true; return submitXmlHttpRequest(callBackGrid, document.frmMain, "GRID", url, false, null, paramXMLReq); } catch (e) { alert(e); @@ -163,6 +174,8 @@ if (getReadyStateHandler(XMLHttpRequestObj)) { try { if (XMLHttpRequestObj.responseText) { + serverWorking = false; + document.frmMain.buttonProcess.disabled = false; strText = XMLHttpRequestObj.responseText; var data = eval(strText); var grid = data.grid; @@ -198,10 +211,6 @@ } } } - if (matchingTransaction === true){ - matchingTransaction = false; - document.frmMain.buttonProcess.disabled = false; - } showWarning(); } else { document.getElementById('sectionGrid').innerHTML = ''; @@ -220,6 +229,8 @@ try { var url = "../org.openbravo.advpaymentmngt.ad_actionbutton/MatchTransaction.html"; var paramXMLReq = null; + serverWorking = true; + document.frmMain.buttonProcess.disabled = true; return submitXmlHttpRequest(dummyCallBack, document.frmMain, action, url, false, null, paramXMLReq); } catch (e) { alert(e); @@ -231,17 +242,13 @@ if (getReadyStateHandler(XMLHttpRequestObj)) { try { if (XMLHttpRequestObj.responseText) { + serverWorking = false; + document.frmMain.buttonProcess.disabled = false; strText = XMLHttpRequestObj.responseText; var data = eval(strText); if (data.forceLoadGrid) { loadGrid(); } - else{ - if (matchingTransaction === true){ - matchingTransaction = false; - document.frmMain.buttonProcess.disabled = false; - } - } } } catch (e) { } @@ -253,6 +260,8 @@ try { var url = "../org.openbravo.advpaymentmngt.ad_actionbutton/MatchTransaction.html"; var paramXMLReq = null; + serverWorking=true; + document.frmMain.buttonProcess.disabled = true; return submitXmlHttpRequest(splitCallback, document.frmMain, "SPLIT", url, false, null, paramXMLReq); } catch (e) { alert(e); @@ -264,6 +273,8 @@ if (getReadyStateHandler(XMLHttpRequestObj)) { try { if (XMLHttpRequestObj.responseText) { + serverWorking=false; + document.frmMain.buttonProcess.disabled = false; strText = XMLHttpRequestObj.responseText; var data = eval(strText); if (data.showJSMessage) { @@ -285,7 +296,6 @@ } else initialize_MessageBox('messageBoxID'); } function onLoadDo(){ - matchingTransaction = false; APRMMatchStatementIds = new Object(); this.windowTables = new Array( new windowTableId('client_top_popup', 'buttonProcess'), diff -r ceacf7881e57 -r 3752a665362c modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt Mon May 21 17:16:25 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt Wed May 30 18:03:32 2012 +0200 @@ -29,7 +29,7 @@ <td class="DataGrid_Body_LineNoCell" style="background-color: xx; text-align: center;" id="inpMatchStyle_xx" name="inpMatchStyle_xx"> <a href="#" onClick="openSelector('xx');" id="fieldFindLink"><img src="../../../../../web/org.openbravo.advpaymentmngt/images/view.png" style="border-style: none"/></a> <!--span> </span--> - <input id="inpCheckBox_xx" type="checkbox" name="inpBankStatementLineId" value="" onclick="(matchingTransaction === false) ? unMatchLine('xx', this.checked):matchingTransaction = true ; "/> + <input id="inpCheckBox_xx" type="checkbox" name="inpBankStatementLineId" value="" onclick="unMatchLine('xx', this.checked); "/> <input type="hidden" name="inpFinancialTransactionId_xx" id="inpFinancialTransactionId_xx" value=""></input> <input type="hidden" name="inpMatchingType_xx" id="inpMatchingType_xx" value=""></input> <!--span> </span--> diff -r ceacf7881e57 -r 3752a665362c 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 Mon May 21 17:16:25 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Wed May 30 18:03:32 2012 +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.16662]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.16699]]></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 ceacf7881e57 -r 3752a665362c 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 Mon May 21 17:16:25 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed May 30 18:03:32 2012 +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.16662]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.16699]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r ceacf7881e57 -r 3752a665362c 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 Mon May 21 17:16:25 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Wed May 30 18:03:32 2012 +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.16662]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.16699]]></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 ceacf7881e57 -r 3752a665362c 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 Mon May 21 17:16:25 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed May 30 18:03:32 2012 +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.16662]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.16699]]></STARTVERSION> <!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
