details: https://code.openbravo.com/erp/devel/main/rev/a569477afae5 changeset: 20481:a569477afae5 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Tue May 28 12:46:06 2013 +0200 summary: Fixes issue 23889: No extra datasource calls are done by selectors
Pick lists and grids use a property called drawAllMaxCells, that is used to determine how many cells should be fetched from the datasource, its default value is 250. If after making a datasource call smartclient finds out that the number of retrieved cells is lower than drawAllMaxCells, it will do another datasource call, and repeat this process until the number of cells fetched are higher than drawAllMaxCells or until all cells have been fetched. This is not the intented behaviour, we want the rows to be fetched when the user scrolls down and is out of cached rows. That is why in the definition of OBViewGrid the drawAllMaxCells is set to 0. To fix this issue this property is also set to 0 in the selector pick list and grid. details: https://code.openbravo.com/erp/devel/main/rev/7b20cf4da8ef changeset: 20482:7b20cf4da8ef user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Fri May 17 12:04:47 2013 +0200 summary: Fixed bug 23617 changed ALERT_RULE_SQL2 in Issue21640WrongMatchInvAccounting details: https://code.openbravo.com/erp/devel/main/rev/14c8d925fdc6 changeset: 20483:14c8d925fdc6 user: Jon Alegría <jon.alegria <at> openbravo.com> date: Tue May 28 13:07:15 2013 +0200 summary: Fixes issue 0023926: Date is truncated in getStockLines method details: https://code.openbravo.com/erp/devel/main/rev/d31e48e598fb changeset: 20484:d31e48e598fb user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Tue May 28 16:08:36 2013 +0530 summary: Fixes issue 23560: Insert Orphan Line when using Price List including taxes details: https://code.openbravo.com/erp/devel/main/rev/5e89abb03c8d changeset: 20485:5e89abb03c8d user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Tue May 28 17:12:12 2013 +0530 summary: Related to issue 23560 details: https://code.openbravo.com/erp/devel/main/rev/f5a58673fad6 changeset: 20486:f5a58673fad6 user: Jon Alegría <jon.alegria <at> openbravo.com> date: Tue May 28 17:46:24 2013 +0200 summary: Fixes issue 0023929: In FIN_Financia_Account table the sequence number of the identifier columns are not correctly defined details: https://code.openbravo.com/erp/devel/main/rev/3b9604eee5d7 changeset: 20487:3b9604eee5d7 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Tue May 28 17:49:38 2013 +0200 summary: Fixes issue 23890: The same hql is generated in the grid and in form view The problem was that for that particular selector (Product selector), the generated displayfield string was 'product$product$name'. This is not correct, because the Product entity does not have a product property, the correct displayfield string is product$name. This has been fixed in the getDisplayFielName method of the FKSelectorUIDefinition class. A check has been added to make sure that the property used in the display field is part of the referenced entity. If it is not, then the displayFieldName is returned directly, instead of trying to append it to the referenced property. details: https://code.openbravo.com/erp/devel/main/rev/768e5c072a99 changeset: 20488:768e5c072a99 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue May 28 23:56:24 2013 +0200 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/4057eab77422 changeset: 20489:4057eab77422 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue May 28 13:09:46 2013 +0200 summary: Fixes issue 23386: Goods shipment report doesn't show correctly the pagination. details: https://code.openbravo.com/erp/devel/main/rev/f6a4fd1a4a26 changeset: 20490:f6a4fd1a4a26 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed May 29 12:16:05 2013 +0200 summary: fixed bug 23934: sequential scan on AD_Session when logging in details: https://code.openbravo.com/erp/devel/main/rev/861974c450d8 changeset: 20491:861974c450d8 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue May 28 17:40:59 2013 +0200 summary: Fixed bug 23541 It is not allow negative quantities in BOMProducts details: https://code.openbravo.com/erp/devel/main/rev/80ca7ee3ac68 changeset: 20492:80ca7ee3ac68 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed May 29 16:28:12 2013 +0200 summary: Fixed bug 23936 Product reference was changed to ProductSimple in invoices details: https://code.openbravo.com/erp/devel/main/rev/0c50d1e4cf9f changeset: 20493:0c50d1e4cf9f user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu May 30 08:29:43 2013 +0530 summary: Fixes Issue 0023913: List of Dropdowns with more than 1000 fire a warning Changed fields of reservation pick and edit, Prereservation pick and edit from table/tableDir to Selectors. details: https://code.openbravo.com/erp/devel/main/rev/c7f57f178baf changeset: 20494:c7f57f178baf user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu May 30 10:08:15 2013 +0530 summary: Related to Issue 23913 : Added help comment and description details: https://code.openbravo.com/erp/devel/main/rev/8a7979c5a247 changeset: 20495:8a7979c5a247 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu May 30 11:45:18 2013 +0200 summary: Fixes issue 23841: Fixed duplicated close, close are done in finally blocks details: https://code.openbravo.com/erp/devel/main/rev/ff813ef90a4e changeset: 20496:ff813ef90a4e user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu May 30 09:30:09 2013 +0200 summary: Fixed bug 23279 Http 0 error obtained in manual reconciliation details: https://code.openbravo.com/erp/devel/main/rev/9708bd1d96eb changeset: 20497:9708bd1d96eb user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu May 30 15:37:49 2013 +0530 summary: Fixes Issue 23925: Filter does not work properly when using ^ After forming criteria from current filter, the operator symbols were removed and only the value is retained. Added the appropriate operator symbol, based on the operator. Ignored contains case alone as normal values will be replaced with ~value. details: https://code.openbravo.com/erp/devel/main/rev/e614965c64cc changeset: 20498:e614965c64cc user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu May 30 16:13:40 2013 +0530 summary: Related to Issue 23913 : Code review changes details: https://code.openbravo.com/erp/devel/main/rev/22cf29c433bb changeset: 20499:22cf29c433bb user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Thu May 30 13:35:55 2013 +0200 summary: Fixed issue 23946. The backend restriction will not be checked if there is no way to retrieve the role. details: https://code.openbravo.com/erp/devel/main/rev/7331622675df changeset: 20500:7331622675df user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu May 30 13:35:27 2013 +0200 summary: Fixes issue 23078: Child tabs use parent ad_module_id as default The module column of child tabs should not be defaulted to the module flagged as default, but to the module of the record parent. This has been fixed for the module columns for the Menu - Menu Parameters and the Reference - User Interface Definition tabs. details: https://code.openbravo.com/erp/devel/main/rev/e6e46782e850 changeset: 20501:e6e46782e850 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu May 30 18:06:34 2013 +0530 summary: Related to Issue 23925 : Jslint changes added condition to ignore regex criteria while setting symbol and made modifications in code for jslint compliance details: https://code.openbravo.com/erp/devel/main/rev/1693de72b307 changeset: 20502:1693de72b307 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu May 30 16:56:01 2013 +0200 summary: Related to issue 23770: Backed out change, some warning should be logged The approach used in this fix (modifying the template so only the jasper error are logged by default) should be improved. Instead of not logging any warning, we should try to reduce the number of warnings logged by fixing them. I.e. lots of warnings are related to the use of deprecated methods, those can be avoided by using the @supresswarnings annotation or by using a not deprecated method. details: https://code.openbravo.com/erp/devel/main/rev/ada107be4fd6 changeset: 20503:ada107be4fd6 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Fri May 31 12:13:27 2013 +0200 summary: related to issue 23936: backout changeset 80ca7ee3ac68 details: https://code.openbravo.com/erp/devel/main/rev/6792989a9124 changeset: 20504:6792989a9124 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri May 31 12:25:02 2013 +0200 summary: Fixes issue 23385: Organization is generated even if the Initial Org Setup ends with errors details: https://code.openbravo.com/erp/devel/main/rev/ec1c4db1c441 changeset: 20505:ec1c4db1c441 user: Jon Alegría <jon.alegria <at> openbravo.com> date: Fri May 31 12:44:01 2013 +0200 summary: Backout issue 0023929: In FIN_Financia_Account table the sequence number of the identifier columns are not correctly defined details: https://code.openbravo.com/erp/devel/main/rev/e84ef22ffd85 changeset: 20506:e84ef22ffd85 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Fri May 31 18:19:45 2013 +0200 summary: Issue 23385: , Backed out: 6792989a9124 As is breaks OrgSetup when using the optional 'Location' field. details: https://code.openbravo.com/erp/devel/main/rev/31f9b82dde77 changeset: 20507:31f9b82dde77 user: RM packaging bot <staff.rm <at> openbravo.com> date: Sat Jun 01 01:56:07 2013 +0200 summary: CI: update AD_MODULE to version 20506 diffstat: config/log4j.lcf.template | 1 - 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/Reconciliation.html | 72 ++- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java | 49 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ReconciliationGrid.srpt | 7 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ReconciliationGrid.xml | 4 + 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_COLUMN.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/event/AcctSchemaEventHandler.java | 33 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 18 +- 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_COLUMN.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.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.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 41 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java | 13 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKSelectorUIDefinition.java | 25 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 7 + 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/model/tables/AD_SESSION.xml | 3 + src-db/database/sourcedata/AD_COLUMN.xml | 24 +- src-db/database/sourcedata/AD_MESSAGE.xml | 12 + src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REFERENCE.xml | 13 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 16 + src-util/modulescript/build/classes/org/openbravo/modulescript/Issue21640WrongMatchInvAccounting.class | 0 src-util/modulescript/src/org/openbravo/modulescript/Issue21640WrongMatchInvAccounting.java | 2 +- src/index.jsp | 2 +- src/org/openbravo/costing/CostingMigrationProcess.java | 241 +++++---- src/org/openbravo/costing/CostingRuleProcess.java | 118 ++-- src/org/openbravo/erpCommon/ad_actionButton/MRPManufacturingPlanProcess.java | 19 +- src/org/openbravo/erpCommon/ad_actionButton/RMInsertOrphanLine.java | 14 +- src/org/openbravo/erpCommon/ad_process/MRPPurchaseCreateReservations.java | 107 ++-- src/org/openbravo/erpCommon/ad_process/VerifyBOM.java | 7 + src/org/openbravo/erpCommon/utility/WindowTree.java | 21 +- src/org/openbravo/erpReports/RptM_InOut.jrxml | 9 +- 70 files changed, 619 insertions(+), 427 deletions(-) diffs (truncated from 2288 to 300 lines): diff -r 4b94b5a758f8 -r 31f9b82dde77 config/log4j.lcf.template --- a/config/log4j.lcf.template Tue May 28 14:13:20 2013 +0530 +++ b/config/log4j.lcf.template Sat Jun 01 01:56:07 2013 +0200 @@ -21,7 +21,6 @@ # Set our global levels log4j.category.org=WARN log4j.category.org.openbravo=INFO -log4j.category.net.sf.jasperreports=ERROR log4j.appender.R=org.apache.log4j.RollingFileAppender log4j.appender.R.File=${catalina.base}/logs/openbravo.log diff -r 4b94b5a758f8 -r 31f9b82dde77 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 28 14:13:20 2013 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Sat Jun 01 01:56:07 2013 +0200 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.20467]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.20506]]></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 4b94b5a758f8 -r 31f9b82dde77 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 28 14:13:20 2013 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Jun 01 01:56:07 2013 +0200 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.20467]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.20506]]></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.20467]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.20506]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 4b94b5a758f8 -r 31f9b82dde77 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.html --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.html Tue May 28 14:13:20 2013 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.html Sat Jun 01 01:56:07 2013 +0200 @@ -12,7 +12,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010-2012 Openbravo SLU + * All portions are Copyright (C) 2010-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -51,6 +51,7 @@ </script> <script language="JavaScript" type="text/javascript"> +var checksToEnable=[]; function showWarning(){ if(!document.frmMain.inpAfterDate.checked){ showJSMessage('APRM_DateWillBeUpdated'); @@ -115,6 +116,7 @@ } function hideClearedTransactions(isChecked) { + disable(); var chk = document.frmMain.inpTransactionId; if (chk === undefined) { return true; @@ -132,7 +134,13 @@ } } } - return true; + try { + var url = "../org.openbravo.advpaymentmngt.ad_actionbutton/Reconciliation.html"; + var paramXMLReq = null; + return submitXmlHttpRequest(callBackLineStatus, document.frmMain, "UPDATESTATUS", url, false, null, paramXMLReq); + } catch (e) { + alert(e); + } } function updateAll(mark) { @@ -255,19 +263,17 @@ <script language="JavaScript" type="text/javascript"> function saveTransactionLineStatus(isChecked, transLineId) { - document.frmMain.inpCurrentTransIdSelected.value = transLineId; - document.frmMain.inpIsCurrentTransSelected.value = isChecked; - document.frmMain.inpClearAll.disabled = true; - document.getElementById('buttonSave').disabled = true; - document.getElementById('buttonProcess').disabled = true; - document.getElementById('buttonCancel').disabled = true; - try { - var url = "../org.openbravo.advpaymentmngt.ad_actionbutton/Reconciliation.html"; - var paramXMLReq = null; - return submitXmlHttpRequest(callBackLineStatus, document.frmMain, "UPDATESTATUS", url, false, null, paramXMLReq); - } catch (e) { - alert(e); - } + document.frmMain.inpCurrentTransIdSelected.value = transLineId; + document.frmMain.inpIsCurrentTransSelected.value = isChecked; + disable(); + try { + var url = "../org.openbravo.advpaymentmngt.ad_actionbutton/Reconciliation.html"; + var paramXMLReq = null; + return submitXmlHttpRequest(callBackLineStatus, document.frmMain, "UPDATESTATUS", url, false, null, paramXMLReq); + + } catch (e) { + alert(e); + } } function callBackLineStatus(paramXMLParticular, XMLHttpRequestObj) { @@ -276,10 +282,7 @@ try { if (XMLHttpRequestObj.responseText) { strText = XMLHttpRequestObj.responseText; - document.frmMain.inpClearAll.disabled = false; - document.getElementById('buttonSave').disabled = false; - document.getElementById('buttonProcess').disabled = false; - document.getElementById('buttonCancel').disabled = false; + enable(); } else { } } catch (e) { @@ -289,6 +292,7 @@ } function loadGrid() { + disable(); try { var url = "../org.openbravo.advpaymentmngt.ad_actionbutton/Reconciliation.html"; var paramXMLReq = null; @@ -326,6 +330,7 @@ document.frmMain.inpIsFirstLoad.value = "false"; } updateWhenAjaxResponse(); + enable(); } else { document.getElementById('sectionGrid').innerHTML = ''; } @@ -334,6 +339,35 @@ } return true; } + +function enable(){ + document.frmMain.inpClearAll.disabled = false; + document.getElementById('buttonSave').disabled = false; + document.getElementById('buttonProcess').disabled = false; + document.getElementById('buttonCancel').disabled = false; + document.getElementById('paramHideCleared').disabled = false; + document.getElementById('paramAfterDate').disabled = false; + for(var i=0; i<checksToEnable.length; i++){ + document.getElementById(checksToEnable[i]).disabled = false; + } + } + + function disable(){ + document.frmMain.inpClearAll.disabled = true; + document.getElementById('buttonSave').disabled = true; + document.getElementById('buttonProcess').disabled = true; + document.getElementById('buttonCancel').disabled = true; + document.getElementById('paramHideCleared').disabled = true; + document.getElementById('paramAfterDate').disabled = true; + var items = document.frmMain.getElementsByTagName("input"); + checksToEnable = []; + for(var i=0; i<items.length; i++){ + if(items[i].name === 'inpTransactionId'){ + items[i].disabled=true; + checksToEnable.push(items[i].id); + } + } + } </script> <script language="JavaScript" type="text/javascript"> function onLoadDo(){ diff -r 4b94b5a758f8 -r 31f9b82dde77 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java Tue May 28 14:13:20 2013 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java Sat Jun 01 01:56:07 2013 +0200 @@ -114,8 +114,9 @@ } else if (vars.commandIn("UPDATESTATUS")) { String strFinancialAccountId = vars.getStringParameter("inpFinFinancialAccountId", ""); - String strSelectedTransId = vars.getStringParameter("inpCurrentTransIdSelected"); + String strSelectedTransId = vars.getStringParameter("inpCurrentTransIdSelected", ""); boolean isChecked = "true".equals(vars.getStringParameter("inpIsCurrentTransSelected")); + updateTransactionStatus(response, strFinancialAccountId, strSelectedTransId, isChecked); } @@ -126,30 +127,31 @@ OBContext.setAdminMode(); try { - FIN_FinaccTransaction trans = OBDal.getInstance().get(FIN_FinaccTransaction.class, - strSelectedTransId); + if (strSelectedTransId != "") { + FIN_FinaccTransaction trans = OBDal.getInstance().get(FIN_FinaccTransaction.class, + strSelectedTransId); + String newStatus = "RPPC"; + if (!isChecked) { + newStatus = (trans.getPaymentAmount().compareTo(trans.getDepositAmount()) >= 0) ? "RDNC" + : "PWNC"; + trans.setReconciliation(null); + if (trans.getFinPayment() != null) { + trans.getFinPayment().setStatus((trans.getFinPayment().isReceipt()) ? "RDNC" : "PWNC"); + } + } else { + FIN_FinancialAccount account = OBDal.getInstance().get(FIN_FinancialAccount.class, + strFinancialAccountId); + FIN_Reconciliation reconciliation = TransactionsDao.getLastReconciliation(account, "N"); + trans.setReconciliation(reconciliation); + if (trans.getFinPayment() != null) { + trans.getFinPayment().setStatus("RPPC"); + } + } - String newStatus = "RPPC"; - if (!isChecked) { - newStatus = (trans.getPaymentAmount().compareTo(trans.getDepositAmount()) >= 0) ? "RDNC" - : "PWNC"; - trans.setReconciliation(null); - if (trans.getFinPayment() != null) { - trans.getFinPayment().setStatus((trans.getFinPayment().isReceipt()) ? "RDNC" : "PWNC"); - } - } else { - FIN_FinancialAccount account = OBDal.getInstance().get(FIN_FinancialAccount.class, - strFinancialAccountId); - FIN_Reconciliation reconciliation = TransactionsDao.getLastReconciliation(account, "N"); - trans.setReconciliation(reconciliation); - if (trans.getFinPayment() != null) { - trans.getFinPayment().setStatus("RPPC"); - } + trans.setStatus(newStatus); + OBDal.getInstance().save(trans); + OBDal.getInstance().flush(); } - trans.setStatus(newStatus); - OBDal.getInstance().save(trans); - OBDal.getInstance().flush(); - response.setContentType("text/html; charset=UTF-8"); PrintWriter out = response.getWriter(); out.println(""); @@ -468,6 +470,7 @@ BigDecimal totalDeposit = new BigDecimal(strTotalDeposit); for (FieldProvider fp : data) { + if (!map.containsKey(fp.getField("transactionId")) && !fp.getField("markSelectedId").isEmpty()) { BigDecimal payAmt = new BigDecimal(fp.getField("paymentAmount")); diff -r 4b94b5a758f8 -r 31f9b82dde77 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ReconciliationGrid.srpt --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ReconciliationGrid.srpt Tue May 28 14:13:20 2013 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ReconciliationGrid.srpt Sat Jun 01 01:56:07 2013 +0200 @@ -12,7 +12,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010-2011 Openbravo SLU + * All portions are Copyright (C) 2010-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -28,6 +28,7 @@ <td class="DataGrid_Body_Cell" title="zz" id="fieldDescription">xxDescription</td> <td class="DataGrid_Body_Cell_Amount" id="fieldPaymentAmount">xx150.00</td> <td class="DataGrid_Body_Cell_Amount" id="fieldDepositAmount">xx60.00</td> - <td class="DataGrid_Body_LineNoCell"><input type="checkbox" name="inpTransactionId" value="" id="fieldTransactionId" onclick="saveTransactionLineStatus(this.checked, this.value); updateAmounts(this.value, this.checked); unselectClearAll(this.checked); return true;"/></td> + <td class="DataGrid_Body_LineNoCell"> + <input type="checkbox" name="inpTransactionId" value="" id="fieldTransactionId_xx" onclick="saveTransactionLineStatus(this.checked, 'xx'); updateAmounts(this.value, this.checked); unselectClearAll(this.checked); return true;"/></td> </tr> -</span> +</span> \ No newline at end of file diff -r 4b94b5a758f8 -r 31f9b82dde77 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ReconciliationGrid.xml --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ReconciliationGrid.xml Tue May 28 14:13:20 2013 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ReconciliationGrid.xml Sat Jun 01 01:56:07 2013 +0200 @@ -42,6 +42,10 @@ <FIELD id="fieldRecordDepositAmt" attribute="value" format="euroEdition">depositAmount</FIELD> <FIELD id="fieldRecordPaymentAmt" attribute="name" replace="xx">transactionId</FIELD> <FIELD id="fieldRecordDepositAmt" attribute="name" replace="xx">transactionId</FIELD> + + <FIELD id="fieldTransactionId_xx" attribute="value">transactionId</FIELD> + <FIELD id="fieldTransactionId_xx" attribute="id">transactionId</FIELD> + <FIELD id="fieldTransactionId_xx" attribute="onclick" replace="xx">transactionId</FIELD> <SECTION id="sectionLinesDetail"/> </structure> diff -r 4b94b5a758f8 -r 31f9b82dde77 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 28 14:13:20 2013 +0530 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Sat Jun 01 01:56:07 2013 +0200 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite It's a free troubleshooting tool designed for production Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://p.sf.net/sfu/appdyn_d2d_ap2 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
