Fixes issue 24083
authorEduardo Argal Guibert <eduardo.argal@openbravo.com>
Wed, 24 Jul 2013 09:59:04 +0200
changeset 20782 6bb277447d0f
parent 20781 a4cf9374e8db
child 20783 d3f8f2ef8823
Fixes issue 24083
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.xml
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Jul 23 13:09:51 2013 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Jul 24 09:59:04 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>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Tue Jul 23 13:09:51 2013 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Wed Jul 24 09:59:04 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>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html	Tue Jul 23 13:09:51 2013 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html	Wed Jul 24 09:59:04 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>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java	Tue Jul 23 13:09:51 2013 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java	Wed Jul 24 09:59:04 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 {
+      OBCriteria<org.openbravo.model.ad.domain.List> obc = OBDal.getInstance().createCriteria(
+          org.openbravo.model.ad.domain.List.class);
+      obc.add(Restrictions.eq(org.openbravo.model.ad.domain.List.PROPERTY_REFERENCE,
+          MATCHING_TYPE_REFERENCE));
+      for (org.openbravo.model.ad.domain.List element : obc.list()) {
+        List<ListTrl> trlList = element.getADListTrlList();
+        if (trlList.size() > 0) {
+          boolean found = false;
+          for (ListTrl trl : trlList) {
+            if (trl.getLanguage().getLanguage()
+                .equals(OBContext.getOBContext().getLanguage().getLanguage())) {
+              result.put(element.getSearchKey(), trl.getName());
+              found = true;
+              break;
+            }
+          }
+          if (!found) {
+            result.put(element.getSearchKey(), element.getName());
+          }
+        } else {
+          result.put(element.getSearchKey(), element.getName());
+        }
+      }
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+    return result;
+  }
+
   public String checkReconciliationNotProcessed(VariablesSecureApp vars,
       String strReconciliationId, String strTabId) {
     FIN_Reconciliation reconciliation = MatchTransactionDao.getObject(FIN_Reconciliation.class,
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.xml	Tue Jul 23 13:09:51 2013 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.xml	Wed Jul 24 09:59:04 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):  ______________________________________.
  *************************************************************************
@@ -39,6 +39,7 @@
     <PARAMETER id="fieldhideDate" name="hideDate" boolean="checked" withId="paramChecked"/>
     <PARAMETER id="paramPaymentTypeFilter" name="paramPaymentTypeFilter"/>
     <PARAMETER id="paraMatchedAgainstTransaction" name="matchedAgainstTransaction" attribute="value"/>
+    <PARAMETER id="paramConfirmationMessage" name="confirmationMessage" attribute="value"/>
     <PARAMETER id="paramTrlSplitConfirmText" name="trlSplitConfirmText" attribute="value"/>
     <SUBREPORT id="inpPaymentTypeFilter" name="reportPaymentTypeFilter" report="org/openbravo/erpCommon/reference/List">
       <ARGUMENT name="parameterListSelected" withId="paramPaymentTypeFilter"/>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt	Tue Jul 23 13:09:51 2013 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt	Wed Jul 24 09:59:04 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):  ______________________________________.
  *************************************************************************
@@ -36,6 +36,7 @@
       <a href="#" onclick="openAddTransaction('xx');" id="fieldAddLink" name="fieldAddLink"><img src="../../../../../web/org.openbravo.advpaymentmngt/images/add.png" style="border-style: none"/></a>
     </td>
     <td class="DataGrid_Body_Cell" id="inpMatchedDocument_xx" title="">xxTransaction</td>
+    <td class="DataGrid_Body_Cell" id="inpMatchType_xx" title="">xxMatchType</td>
     <td class="DataGrid_Body_Cell" id="inpTransactionDate_xx" title="">xx01-01-2010</td>
     <td class="DataGrid_Body_Cell" id="inpBPartner_xx" title="">xxBP Name</td>
     <td class="DataGrid_Body_Cell" id="inpReferenceNo_xx" title="">xx111999111</td>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.xml	Tue Jul 23 13:09:51 2013 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.xml	Wed Jul 24 09:59:04 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):  ______________________________________.
  *************************************************************************
@@ -51,6 +51,9 @@
     <FIELD id="inpMatchingType_xx" attribute="value">matchingType</FIELD>
     <FIELD id="inpMatchingType_xx" attribute="name" replace="xx">finBankLineId</FIELD>
     <FIELD id="inpMatchingType_xx" attribute="id" replace="xx">finBankLineId</FIELD>
+    <FIELD id="inpMatchType_xx">matchingTypeDescription</FIELD>
+    <FIELD id="inpMatchType_xx" attribute="id" replace="xx">finBankLineId</FIELD>
+    <FIELD id="inpMatchType_xx" attribute="title">trxDescription</FIELD>
     <FIELD id="fieldAddLink" attribute="onclick" replace="xx">finBankLineId</FIELD>
     <FIELD id="inpTransactionDate_xx">transactionDate</FIELD>
     <FIELD id="inpTransactionDate_xx" attribute="title">trxDescription</FIELD>