details: https://code.openbravo.com/erp/devel/pi/rev/7be8369e7657 changeset: 13656:7be8369e7657 user: David Alsasua <david.alsasua <at> openbravo.com> date: Fri Aug 26 17:50:25 2011 +0200 summary: Fixes issue 18056. Just in case the values of filter elements change, the grid is re-printed
details: https://code.openbravo.com/erp/devel/pi/rev/4c5e41a427e5 changeset: 13657:4c5e41a427e5 user: David Alsasua <david.alsasua <at> openbravo.com> date: Mon Sep 05 10:20:24 2011 +0200 summary: Merge diffstat: CONTRIBUTORS | 1 + modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml | 87 ++++ modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml | 4 +- 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/AddOrderOrInvoice.html | 31 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js | 28 +- 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/MenuManager.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-form.js.ftl | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 55 ++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js | 47 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js | 20 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 34 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js | 1 - modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js | 15 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 60 ++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 13 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 35 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-help-about-widget.js | 4 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js | 5 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization-treegrid.js | 7 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js | 34 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-date.js | 22 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationComponent.java | 7 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl | 7 +- modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/js/scopeleaks.min.js | 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.myob/web/org.openbravo.client.myob/js/ob-community-branding-widget.js | 2 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js | 14 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-showparameter-widget.js | 2 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js | 1 + 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/PaymentReport.java | 20 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 4 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/templates/datasource.ftl | 1 + modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_REF_LIST.xml | 15 + modules/org.openbravo.service.integration.openid/lib/runtime/httpmime-4.1.jar | 0 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.selector/src/org/openbravo/userinterface/selector/templates/selector-as-link.ftl | 8 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/templates/selector.ftl | 8 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 58 +-- 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.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 28 + 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/configScript.xml | 4 - modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- referencedata/sampledata/F_B_International_Group.xml | 91 +---- src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml | 16 +- src-db/database/model/functions/M_INVENTORY_LISTCREATE.xml | 2 +- src-db/database/sourcedata/AD_CALLOUT.xml | 11 + src-db/database/sourcedata/AD_COLUMN.xml | 7 +- src-db/database/sourcedata/AD_FIELD.xml | 2 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 + src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 + src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_REF_LIST.xml | 12 + src/index.jsp | 1 + src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java | 30 +- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt_data.xsql | 24 + src/org/openbravo/erpCommon/ad_callouts/SL_Product_Type.java | 82 ++++ src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 2 +- src/org/openbravo/erpCommon/security/Login.java | 15 +- src/org/openbravo/erpCommon/utility/ImageUtils.java | 183 ++++++++++ src/org/openbravo/erpCommon/utility/ShowImage.java | 42 +-- src/org/openbravo/erpCommon/utility/ShowImageLogo.java | 68 +--- web/js/utils.js | 15 + 106 files changed, 1056 insertions(+), 470 deletions(-) diffs (truncated from 3536 to 300 lines): diff -r d123510d47e0 -r 4c5e41a427e5 CONTRIBUTORS --- a/CONTRIBUTORS Wed Aug 24 13:51:08 2011 +0200 +++ b/CONTRIBUTORS Mon Sep 05 10:20:24 2011 +0200 @@ -13,3 +13,4 @@ Sreedhar Sirigiri TDS - provided deep linking with filter clause Mallikarjun M TDS - provided deep linking with filter clause Shankar Balachandran <[email protected]> - Bug fixing +Francois Le Roux - <[email protected]> - Bug fixing and documentation diff -r d123510d47e0 -r 4c5e41a427e5 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Mon Sep 05 10:20:24 2011 +0200 @@ -0,0 +1,87 @@ +<?xml version="1.0"?> + <database name="FUNCTION APRM_ISPAYMENTCONFIRMED"> + <function name="APRM_ISPAYMENTCONFIRMED" type="VARCHAR"> + <parameter name="status" type="VARCHAR" mode="in"> + <default/> + </parameter> + <parameter name="fin_payment_scheduledetail_id" type="VARCHAR" mode="in"> + <default/> + </parameter> + <body><![CDATA[/************************************************************************* +* The contents of this file are subject to the Openbravo Public License +* Version 1.1 (the "License"), being the Mozilla Public License +* Version 1.1 with a permitted attribution clause; you may not use this +* file except in compliance with the License. You may obtain a copy of +* the License at http://www.openbravo.com/legal/license.html +* Software distributed under the License is distributed on an "AS IS" +* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +* License for the specific language governing rights and limitations +* under the License. +* The Original Code is Openbravo ERP. +* The Initial Developer of the Original Code is Openbravo SLU +* All portions are Copyright (C) 2011 Openbravo SLU +* All Rights Reserved. +* Contributor(s): ______________________________________. +************************************************************************/ + v_Sql VARCHAR2(2000); + v_count NUMBER; + v_module VARCHAR2(32); + v_dbprefix VARCHAR2(7); + v_isPaymentConfirmed CHAR(1) := 'N'; + TYPE RECORD IS REF CURSOR; + Cur_Dbprefix RECORD; + +BEGIN + -- Check if the status exists + SELECT count(*) INTO v_count FROM DUAL + WHERE EXISTS (SELECT 1 FROM ad_ref_list + WHERE ad_reference_id = '575BCB88A4694C27BC013DE9C73E6FE7' + AND value = status); + + IF (v_count = 0) THEN + RETURN 'N'; + END IF; + IF (status IN ('PPM', 'RPR', 'PWNC', 'RDNC', 'RPPC')) THEN + -- core final statuses + v_isPaymentConfirmed := 'Y'; + ELSIF (status IN ('RPAP', 'RPAE', 'RPVOID')) THEN + -- core intermediate statuses + v_isPaymentConfirmed := 'N'; + ELSE + -- statuses implemented by other module + SELECT ad_module_id INTO v_module + FROM ad_ref_list + WHERE ad_reference_id = '575BCB88A4694C27BC013DE9C73E6FE7' + AND value = status; + + -- if the module defines a merge can have several dbprefix + FOR Cur_Dbprefix IN ( + SELECT name AS dbprefix + FROM ad_module_dbprefix + WHERE ad_module_id = v_module + ORDER BY name) + LOOP + BEGIN + v_Sql := 'SELECT ' || Cur_Dbprefix.dbprefix || '_ispaymentconfirmed' || '(''' || status || ''', ''' || fin_payment_scheduledetail_id || ''') FROM DUAL'; + + EXECUTE IMMEDIATE v_Sql INTO v_isPaymentConfirmed; + IF (v_ispaymentconfirmed = 'Y') THEN + EXIT; + END IF; + EXCEPTION WHEN OTHERS THEN + DBMS_OUTPUT.PUT_LINE(Cur_Dbprefix.dbprefix || '_ispaymentconfirmed function not implemented'); + -- do nothing + END; + END LOOP; + END IF; + + RETURN v_isPaymentConfirmed; + +EXCEPTION +WHEN OTHERS THEN + DBMS_OUTPUT.PUT_LINE('aprm_ispaymentconfirmed exception'); + RAISE; +END APRM_ISPAYMENTCONFIRMED +]]></body> + </function> + </database> diff -r d123510d47e0 -r 4c5e41a427e5 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Wed Aug 24 13:51:08 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Mon Sep 05 10:20:24 2011 +0200 @@ -333,7 +333,7 @@ <!--18096D8809024E67A36E636EA0D9D0E7--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--18096D8809024E67A36E636EA0D9D0E7--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--18096D8809024E67A36E636EA0D9D0E7--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--18096D8809024E67A36E636EA0D9D0E7--> <POSITION><![CDATA[18]]></POSITION> +<!--18096D8809024E67A36E636EA0D9D0E7--> <POSITION><![CDATA[25]]></POSITION> <!--18096D8809024E67A36E636EA0D9D0E7--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--18096D8809024E67A36E636EA0D9D0E7--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--18096D8809024E67A36E636EA0D9D0E7--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> @@ -6383,7 +6383,7 @@ <!--F362B84F4718449EAD840F1C25667B37--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--F362B84F4718449EAD840F1C25667B37--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--F362B84F4718449EAD840F1C25667B37--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--F362B84F4718449EAD840F1C25667B37--> <POSITION><![CDATA[22]]></POSITION> +<!--F362B84F4718449EAD840F1C25667B37--> <POSITION><![CDATA[25]]></POSITION> <!--F362B84F4718449EAD840F1C25667B37--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--F362B84F4718449EAD840F1C25667B37--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--F362B84F4718449EAD840F1C25667B37--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> diff -r d123510d47e0 -r 4c5e41a427e5 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Aug 24 13:51:08 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Sep 05 10:20:24 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.13592]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.13653]]></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 d123510d47e0 -r 4c5e41a427e5 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 Wed Aug 24 13:51:08 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Sep 05 10:20:24 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.13592]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.13653]]></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.13592]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.13653]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r d123510d47e0 -r 4c5e41a427e5 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html Wed Aug 24 13:51:08 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html Mon Sep 05 10:20:24 2011 +0200 @@ -55,6 +55,7 @@ OB.APRM.APFT_GLItems = []; OB.APRM.APFT_GLItemsId = 0; OB.APRM.HasGLItems = false; + OB.APRM.AOOI_bp = null; var hasBPartner = null; </script> <script language="JavaScript" type="text/javascript"> @@ -100,12 +101,28 @@ return true; } function loadGridList() { - try { - var url = '../org.openbravo.advpaymentmngt.ad_actionbutton/AddOrderOrInvoice.html'; - var paramXMLReq = null; - return submitXmlHttpRequest(callBackGrid, document.frmMain, 'GRIDLIST', url, false, null, paramXMLReq); - } catch (e) { - alert(e); + if (OB.APRM.AOOI_bp === null || + OB.APRM.AOOI_bp !== document.getElementById('C_BPartner_ID').value || + OB.APRM.AOOI_dt !== document.getElementById('paramDocumentType').value || + OB.APRM.AOOI_pm !== document.getElementById('paramAlternativePaymentMethod').checked || + OB.APRM.AOOI_ddf !== document.getElementById('paramDueDateFrom').value || + OB.APRM.AOOI_ddt !== document.getElementById('paramDueDateTo').value || + OB.APRM.AOOI_cu !== document.getElementById('paramCurrencyId').value) + { + OB.APRM.AOOI_bp = document.getElementById('C_BPartner_ID').value; + OB.APRM.AOOI_dt = document.getElementById('paramDocumentType').value; + OB.APRM.AOOI_pm = document.getElementById('paramAlternativePaymentMethod').checked; + OB.APRM.AOOI_ddf = document.getElementById('paramDueDateFrom').value; + OB.APRM.AOOI_ddt = document.getElementById('paramDueDateTo').value; + OB.APRM.AOOI_cu = document.getElementById('paramCurrencyId').value; + + try { + var url = '../org.openbravo.advpaymentmngt.ad_actionbutton/AddOrderOrInvoice.html'; + var paramXMLReq = null; + return submitXmlHttpRequest(callBackGrid, document.frmMain, 'GRIDLIST', url, false, null, paramXMLReq); + } catch (e) { + alert(e); + } } } </script> @@ -836,7 +853,7 @@ <tr> <td class="TitleCell"><span class="LabelText">Transaction Type</span></td> <td class="Combo_ContentCell"> - <select name="inpDocumentType" class="ComboKey Combo_OneCell_width" onchange="documentTypeOnChange(this.value);"> + <select id="paramDocumentType" name="inpDocumentType" class="ComboKey Combo_OneCell_width" onchange="documentTypeOnChange(this.value);"> <option value="O">Orders</option> <option value="I" selected="selected">Invoices</option> <option value="B">Orders and Invoices</option> diff -r d123510d47e0 -r 4c5e41a427e5 modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js Wed Aug 24 13:51:08 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js Mon Sep 05 10:20:24 2011 +0200 @@ -41,10 +41,16 @@ if (!isCreditAllowed) { frm.inpUseCredit.checked = false; } - globalMaskNumeric = getDefaultMaskNumeric(); globalDecSeparator = getGlobalDecSeparator(); globalGroupSeparator = getGlobalGroupSeparator(); globalGroupInterval = getGlobalGroupInterval(); + + globalMaskNumeric = formatNameToMask('euroEdition'); + if (!globalMaskNumeric && OB && OB.Format && OB.Format.formats) { + globalMaskNumeric = OB.Format.formats.euroEdition; + globalMaskNumeric = returnMaskChange(globalMaskNumeric, '.', ',', globalDecSeparator, globalGroupSeparator); + } + globalMaskNumeric = globalMaskNumeric || getDefaultMaskNumeric(); } function processLabels() { @@ -303,8 +309,8 @@ } function updateDifference() { - var expected = (frm.inpExpectedPayment && frm.inpExpectedPayment.value) ? frm.inpExpectedPayment.value : 0, - total = (frm.inpTotal && frm.inpTotal.value) ? frm.inpTotal.value : 0, + var expected = (frm.inpExpectedPayment && frm.inpExpectedPayment.value) ? frm.inpExpectedPayment.value : applyFormat('0'), + total = (frm.inpTotal && frm.inpTotal.value) ? frm.inpTotal.value : applyFormat('0'), amount = total, invoicedAmount = total; @@ -323,7 +329,7 @@ } else if ( compareWithSign(amount, '>', total) ) { frm.inpDifference.value = subtract(amount, total); } else { - frm.inpDifference.value = 0; + frm.inpDifference.value = applyFormat('0'); } document.getElementById('paramDifference').innerHTML = frm.inpDifference.value; displayLogicElement('sectionDifference', ( compare(expected, '!=', total) || compareWithSign(amount, '>', total) ) ); @@ -346,7 +352,7 @@ function updateTotal() { var chk = frm.inpScheduledPaymentDetailId; - var total = 0, i, invalidSpan; + var total = applyFormat('0'), i, invalidSpan; var scheduledPaymentDetailId, pendingAmount, amount, isAnyChecked = false; var selectedBusinessPartners = { numberofitems: 0, @@ -385,9 +391,9 @@ frm.inpActualPayment.value = frm.inpGeneratedCredit.value; } updateDifference(); - if (OB.APRM.HasGLItems === 'undefined' || !OB.APRM.HasGLItems) { + //if (OB.APRM.HasGLItems === 'undefined' || !OB.APRM.HasGLItems) { //return; - } + //} } else if (!chk.length) { scheduledPaymentDetailId = frm.inpRecordId0.value; pendingAmount = frm.elements["inpRecordAmt" + scheduledPaymentDetailId].value; @@ -548,9 +554,9 @@ var chk = frm.inpScheduledPaymentDetailId; var recordAmount, i; - frm.inpExpectedPayment.value = '0'; + frm.inpExpectedPayment.value = applyFormat('0'); if (isGLItemEnabled) { - frm.inpExpectedPayment.value = frm.inpGLSumAmount.value || '0'; + frm.inpExpectedPayment.value = frm.inpGLSumAmount.value || applyFormat('0'); } if (!chk) { return; @@ -613,7 +619,7 @@ if (!validateSelectedAmounts(chk.value, compare(selectedTotal, '<', actualPayment), action)) { return false; } - } else if ( !allowNotSelectingPendingPayment || compare(document.frmMain.inpDifference.value, '==', "0") ){ + } else if ( !allowNotSelectingPendingPayment || compare(actualPayment, '==', "0")){ showJSMessage('APRM_JSNOTLINESELECTED'); return false; } @@ -629,7 +635,7 @@ } } if (!isAnyChecked && - (!allowNotSelectingPendingPayment || compare(document.frmMain.inpDifference.value, '==', "0")) + (!allowNotSelectingPendingPayment || compare(actualPayment, '==', "0")) ) { showJSMessage('APRM_JSNOTLINESELECTED'); return false; ------------------------------------------------------------------------------ Special Offer -- Download ArcSight Logger for FREE! Finally, a world-class log management solution at an even better price-free! And you'll get a free "Love Thy Logs" t-shirt when you download Logger. Secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsisghtdev2dev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
