details: https://code.openbravo.com/erp/devel/main/rev/1dc32261dcb2 changeset: 20780:1dc32261dcb2 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Jul 23 05:32:38 2013 +0200 summary: CI: merge back from main
details: https://code.openbravo.com/erp/devel/main/rev/a4cf9374e8db changeset: 20781:a4cf9374e8db user: Martin Taal <martin.taal <at> openbravo.com> date: Tue Jul 23 13:09:51 2013 +0200 summary: Fixes issue 24401: Opening a window results in an additional request for the notes datasource Create the notes datasource in the tab on the server instead of using a separate request. details: https://code.openbravo.com/erp/devel/main/rev/6bb277447d0f changeset: 20782:6bb277447d0f user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Wed Jul 24 09:59:04 2013 +0200 summary: Fixes issue 24083 details: https://code.openbravo.com/erp/devel/main/rev/d3f8f2ef8823 changeset: 20783:d3f8f2ef8823 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed Jul 24 10:50:12 2013 +0200 summary: Fixes issue 23891: Four indexes have been added to improve process perforance These indexes have been added to improve the performance of the Create Inventory Count List process in the Physical Inventory window: - m_stock_proposed table -> m_storage_detail_id - m_transaction table -> m_movementline_id, m_inventoryline_id, m_inoutline_id details: https://code.openbravo.com/erp/devel/main/rev/7050a4c8d664 changeset: 20784:7050a4c8d664 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed Jul 24 11:41:06 2013 +0200 summary: Fixes issue 24390: Only System Admin can define the module of preferences Only the role System Admin should be able to define the ad_module_id column of the preferences (only the preferences with ad_module_id defined can be exported). This has been achieved by making that field visible only for that user (by default that field is always empty). A server side check is not going to be done, because it is risky and it could result in proper preferences not being exported. To fix the preference data of existing faulty preferences (preferences defined by a role other than system admin with invalid visibleat_role_id, visibleat_client_id or visibleat_org_id values) this query could be executed: update ad_preference set ad_module_id = null where (visibleat_role_id is not null and visibleat_role_id != '0') or (visibleat_client_id is not null and visibleat_client_id != '0') or (visibleat_org_id is not null and visibleat_org_id != '0') details: https://code.openbravo.com/erp/devel/main/rev/965b32a20794 changeset: 20785:965b32a20794 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Jul 24 21:13:08 2013 +0200 summary: CI: update AD_MODULE to version 20784 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 12 ++ modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 22 ++++ modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html | 28 +++- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java | 55 +++++++++- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.xml | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.xml | 5 +- 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/templates/ob-view-tab.js.ftl | 1 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java | 8 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.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.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.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/model/tables/M_STOCK_PROPOSED.xml | 3 + src-db/database/model/tables/M_TRANSACTION.xml | 9 + src-db/database/sourcedata/AD_FIELD.xml | 1 + src-db/database/sourcedata/AD_MODULE.xml | 2 +- 54 files changed, 220 insertions(+), 100 deletions(-) diffs (truncated from 1303 to 300 lines): diff -r 6a3af4b90642 -r 965b32a20794 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Tue Jul 23 05:14:38 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Wed Jul 24 21:13:08 2013 +0200 @@ -661,6 +661,18 @@ <!--8EF25E4AD4EF46E4BCE4E0FACAFC717F--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--8EF25E4AD4EF46E4BCE4E0FACAFC717F--></AD_MESSAGE> +<!--8FC3C9524EE54E518B679D58F709119D--><AD_MESSAGE> +<!--8FC3C9524EE54E518B679D58F709119D--> <AD_MESSAGE_ID><![CDATA[8FC3C9524EE54E518B679D58F709119D]]></AD_MESSAGE_ID> +<!--8FC3C9524EE54E518B679D58F709119D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--8FC3C9524EE54E518B679D58F709119D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--8FC3C9524EE54E518B679D58F709119D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--8FC3C9524EE54E518B679D58F709119D--> <VALUE><![CDATA[APRM_AlgorithmConfirm]]></VALUE> +<!--8FC3C9524EE54E518B679D58F709119D--> <MSGTEXT><![CDATA[Do you want the algorithm to be run against unmatched bank statement lines?]]></MSGTEXT> +<!--8FC3C9524EE54E518B679D58F709119D--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--8FC3C9524EE54E518B679D58F709119D--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--8FC3C9524EE54E518B679D58F709119D--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--8FC3C9524EE54E518B679D58F709119D--></AD_MESSAGE> + <!--92EC1935A8B947BA83EF82DBD169CA8B--><AD_MESSAGE> <!--92EC1935A8B947BA83EF82DBD169CA8B--> <AD_MESSAGE_ID><![CDATA[92EC1935A8B947BA83EF82DBD169CA8B]]></AD_MESSAGE_ID> <!--92EC1935A8B947BA83EF82DBD169CA8B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 6a3af4b90642 -r 965b32a20794 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Jul 23 05:14:38 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Jul 24 21:13:08 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.20778]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.20784]]></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 6a3af4b90642 -r 965b32a20794 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 Jul 23 05:14:38 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jul 24 21:13:08 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.20778]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.20784]]></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.20778]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.20784]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 6a3af4b90642 -r 965b32a20794 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Jul 23 05:14:38 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Wed Jul 24 21:13:08 2013 +0200 @@ -594,6 +594,17 @@ <!--4E68CD319FF945578CCF11CF38E0C58C--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--4E68CD319FF945578CCF11CF38E0C58C--></AD_TEXTINTERFACES> +<!--4F3BB58595AA4968BC70A08B60AF3BD9--><AD_TEXTINTERFACES> +<!--4F3BB58595AA4968BC70A08B60AF3BD9--> <AD_TEXTINTERFACES_ID><![CDATA[4F3BB58595AA4968BC70A08B60AF3BD9]]></AD_TEXTINTERFACES_ID> +<!--4F3BB58595AA4968BC70A08B60AF3BD9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--4F3BB58595AA4968BC70A08B60AF3BD9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--4F3BB58595AA4968BC70A08B60AF3BD9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--4F3BB58595AA4968BC70A08B60AF3BD9--> <TEXT><![CDATA[Match Type]]></TEXT> +<!--4F3BB58595AA4968BC70A08B60AF3BD9--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html]]></FILENAME> +<!--4F3BB58595AA4968BC70A08B60AF3BD9--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--4F3BB58595AA4968BC70A08B60AF3BD9--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--4F3BB58595AA4968BC70A08B60AF3BD9--></AD_TEXTINTERFACES> + <!--549D43D3510845D1965ACD2697B007FA--><AD_TEXTINTERFACES> <!--549D43D3510845D1965ACD2697B007FA--> <AD_TEXTINTERFACES_ID><![CDATA[549D43D3510845D1965ACD2697B007FA]]></AD_TEXTINTERFACES_ID> <!--549D43D3510845D1965ACD2697B007FA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -957,6 +968,17 @@ <!--791A5A770CBA456E9CB8BC43B2495935--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--791A5A770CBA456E9CB8BC43B2495935--></AD_TEXTINTERFACES> +<!--7A0C71B074C448E5B92563BF3C639436--><AD_TEXTINTERFACES> +<!--7A0C71B074C448E5B92563BF3C639436--> <AD_TEXTINTERFACES_ID><![CDATA[7A0C71B074C448E5B92563BF3C639436]]></AD_TEXTINTERFACES_ID> +<!--7A0C71B074C448E5B92563BF3C639436--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--7A0C71B074C448E5B92563BF3C639436--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--7A0C71B074C448E5B92563BF3C639436--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--7A0C71B074C448E5B92563BF3C639436--> <TEXT><![CDATA[Undo]]></TEXT> +<!--7A0C71B074C448E5B92563BF3C639436--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html]]></FILENAME> +<!--7A0C71B074C448E5B92563BF3C639436--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--7A0C71B074C448E5B92563BF3C639436--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--7A0C71B074C448E5B92563BF3C639436--></AD_TEXTINTERFACES> + <!--7A2F80682E4D44568B2BDF1F7D41E935--><AD_TEXTINTERFACES> <!--7A2F80682E4D44568B2BDF1F7D41E935--> <AD_TEXTINTERFACES_ID><![CDATA[7A2F80682E4D44568B2BDF1F7D41E935]]></AD_TEXTINTERFACES_ID> <!--7A2F80682E4D44568B2BDF1F7D41E935--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 6a3af4b90642 -r 965b32a20794 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 Tue Jul 23 05:14:38 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html Wed Jul 24 21:13:08 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): ______________________________________. ************************************************************************* @@ -80,6 +80,7 @@ document.getElementById("inpReferenceNo_" + sc_FIN_FinAcc_Transaction_ID.bslId).innerHTML = selected["finPayment" + OB.Constants.FIELDSEPARATOR + "referenceNo"]==undefined?'':selected["finPayment" + OB.Constants.FIELDSEPARATOR + "referenceNo"]; document.getElementById("inpAmount_" + sc_FIN_FinAcc_Transaction_ID.bslId).innerHTML = subtract(depositAmt, paymentAmt); document.getElementById("inpMatchingType_" + sc_FIN_FinAcc_Transaction_ID.bslId).value = "MA"; + document.getElementById("inpMatchType_" + sc_FIN_FinAcc_Transaction_ID.bslId).innerHTML = "Manual"; document.getElementById("inpCheckBox_" + sc_FIN_FinAcc_Transaction_ID.bslId).checked = true; document.getElementById("inpCheckBox_" + sc_FIN_FinAcc_Transaction_ID.bslId).disabled = false; document.frmMain.inpFinBankStatementLineId.value = sc_FIN_FinAcc_Transaction_ID.bslId; @@ -140,6 +141,7 @@ document.getElementById("inpFinancialTransactionId_" + bankStatementLineId).value = ""; document.getElementById("inpMatchStyle_" + bankStatementLineId).style.backgroundColor = "white"; document.getElementById("inpMatchingType_" + bankStatementLineId).value = ""; + document.getElementById("inpMatchType_" + bankStatementLineId).innerHTML = ""; document.getElementById("inpExecuteMatching").value = "N"; } else { @@ -341,7 +343,11 @@ try { onloadFunctions(); } catch (e) {} - loadGrid(); + if(confirm(document.getElementById("paramConfirmationMessage").value)){ + loadGrid(); + }else{ + loadGrid(true); + } resizeAreaCreateFrom(); } function validate(action) { @@ -358,6 +364,7 @@ <input type="hidden" name="Command" /> <input type="hidden" name="IsPopUpCall" value="1" /> <input type="hidden" name="paraMatchedAgainstTransaction" value="xxTransaction" id="paraMatchedAgainstTransaction"/> + <input type="hidden" name="paramConfirmationMessage" value="xxMessage" id="paramConfirmationMessage"/> <input type="hidden" name="inpadOrgId" value="" id="fieldOrg"/> <input type="hidden" name="inpwindowId" value="MBS" id="fieldWindowId"/> <input type="hidden" name="inpTabId" value="" id="fieldTabId"/> @@ -602,6 +609,7 @@ <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="100">Amount</th> <th class="DataGrid_Header_Cell" style="text-align: center;" width="100">Match</th> <th class="DataGrid_Header_Cell" width="70">Matched Document</th> + <th class="DataGrid_Header_Cell" width="70">Match Type</th> <th class="DataGrid_Header_Cell" width="70">Date</th> <th class="DataGrid_Header_Cell" width="100">Bus. Partner</th> <th class="DataGrid_Header_Cell" width="100">Reference</th> @@ -641,19 +649,19 @@ id="buttonProcess" class="ButtonLink" onclick="submitThisPage('SAVE');return false;" - onfocus="buttonEvent('onfocus', this); window.status='Save'; return true;" + onfocus="buttonEvent('onfocus', this); window.status='OK'; return true;" onblur="buttonEvent('onblur', this);" onkeyup="buttonEvent('onkeyup', this);" onkeydown="buttonEvent('onkeydown', this);" onkeypress="buttonEvent('onkeypress', this);" onmouseup="buttonEvent('onmouseup', this);" onmousedown="buttonEvent('onmousedown', this);" - onmouseover="buttonEvent('onmouseover', this); window.status='Save'; return true;" + onmouseover="buttonEvent('onmouseover', this); window.status='OK'; return true;" onmouseout="buttonEvent('onmouseout', this);"> <table class="Button"> <tr> - <td class="Button_left"><img class="Button_Icon Button_Icon_save" alt="Save" title="Save" src="../../../../../web/images/blank.gif" border="0" /></td> - <td class="Button_text Button_width">Save</td> + <td class="Button_left"><img class="Button_Icon Button_Icon_save" alt="OK" title="OK" src="../../../../../web/images/blank.gif" border="0" /></td> + <td class="Button_text Button_width">OK</td> <td class="Button_right"></td> </tr> </table> @@ -691,19 +699,19 @@ id="buttonCancel" class="ButtonLink" onclick="submitThisPage('CANCEL');return false;" - onfocus="buttonEvent('onfocus', this); window.status='Cancel'; return true;" + onfocus="buttonEvent('onfocus', this); window.status='Undo'; return true;" onblur="buttonEvent('onblur', this);" onkeyup="buttonEvent('onkeyup', this);" onkeydown="buttonEvent('onkeydown', this);" onkeypress="buttonEvent('onkeypress', this);" onmouseup="buttonEvent('onmouseup', this);" onmousedown="buttonEvent('onmousedown', this);" - onmouseover="buttonEvent('onmouseover', this); window.status='Cancel'; return true;" + onmouseover="buttonEvent('onmouseover', this); window.status='Undo'; return true;" onmouseout="buttonEvent('onmouseout', this);"> <table class="Button"> <tr> - <td class="Button_left"><img class="Button_Icon Button_Icon_cancel" alt="Cancel" title="Cancel" src="../../../../../web/images/blank.gif" border="0" /></td> - <td class="Button_text Button_width">Cancel</td> + <td class="Button_left"><img class="Button_Icon Button_Icon_cancel" alt="Undo" title="Undo" src="../../../../../web/images/blank.gif" border="0" /></td> + <td class="Button_text Button_width">Undo</td> <td class="Button_right"></td> </tr> </table> diff -r 6a3af4b90642 -r 965b32a20794 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java Tue Jul 23 05:14:38 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java Wed Jul 24 21:13:08 2013 +0200 @@ -11,7 +11,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): ______________________________________. ************************************************************************* @@ -60,6 +60,8 @@ import org.openbravo.erpCommon.utility.FieldProviderFactory; import org.openbravo.erpCommon.utility.OBError; import org.openbravo.erpCommon.utility.Utility; +import org.openbravo.model.ad.domain.ListTrl; +import org.openbravo.model.ad.domain.Reference; import org.openbravo.model.common.businesspartner.BusinessPartner; import org.openbravo.model.common.enterprise.DocumentType; import org.openbravo.model.common.enterprise.Organization; @@ -209,6 +211,10 @@ + strMatchedBankStatementLineId); matchBankStatementLine(strMatchedBankStatementLineId, strFinancialTransactionId, strReconciliationId, null); + response.setContentType("text/html; charset=UTF-8"); + PrintWriter out = response.getWriter(); + out.println("data = " + new JSONObject().toString()); + out.close(); // log4j.error("Match took: " + (System.currentTimeMillis() - init)); } else if (vars.commandIn("CANCEL")) { strReconciliationId = vars.getRequiredStringParameter("inpfinReconciliationId"); @@ -336,6 +342,7 @@ xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage() + "\";"); xmlDocument.setParameter("theme", vars.getTheme()); final String MATCHED_AGAINST_TRANSACTION = FIN_Utility.messageBD("APRM_Transaction"); + final String CONFIRMATION_MESSAGE = FIN_Utility.messageBD("APRM_AlgorithmConfirm"); FIN_Reconciliation reconciliation = OBDal.getInstance().get(FIN_Reconciliation.class, reconciliationId); @@ -346,6 +353,7 @@ xmlDocument.setParameter("financialAccountId", strFinancialAccountId); xmlDocument.setParameter("reconciliationId", reconciliationId); xmlDocument.setParameter("matchedAgainstTransaction", MATCHED_AGAINST_TRANSACTION); + xmlDocument.setParameter("confirmationMessage", CONFIRMATION_MESSAGE); xmlDocument.setParameter("trlSplitConfirmText", FIN_Utility.messageBD("APRM_SplitBankStatementLineConfirm")); @@ -486,9 +494,10 @@ final String MATCHED_AGAINST_INVOICE = FIN_Utility.messageBD("APRM_Invoice"); final String MATCHED_AGAINST_ORDER = FIN_Utility.messageBD("APRM_Order"); final String MATCHED_AGAINST_CREDIT = FIN_Utility.messageBD("APRM_Credit"); + HashMap<String, String> matchingTypes = getMatchingTypes(); try { List<FIN_FinaccTransaction> excluded = new ArrayList<FIN_FinaccTransaction>(); - long initMatch = 0l; + // long initMatch = 0l; for (int i = 0; i < data.length; i++) { final String COLOR_STRONG = "#66CC00"; final String COLOR_WEAK = "#99CC66"; @@ -507,7 +516,7 @@ try { long initMatchLine = System.currentTimeMillis(); matched = matchingTransaction.match(line, excluded); - initMatch = initMatch + (System.currentTimeMillis() - initMatchLine); + // initMatch = initMatch + (System.currentTimeMillis() - initMatchLine); OBDal.getInstance().getConnection().commit(); } catch (Exception e) { OBDal.getInstance().rollbackAndClose(); @@ -575,9 +584,12 @@ : ((FIN_MatchedTransaction.NOMATCH.equals(matchingType) || FIN_MatchedTransaction.MANUALMATCH .equals(matchingType)) ? COLOR_WHITE : matchingType))); FieldProviderFactory.setField(data[i], "matchingType", matchingType); + FieldProviderFactory.setField(data[i], "matchingTypeDescription", ""); if (transaction != null) { FieldProviderFactory.setField(data[i], "disabled", "N"); + FieldProviderFactory.setField(data[i], "matchingTypeDescription", + matchingTypes.get(matchingType)); // Auto Matching or already matched // FieldProviderFactory.setField(data[i], "checked", // FIN_MatchedTransaction.STRONG.equals(matchingType) || alreadyMatched ? "Y" : "N"); @@ -634,7 +646,7 @@ FieldProviderFactory.setField(data[i], "transactionAmount", ""); } } - log4j.error("matching took: " + initMatch); + // log4j.error("matching took: " + initMatch); } finally { OBContext.restorePreviousMode(); } @@ -642,6 +654,41 @@ return data; } + private HashMap<String, String> getMatchingTypes() { + final Reference MATCHING_TYPE_REFERENCE = OBDal.getInstance().get(Reference.class, + "BCABCED4983A4ECB814A6D142593ACEA"); + HashMap<String, String> result = new HashMap<String, String>(); + OBContext.setAdminMode(false); + try { ------------------------------------------------------------------------------ See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
