Fixed issue 22066 Reconciliation Improvements
authorEduardo Argal <eduardo.argal@openbravo.com>
Mon, 22 Oct 2012 16:36:31 +0200
changeset 18274 5d1507be93aa
parent 18273 36c0d02f28b3
child 18275 360196c01a82
Fixed issue 22066 Reconciliation Improvements
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.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/dao/AdvPaymentMngtDao.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/MatchTransactionDao.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js
src-db/database/model/tables/FIN_BANKFILE_EXCEPTION.xml
src-db/database/model/tables/FIN_BANKSTATEMENTLINE.xml
src-db/database/model/tables/FIN_FINACC_PAYMENTMETHOD.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_TAB.xml
src-db/database/sourcedata/AD_TABLE.xml
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Tue Oct 23 12:29:09 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Mon Oct 22 16:36:31 2012 +0200
@@ -108,6 +108,19 @@
 <!--B8C833E4F0A44A2DA5FC7606F3CD9439-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--B8C833E4F0A44A2DA5FC7606F3CD9439--></AD_REFERENCE>
 
+<!--C1B4345A1F8841C2B1ADD403CA733D75--><AD_REFERENCE>
+<!--C1B4345A1F8841C2B1ADD403CA733D75-->  <AD_REFERENCE_ID><![CDATA[C1B4345A1F8841C2B1ADD403CA733D75]]></AD_REFERENCE_ID>
+<!--C1B4345A1F8841C2B1ADD403CA733D75-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C1B4345A1F8841C2B1ADD403CA733D75-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C1B4345A1F8841C2B1ADD403CA733D75-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C1B4345A1F8841C2B1ADD403CA733D75-->  <NAME><![CDATA[Transaction Type AddTransaction]]></NAME>
+<!--C1B4345A1F8841C2B1ADD403CA733D75-->  <DESCRIPTION><![CDATA[List of options for transaction type in Add Transaction popup]]></DESCRIPTION>
+<!--C1B4345A1F8841C2B1ADD403CA733D75-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--C1B4345A1F8841C2B1ADD403CA733D75-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--C1B4345A1F8841C2B1ADD403CA733D75-->  <PARENTREFERENCE_ID><![CDATA[17]]></PARENTREFERENCE_ID>
+<!--C1B4345A1F8841C2B1ADD403CA733D75-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--C1B4345A1F8841C2B1ADD403CA733D75--></AD_REFERENCE>
+
 <!--DB71FC312327430EAEACF42918405BF9--><AD_REFERENCE>
 <!--DB71FC312327430EAEACF42918405BF9-->  <AD_REFERENCE_ID><![CDATA[DB71FC312327430EAEACF42918405BF9]]></AD_REFERENCE_ID>
 <!--DB71FC312327430EAEACF42918405BF9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml	Tue Oct 23 12:29:09 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml	Mon Oct 22 16:36:31 2012 +0200
@@ -1,5 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--298F4C20A76B4B30860330F188BD7AEA--><AD_REF_LIST>
+<!--298F4C20A76B4B30860330F188BD7AEA-->  <AD_REF_LIST_ID><![CDATA[298F4C20A76B4B30860330F188BD7AEA]]></AD_REF_LIST_ID>
+<!--298F4C20A76B4B30860330F188BD7AEA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--298F4C20A76B4B30860330F188BD7AEA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--298F4C20A76B4B30860330F188BD7AEA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--298F4C20A76B4B30860330F188BD7AEA-->  <VALUE><![CDATA[F]]></VALUE>
+<!--298F4C20A76B4B30860330F188BD7AEA-->  <NAME><![CDATA[Fee]]></NAME>
+<!--298F4C20A76B4B30860330F188BD7AEA-->  <AD_REFERENCE_ID><![CDATA[C1B4345A1F8841C2B1ADD403CA733D75]]></AD_REFERENCE_ID>
+<!--298F4C20A76B4B30860330F188BD7AEA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--298F4C20A76B4B30860330F188BD7AEA-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--298F4C20A76B4B30860330F188BD7AEA--></AD_REF_LIST>
+
 <!--2C29C3C687FC403A802A15DEAF9E0D26--><AD_REF_LIST>
 <!--2C29C3C687FC403A802A15DEAF9E0D26-->  <AD_REF_LIST_ID><![CDATA[2C29C3C687FC403A802A15DEAF9E0D26]]></AD_REF_LIST_ID>
 <!--2C29C3C687FC403A802A15DEAF9E0D26-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -153,6 +165,18 @@
 <!--B481A754BB024A1BA57D3DF852386B87-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B481A754BB024A1BA57D3DF852386B87--></AD_REF_LIST>
 
+<!--BABE6BF881DD471BB18BF1AD764A3B78--><AD_REF_LIST>
+<!--BABE6BF881DD471BB18BF1AD764A3B78-->  <AD_REF_LIST_ID><![CDATA[BABE6BF881DD471BB18BF1AD764A3B78]]></AD_REF_LIST_ID>
+<!--BABE6BF881DD471BB18BF1AD764A3B78-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BABE6BF881DD471BB18BF1AD764A3B78-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BABE6BF881DD471BB18BF1AD764A3B78-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BABE6BF881DD471BB18BF1AD764A3B78-->  <VALUE><![CDATA[GL]]></VALUE>
+<!--BABE6BF881DD471BB18BF1AD764A3B78-->  <NAME><![CDATA[GL Item]]></NAME>
+<!--BABE6BF881DD471BB18BF1AD764A3B78-->  <AD_REFERENCE_ID><![CDATA[C1B4345A1F8841C2B1ADD403CA733D75]]></AD_REFERENCE_ID>
+<!--BABE6BF881DD471BB18BF1AD764A3B78-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--BABE6BF881DD471BB18BF1AD764A3B78-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--BABE6BF881DD471BB18BF1AD764A3B78--></AD_REF_LIST>
+
 <!--C5D1596D065545B49156C1F9426C9E14--><AD_REF_LIST>
 <!--C5D1596D065545B49156C1F9426C9E14-->  <AD_REF_LIST_ID><![CDATA[C5D1596D065545B49156C1F9426C9E14]]></AD_REF_LIST_ID>
 <!--C5D1596D065545B49156C1F9426C9E14-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -164,6 +188,18 @@
 <!--C5D1596D065545B49156C1F9426C9E14-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--C5D1596D065545B49156C1F9426C9E14--></AD_REF_LIST>
 
+<!--E047F81FACD0440EACB0EE63EB18A4EE--><AD_REF_LIST>
+<!--E047F81FACD0440EACB0EE63EB18A4EE-->  <AD_REF_LIST_ID><![CDATA[E047F81FACD0440EACB0EE63EB18A4EE]]></AD_REF_LIST_ID>
+<!--E047F81FACD0440EACB0EE63EB18A4EE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E047F81FACD0440EACB0EE63EB18A4EE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E047F81FACD0440EACB0EE63EB18A4EE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E047F81FACD0440EACB0EE63EB18A4EE-->  <VALUE><![CDATA[P]]></VALUE>
+<!--E047F81FACD0440EACB0EE63EB18A4EE-->  <NAME><![CDATA[Payment In/Out]]></NAME>
+<!--E047F81FACD0440EACB0EE63EB18A4EE-->  <AD_REFERENCE_ID><![CDATA[C1B4345A1F8841C2B1ADD403CA733D75]]></AD_REFERENCE_ID>
+<!--E047F81FACD0440EACB0EE63EB18A4EE-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--E047F81FACD0440EACB0EE63EB18A4EE-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--E047F81FACD0440EACB0EE63EB18A4EE--></AD_REF_LIST>
+
 <!--FF8080812E443491012E443C4ED60020--><AD_REF_LIST>
 <!--FF8080812E443491012E443C4ED60020-->  <AD_REF_LIST_ID><![CDATA[FF8080812E443491012E443C4ED60020]]></AD_REF_LIST_ID>
 <!--FF8080812E443491012E443C4ED60020-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Tue Oct 23 12:29:09 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Mon Oct 22 16:36:31 2012 +0200
@@ -583,17 +583,6 @@
 <!--4E68CD319FF945578CCF11CF38E0C58C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--4E68CD319FF945578CCF11CF38E0C58C--></AD_TEXTINTERFACES>
 
-<!--4F85512699C241C58A3E7AD76FC4B4C6--><AD_TEXTINTERFACES>
-<!--4F85512699C241C58A3E7AD76FC4B4C6-->  <AD_TEXTINTERFACES_ID><![CDATA[4F85512699C241C58A3E7AD76FC4B4C6]]></AD_TEXTINTERFACES_ID>
-<!--4F85512699C241C58A3E7AD76FC4B4C6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--4F85512699C241C58A3E7AD76FC4B4C6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--4F85512699C241C58A3E7AD76FC4B4C6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--4F85512699C241C58A3E7AD76FC4B4C6-->  <TEXT><![CDATA[GL Item]]></TEXT>
-<!--4F85512699C241C58A3E7AD76FC4B4C6-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html]]></FILENAME>
-<!--4F85512699C241C58A3E7AD76FC4B4C6-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--4F85512699C241C58A3E7AD76FC4B4C6-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--4F85512699C241C58A3E7AD76FC4B4C6--></AD_TEXTINTERFACES>
-
 <!--549D43D3510845D1965ACD2697B007FA--><AD_TEXTINTERFACES>
 <!--549D43D3510845D1965ACD2697B007FA-->  <AD_TEXTINTERFACES_ID><![CDATA[549D43D3510845D1965ACD2697B007FA]]></AD_TEXTINTERFACES_ID>
 <!--549D43D3510845D1965ACD2697B007FA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2673,17 +2662,6 @@
 <!--D2238E00427F496CB8D5A0F24935D4DB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--D2238E00427F496CB8D5A0F24935D4DB--></AD_TEXTINTERFACES>
 
-<!--D355AEFFF148477FBBA0711575E575F2--><AD_TEXTINTERFACES>
-<!--D355AEFFF148477FBBA0711575E575F2-->  <AD_TEXTINTERFACES_ID><![CDATA[D355AEFFF148477FBBA0711575E575F2]]></AD_TEXTINTERFACES_ID>
-<!--D355AEFFF148477FBBA0711575E575F2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--D355AEFFF148477FBBA0711575E575F2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--D355AEFFF148477FBBA0711575E575F2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--D355AEFFF148477FBBA0711575E575F2-->  <TEXT><![CDATA[Fee]]></TEXT>
-<!--D355AEFFF148477FBBA0711575E575F2-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html]]></FILENAME>
-<!--D355AEFFF148477FBBA0711575E575F2-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--D355AEFFF148477FBBA0711575E575F2-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--D355AEFFF148477FBBA0711575E575F2--></AD_TEXTINTERFACES>
-
 <!--D516788B09FF4747BECF206430E96AA4--><AD_TEXTINTERFACES>
 <!--D516788B09FF4747BECF206430E96AA4-->  <AD_TEXTINTERFACES_ID><![CDATA[D516788B09FF4747BECF206430E96AA4]]></AD_TEXTINTERFACES_ID>
 <!--D516788B09FF4747BECF206430E96AA4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html	Tue Oct 23 12:29:09 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html	Mon Oct 22 16:36:31 2012 +0200
@@ -1114,7 +1114,7 @@
                   <tr>
                     <td style="padding-top: 0px;">
                       <script>var sc_C_Bpartner_ID = null;</script>
-                      <input type="hidden" name="inpcBpartnerId" id="C_Bpartner_ID" value="" onreset="sc_C_Bpartner_ID.resetSelector();" onchange="openbravo.Utilities.updateSmartClientComponentValue(this, sc_C_Bpartner_ID.selectorField);"></input>
+                      <input type="hidden" name="inpcBpartnerId" id="C_Bpartner_ID" identifier="" value="" onreset="sc_C_Bpartner_ID.resetSelector();" onchange="openbravo.Utilities.updateSmartClientComponentValue(this, sc_C_Bpartner_ID.selectorField);"></input>
                       <script id="selectorLink" src="../org.openbravo.client.kernel/OBUISEL_Selector/A98899B1C75A4F4EBD3414F1B654EFAB?columnName=C_Bpartner_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&callOut=onchangeBPartner&required=false&filterClass=org.openbravo.userinterface.selector.SelectorDataSourceFilter&_selectorDefinitionId=A98899B1C75A4F4EBD3414F1B654EFAB"></script>
                     </td>
                   </tr>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java	Tue Oct 23 12:29:09 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java	Mon Oct 22 16:36:31 2012 +0200
@@ -383,13 +383,16 @@
         OBCriteria<BusinessPartner> obcBP = OBDal.getInstance().createCriteria(
             BusinessPartner.class);
         obcBP.add(Restrictions.eq(BusinessPartner.PROPERTY_NAME, bsline.getBpartnername()));
+        obcBP.setMaxResults(1);
         if (obcBP.list() != null && obcBP.list().size() > 0) {
-          xmlDocument.setParameter("businessPartner", obcBP.list().get(0).getIdentifier());
+          xmlDocument.setParameter("businessPartner", obcBP.list().get(0).getId());
+          xmlDocument.setParameter("businessPartnerName", obcBP.list().get(0).getName());
           defaultPaymentMethod = (obcBP.list().get(0).getPaymentMethod() != null) ? obcBP.list()
               .get(0).getPaymentMethod().getId() : "";
         }
       } else {
-        xmlDocument.setParameter("businessPartner", bsline.getBusinessPartner().getIdentifier());
+        xmlDocument.setParameter("businessPartner", bsline.getBusinessPartner().getId());
+        xmlDocument.setParameter("businessPartnerName", bsline.getBusinessPartner().getName());
       }
     }
     // Take payment date from the add transaction popup
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml	Tue Oct 23 12:29:09 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml	Mon Oct 22 16:36:31 2012 +0200
@@ -45,6 +45,7 @@
     <PARAMETER id="paramExpectedConverted" name="expectedConverted" attribute="value" format="euroEdition"/>
     <PARAMETER id="paramActualConverted" name="actualConverted" attribute="value" format="euroEdition" default="0"/>
     <PARAMETER id="C_Bpartner_ID" name="businessPartner" attribute="value"/>
+    <PARAMETER id="C_Bpartner_ID" name="businessPartnerName" attribute="identifier"/>
     <PARAMETER id="paramCredit" name="credit" attribute="value" format="euroEdition"/>
     <PARAMETER id="fieldReceipt" name="isReceipt" attribute="value"/>
     <PARAMETER id="fieldIsSoTrx" name="isSoTrx" attribute="value"/>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html	Tue Oct 23 12:29:09 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html	Mon Oct 22 16:36:31 2012 +0200
@@ -143,6 +143,7 @@
     displayLogicElement('client_middle', true);
     autoDisplayLogicDimensions(false);
     loadGrid();
+    resizeAreaCreateFrom();
   } else if (opt == 'GL') {
     displayLogicElement('FeeSection1', false);
     displayLogicElement('FeeSection2', false);
@@ -336,7 +337,6 @@
       onloadFunctions();
     } catch (e) {}
     showHideLayers();
-    resizeAreaCreateFrom();
   }
 
   function onResizeDo(){
@@ -538,13 +538,11 @@
               <!-- <td class="Combo_ContentCell" colspan="2"><select name="inpTransactionType" id="paramTransactionType" class="dojoValidateValid required Combo Combo_TwoCells_width">
                 <div id="reportTransactionType"></div></select>
               </td> -->
-              <td class="Combo_ContentCell" colspan="2">
-                <select id="paramTransactionType" name="inpTransactionType" class="ComboKey Combo_TwoCells_width required" onchange="showHideLayers();">
-                  <option value="P" selected="selected">Payment In/Out</option>
-                  <option value="GL">GL Item</option>
-                  <option value="F">Fee</option>
-                </select>
-              </td>
+              <td class="Combo_ContentCell"> 
+                <select  name="inpTransactionType" id="inpTransactionType" class="ComboKey Combo_TwoCells_width required" required="true" onchange="showHideLayers(); return true;">
+                  <option value=""> <div id="reportTransactionType"></div></option>
+                </select></td>
+
               <td class="TitleCell"><span class="LabelText">Transaction Date</span></td>
               <td class="TextBox_btn_ContentCell">
                 <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
@@ -729,7 +727,7 @@
                   <tr>
                     <td style="padding-top: 0px;">
                       <script>var sc_C_Glitem_ID = null;</script>
-                      <input type="hidden" name="inpGLItemId" id="C_Glitem_ID" value="" onreset="sc_C_Glitem_ID.resetSelector();" onchange="openbravo.Utilities.updateSmartClientComponentValue(this, sc_C_Glitem_ID.selectorField);"></input>
+                      <input type="hidden" name="inpGLItemId" id="C_Glitem_ID" value="" identifier="" onreset="sc_C_Glitem_ID.resetSelector();" onchange="openbravo.Utilities.updateSmartClientComponentValue(this, sc_C_Glitem_ID.selectorField);"></input>
                       <script id="selectorLink" src="../org.openbravo.client.kernel/OBUISEL_Selector/9FAD469CE4414A25974CF45C0AD22D35?columnName=C_Glitem_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&required=true"></script>
                     </td>
                   </tr>
@@ -877,7 +875,7 @@
                   <tr>
                     <td style="padding-top: 0px;">
                       <script>var sc_C_BPartner_ID = null;</script>
-                      <input type="hidden" name="inpCBPartnerId" id="C_BPartner_ID" value="" onreset="sc_C_BPartner_ID.resetSelector();" onchange="openbravo.Utilities.updateSmartClientComponentValue(this, sc_C_BPartner_ID.selectorField);"></input>
+                      <input type="hidden" name="inpCBPartnerId" identifier="" id="C_BPartner_ID" value="" onreset="sc_C_BPartner_ID.resetSelector();" onchange="openbravo.Utilities.updateSmartClientComponentValue(this, sc_C_BPartner_ID.selectorField);"></input>
                       <script id="selectorLink" src="../org.openbravo.client.kernel/OBUISEL_Selector/A98899B1C75A4F4EBD3414F1B654EFAB?columnName=C_BPartner_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&required=false"></script>
                     </td>
                   </tr>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java	Tue Oct 23 12:29:09 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java	Mon Oct 22 16:36:31 2012 +0200
@@ -48,6 +48,7 @@
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.data.FieldProvider;
 import org.openbravo.database.ConnectionProvider;
+import org.openbravo.erpCommon.utility.ComboTableData;
 import org.openbravo.erpCommon.utility.DateTimeData;
 import org.openbravo.erpCommon.utility.FieldProviderFactory;
 import org.openbravo.erpCommon.utility.OBError;
@@ -300,6 +301,7 @@
     xmlDocument.setParameter("orgId", strOrgId);
     xmlDocument.setParameter("finFinancialAccountId", strFinancialAccountId);
     xmlDocument.setParameter("finBankStatementLineId", strBankStatementLineId);
+    String transactionType = "P";
     if (!"".equals(strBankStatementLineId)) {
       FIN_BankStatementLine bsl = OBDal.getInstance().get(FIN_BankStatementLine.class,
           strBankStatementLineId);
@@ -312,14 +314,42 @@
       xmlDocument.setParameter("depositAmountGLItem", bsl.getCramount().toString());
       xmlDocument.setParameter("paymentAmountGLItem", bsl.getDramount().toString());
       xmlDocument.setParameter("mainDate", dateFormater.format(bsl.getTransactionDate()));
-
+      String bslDescription = !"".equals(bsl) ? bsl.getDescription() : "";
+      String strDescription = !"".equals(bsl.getBpartnername()) ? bsl.getBpartnername() + "\n"
+          + bslDescription : bslDescription;
+      xmlDocument.setParameter("GLItemDescription", strDescription);
+      xmlDocument.setParameter("FeeDescription", strDescription);
+      if (bsl.getGLItem() != null) {
+        transactionType = "GL";
+        xmlDocument.setParameter("GLItemID", bsl.getGLItem().getId());
+        xmlDocument.setParameter("GLItemName", bsl.getGLItem().getIdentifier());
+      }
+      if (bsl.getBusinessPartner() != null) {
+        xmlDocument.setParameter("BPartnerID", bsl.getBusinessPartner().getId());
+        xmlDocument.setParameter("BPartnerName", bsl.getBusinessPartner().getIdentifier());
+      }
     } else {
       xmlDocument.setParameter("depositAmount", BigDecimal.ZERO.toString());
       xmlDocument.setParameter("paymentAmount", BigDecimal.ZERO.toString());
       xmlDocument.setParameter("depositAmountGLItem", BigDecimal.ZERO.toString());
       xmlDocument.setParameter("paymentAmountGLItem", BigDecimal.ZERO.toString());
+      xmlDocument.setParameter("GLItemDescription", "");
+      xmlDocument.setParameter("FeeDescription", "");
+
     }
-
+    try {
+      String Transaction_Type_AddTransaction_Reference_ID = "C1B4345A1F8841C2B1ADD403CA733D75";
+      ComboTableData comboTableData = new ComboTableData(vars, this, "LIST", "",
+          Transaction_Type_AddTransaction_Reference_ID, "", Utility.getContext(this, vars,
+              "#AccessibleOrgTree", "AddTransaction"), Utility.getContext(this, vars,
+              "#User_Client", "AddTransaction"), 0);
+      Utility.fillSQLParameters(this, vars, null, comboTableData, "AddTransaction", "");
+      xmlDocument.setData("reportTransactionType", "liststructure", comboTableData.select(false));
+      comboTableData = null;
+    } catch (Exception ex) {
+      throw new ServletException(ex);
+    }
+    xmlDocument.setParameter("transactionType", transactionType);
     // Accounting Dimensions
     final String strElement_BP = Utility.getContext(this, vars, "$Element_BP", strWindowId);
     final String strElement_PR = Utility.getContext(this, vars, "$Element_PR", strWindowId);
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.xml	Tue Oct 23 12:29:09 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.xml	Mon Oct 22 16:36:31 2012 +0200
@@ -32,6 +32,12 @@
     <PARAMETER id="paramMainDate" name="dateDisplayFormat" attribute="saveformat" replace="yy"/>
     <PARAMETER id="paramDepositAmount" name="depositAmount" attribute="value" format="euroEdition"/>
     <PARAMETER id="paramPaymentAmount" name="paymentAmount" attribute="value" format="euroEdition"/>
+    <PARAMETER id="C_Glitem_ID" name="GLItemID" attribute="value"/>
+    <PARAMETER id="C_Glitem_ID" name="GLItemName" attribute="identifier"/>
+    <PARAMETER id="paramGLItemDescription" name="GLItemDescription"/>
+    <PARAMETER id="paramFeeDescription" name="FeeDescription"/>
+    <PARAMETER id="C_BPartner_ID" name="BPartnerID" attribute="value"/>
+    <PARAMETER id="C_BPartner_ID" name="BPartnerName" attribute="identifier"/>
     <PARAMETER id="paramDepositAmountGLItem" name="depositAmountGLItem" attribute="value" format="euroEdition"/>
     <PARAMETER id="paramPaymentAmountGLItem" name="paymentAmountGLItem" attribute="value" format="euroEdition"/>
     <PARAMETER id="paramDateFrom" name="dateDisplayFormat" attribute="displayformat" replace="xx"/>
@@ -57,8 +63,11 @@
     <PARAMETER id="paramDocument" name="document"/>
     
     <!-- Transaction Type -->
-    <PARAMETER id="paramTransactionType" name="transactionType" attribute="value"/>
-    
+    <PARAMETER id="paramTransactionType" name="transactionType"/>
+      <SUBREPORT id="reportTransactionType" name="reportTransactionType" report="org/openbravo/erpCommon/reference/List">
+        <ARGUMENT name="parameterListSelected" withId="paramTransactionType"/>
+      </SUBREPORT>
+
     <DISCARD id="discard"/>
     
 </REPORT>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html	Tue Oct 23 12:29:09 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html	Mon Oct 22 16:36:31 2012 +0200
@@ -137,6 +137,7 @@
     document.getElementById("inpFinancialTransactionId_" + bankStatementLineId).value = "";
     document.getElementById("inpMatchStyle_" + bankStatementLineId).style.backgroundColor = "white";
     document.getElementById("inpMatchingType_" + bankStatementLineId).value = "";
+    document.getElementById("inpExecuteMatching").value = "N";
     sendActionToServer("UNMATCH");
   }
   else {
@@ -351,6 +352,7 @@
   <input type="hidden" name="inpfinFinancialAccountId" value="" id="fieldfinFinancialAccountId"/>
   <input type="hidden" name="inpfinReconciliationId" value="" id="fieldfinReconciliationId"/>
   <input type="hidden" name="inpdateto" value="" id="fieldDateTo"/>
+  <input type="hidden" name="inpExecuteMatching" id="inpExecuteMatching" value="Y"/>
   <input type="hidden" name="inpFinBankStatementLineId" value=""/>
   <input type="hidden" name="inpSelectedFindTransactionId" value=""/>
   <input type="hidden" name="isFirstLoad" value="true"/>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java	Tue Oct 23 12:29:09 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java	Mon Oct 22 16:36:31 2012 +0200
@@ -147,6 +147,7 @@
           "MatchTransaction.paymentTypeFilter");
       String strShowCleared = vars.getRequestGlobalVariable("inpShowCleared",
           "MatchTransaction.showCleared");
+      String executeMatching = vars.getStringParameter("inpExecuteMatching", "Y");
       if (strShowCleared.equals("")) {
         strShowCleared = "N";
         vars.setSessionValue("MatchTransaction.showCleared", strShowCleared);
@@ -161,7 +162,7 @@
       vars.setSessionValue("AddTransaction|ShowJSMessage", "N");
 
       printGrid(response, vars, strPaymentTypeFilter, strFinancialAccountId, strReconciliationId,
-          strShowCleared, strHideDate, showJSMessage);
+          strShowCleared, strHideDate, showJSMessage, "Y".equals(executeMatching));
     } else if (vars.commandIn("UNMATCH")) {
       String strUnmatchBankStatementLineId = vars
           .getRequiredStringParameter("inpFinBankStatementLineId");
@@ -199,6 +200,18 @@
               FIN_BankStatementLine.class, strRecordsChecked);
 
           for (FIN_BankStatementLine item : items) {
+            if (item.getFinancialAccountTransaction() != null) {
+              // Unmatch Transaction
+              FIN_FinaccTransaction oldTransaction = item.getFinancialAccountTransaction();
+              final String DEPOSITED_NOT_CLEARED = "RDNC";
+              final String WITHDRAWN_NOT_CLEARED = "PWNC";
+              oldTransaction
+                  .setStatus(oldTransaction.getDepositAmount()
+                      .subtract(oldTransaction.getPaymentAmount()).signum() == 1 ? DEPOSITED_NOT_CLEARED
+                      : WITHDRAWN_NOT_CLEARED);
+              oldTransaction.setReconciliation(null);
+              OBDal.getInstance().save(oldTransaction);
+            }
             String strTransaction = vars.getStringParameter(
                 "inpFinancialTransactionId_" + item.getId(), "");
             String strMatchingType = vars.getStringParameter("inpMatchingType_" + item.getId(),
@@ -404,8 +417,8 @@
 
   private void printGrid(HttpServletResponse response, VariablesSecureApp vars,
       String strPaymentTypeFilter, String strFinancialAccountId, String strReconciliationId,
-      String strShowCleared, String strHideDate, String showJSMessage) throws IOException,
-      ServletException {
+      String strShowCleared, String strHideDate, String showJSMessage, boolean executeMatching)
+      throws IOException, ServletException {
     log4j.debug("Output: Grid Match using imported Bank Statement Lines");
 
     XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
@@ -415,7 +428,7 @@
     try {
       OBContext.setAdminMode(true);
       data = getMatchedBankStatementLinesData(vars, strFinancialAccountId, strReconciliationId,
-          strPaymentTypeFilter, strShowCleared, strHideDate);
+          strPaymentTypeFilter, strShowCleared, strHideDate, executeMatching);
     } catch (Exception e) {
       log4j.debug("Output: Exception ocurred while retrieving Bank Statement Lines.");
     } finally {
@@ -464,7 +477,7 @@
 
   private FieldProvider[] getMatchedBankStatementLinesData(VariablesSecureApp vars,
       String strFinancialAccountId, String strReconciliationId, String strPaymentTypeFilter,
-      String strShowCleared, String strHideDate) throws ServletException {
+      String strShowCleared, String strHideDate, boolean executeMatching) throws ServletException {
     FIN_FinancialAccount financial = new AdvPaymentMngtDao().getObject(FIN_FinancialAccount.class,
         strFinancialAccountId);
     MatchingAlgorithm ma = financial.getMatchingAlgorithm();
@@ -495,7 +508,7 @@
         String matchingType = FIN_BankStatementLines[i].getMatchingtype();
         FIN_FinaccTransaction transaction = FIN_BankStatementLines[i]
             .getFinancialAccountTransaction();
-        if (transaction == null) {
+        if (transaction == null && executeMatching) {
           FIN_MatchedTransaction matched = matchingTransaction.match(FIN_BankStatementLines[i],
               excluded);
           // When hide flag checked then exclude matchings for transactions out of date range
@@ -508,6 +521,18 @@
           transaction = matched.getTransaction();
           if (transaction != null && FIN_MatchedTransaction.STRONG.equals(matched.getMatchLevel())) {
             FIN_BankStatementLine bsl = FIN_BankStatementLines[i];
+            if (bsl.getFinancialAccountTransaction() != null) {
+              // Unmatch Transaction
+              FIN_FinaccTransaction oldTransaction = bsl.getFinancialAccountTransaction();
+              final String DEPOSITED_NOT_CLEARED = "RDNC";
+              final String WITHDRAWN_NOT_CLEARED = "PWNC";
+              oldTransaction
+                  .setStatus(oldTransaction.getDepositAmount()
+                      .subtract(oldTransaction.getPaymentAmount()).signum() == 1 ? DEPOSITED_NOT_CLEARED
+                      : WITHDRAWN_NOT_CLEARED);
+              oldTransaction.setReconciliation(null);
+              OBDal.getInstance().save(oldTransaction);
+            }
             bsl.setFinancialAccountTransaction(transaction);
             bsl.setMatchingtype(matched.getMatchLevel());
             transaction.setStatus("RPPC");
@@ -577,16 +602,21 @@
                       transaction.getTransactionDate().compareTo(reconciliation.getEndingDate()) > 0 ? reconciliation
                           .getEndingDate() : transaction.getTransactionDate(), vars
                           .getJavaDateFormat()));
-          FieldProviderFactory.setField(data[i], "matchedDocument", !transaction
-              .isCreatedByAlgorithm() ? MATCHED_AGAINST_TRANSACTION : (!transaction.getFinPayment()
-              .isCreatedByAlgorithm() ? MATCHED_AGAINST_PAYMENT : (transaction.getFinPayment()
-              .getFINPaymentDetailList().get(0).getFINPaymentScheduleDetailList().get(0)
-              .getInvoicePaymentSchedule() == null && transaction.getFinPayment()
-              .getFINPaymentDetailList().get(0).getFINPaymentScheduleDetailList().get(0)
-              .getOrderPaymentSchedule() == null) ? MATCHED_AGAINST_CREDIT
-              : (isInvoiceMatch(transaction) ? MATCHED_AGAINST_INVOICE : MATCHED_AGAINST_ORDER)));
-          String bpName = "";
-          if (transaction.getFinPayment() != null) {
+          FieldProviderFactory
+              .setField(
+                  data[i],
+                  "matchedDocument",
+                  (!transaction.isCreatedByAlgorithm() || transaction.getFinPayment() == null) ? MATCHED_AGAINST_TRANSACTION
+                      : (!transaction.getFinPayment().isCreatedByAlgorithm() ? MATCHED_AGAINST_PAYMENT
+                          : (transaction.getFinPayment().getFINPaymentDetailList().get(0)
+                              .getFINPaymentScheduleDetailList().get(0).getInvoicePaymentSchedule() == null && transaction
+                              .getFinPayment().getFINPaymentDetailList().get(0)
+                              .getFINPaymentScheduleDetailList().get(0).getOrderPaymentSchedule() == null) ? MATCHED_AGAINST_CREDIT
+                              : (isInvoiceMatch(transaction) ? MATCHED_AGAINST_INVOICE
+                                  : MATCHED_AGAINST_ORDER)));
+          String bpName = transaction.getBusinessPartner() != null ? transaction
+              .getBusinessPartner().getName() : "";
+          if ("".equals(bpName) && transaction.getFinPayment() != null) {
             if (transaction.getFinPayment().getBusinessPartner() != null) {
               bpName = transaction.getFinPayment().getBusinessPartner().getName();
             }
@@ -762,6 +792,8 @@
       FIN_FinaccTransaction finTrans = bsline.getFinancialAccountTransaction();
       if (finTrans != null) {
         finTrans.setReconciliation(null);
+        finTrans.setStatus((finTrans.getDepositAmount().subtract(finTrans.getPaymentAmount())
+            .signum() == 1) ? "RDNC" : "PWNC");
         bsline.setFinancialAccountTransaction(null);
         OBDal.getInstance().save(finTrans);
         OBDal.getInstance().flush();
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Tue Oct 23 12:29:09 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Mon Oct 22 16:36:31 2012 +0200
@@ -1241,8 +1241,29 @@
         obc.add(Restrictions.eq(FIN_PaymentMethod.PROPERTY_PAYOUTALLOW, true));
       }
     }
+    obc.addOrderBy(FIN_PaymentMethod.PROPERTY_NAME, true);
+    return obc.list();
+  }
 
-    return obc.list();
+  public String getDefaultPaymentMethodId(FIN_FinancialAccount account, boolean paymentIn) {
+    final OBCriteria<FinAccPaymentMethod> obc = OBDal.getInstance().createCriteria(
+        FinAccPaymentMethod.class);
+    obc.createAlias(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, "pm");
+    obc.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_ACCOUNT, account));
+    obc.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_DEFAULT, true));
+    if (paymentIn) {
+      obc.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_PAYINALLOW, true));
+    } else {
+      obc.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_PAYOUTALLOW, true));
+    }
+    obc.addOrder(org.hibernate.criterion.Order.asc("pm." + FIN_PaymentMethod.PROPERTY_NAME));
+    obc.setFilterOnReadableOrganization(false);
+    List<FinAccPaymentMethod> defaults = obc.list();
+    if (defaults.size() > 0) {
+      return obc.list().get(0).getPaymentMethod().getId();
+    } else {
+      return "";
+    }
   }
 
   private void addPaymentMethodList(OBCriteria obc, List<String> paymentMethods) {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/MatchTransactionDao.java	Tue Oct 23 12:29:09 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/MatchTransactionDao.java	Mon Oct 22 16:36:31 2012 +0200
@@ -40,6 +40,7 @@
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.common.businesspartner.BusinessPartner;
 import org.openbravo.model.common.enterprise.DocumentType;
+import org.openbravo.model.financialmgmt.gl.GLItem;
 import org.openbravo.model.financialmgmt.payment.FIN_BankStatement;
 import org.openbravo.model.financialmgmt.payment.FIN_BankStatementLine;
 import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
@@ -326,6 +327,41 @@
     return result;
   }
 
+  public static List<FIN_FinaccTransaction> getMatchingGLItemTransaction(
+      String strFinancialAccountId, GLItem glItem, Date transactionDate, BigDecimal amount,
+      List<FIN_FinaccTransaction> excluded) {
+    final StringBuilder whereClause = new StringBuilder();
+    final List<Object> parameters = new ArrayList<Object>();
+
+    whereClause.append(" as ft ");
+    whereClause.append(" where ft.").append(FIN_FinaccTransaction.PROPERTY_ACCOUNT);
+    whereClause.append(".id = '").append(strFinancialAccountId).append("'");
+    whereClause.append("   and ft.").append(FIN_FinaccTransaction.PROPERTY_RECONCILIATION);
+    whereClause.append(" is null");
+    whereClause.append("   and ft.").append(FIN_FinaccTransaction.PROPERTY_PROCESSED)
+        .append(" = true");
+    whereClause.append("   and ft.").append(FIN_FinaccTransaction.PROPERTY_GLITEM);
+    whereClause.append(" = ?");
+    parameters.add(glItem);
+    whereClause.append("   and ft.").append(FIN_FinaccTransaction.PROPERTY_STATUS);
+    whereClause.append(" <> 'RPPC' ");
+    whereClause.append("   and (ft.").append(FIN_FinaccTransaction.PROPERTY_DEPOSITAMOUNT);
+    whereClause.append(" - ").append(FIN_FinaccTransaction.PROPERTY_PAYMENTAMOUNT).append(")");
+    whereClause.append(" = ?");
+    parameters.add(amount);
+    if (transactionDate != null) {
+      whereClause.append("   and ft.").append(FIN_FinaccTransaction.PROPERTY_TRANSACTIONDATE);
+      whereClause.append(" <= ?");
+      parameters.add(transactionDate);
+    }
+    final OBQuery<FIN_FinaccTransaction> obData = OBDal.getInstance().createQuery(
+        FIN_FinaccTransaction.class, whereClause.toString());
+    obData.setParameters(parameters);
+    List<FIN_FinaccTransaction> result = obData.list();
+    result.removeAll(excluded);
+    return result;
+  }
+
   public static List<FIN_FinaccTransaction> getMatchingFinancialTransaction(
       String strFinancialAccountId, BigDecimal amount, List<FIN_FinaccTransaction> excluded) {
     return getMatchingFinancialTransaction(strFinancialAccountId, null, amount, excluded);
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java	Tue Oct 23 12:29:09 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java	Mon Oct 22 16:36:31 2012 +0200
@@ -141,7 +141,7 @@
 
     // If no previous bank statement is found get the ending date of the last reconciliation
     FIN_Reconciliation rec = org.openbravo.advpaymentmngt.dao.TransactionsDao
-        .getLastReconciliation(account, null);
+        .getLastReconciliation(account, "Y");
     org.openbravo.dal.core.OBContext.setAdminMode(true);
     try {
       return (rec == null) ? null : rec.getEndingDate();
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java	Tue Oct 23 12:29:09 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java	Mon Oct 22 16:36:31 2012 +0200
@@ -24,17 +24,20 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.StringTokenizer;
 
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.lang.StringUtils;
+import org.hibernate.criterion.Restrictions;
 import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
 import org.openbravo.advpaymentmngt.process.FIN_AddPayment;
 import org.openbravo.base.provider.OBProvider;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.security.OrganizationStructureProvider;
+import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBQuery;
 import org.openbravo.database.ConnectionProvider;
@@ -43,6 +46,9 @@
 import org.openbravo.model.common.businesspartner.BusinessPartner;
 import org.openbravo.model.common.enterprise.DocumentType;
 import org.openbravo.model.common.enterprise.Organization;
+import org.openbravo.model.financialmgmt.gl.GLItem;
+import org.openbravo.model.financialmgmt.payment.BankFileException;
+import org.openbravo.model.financialmgmt.payment.BankFileFormat;
 import org.openbravo.model.financialmgmt.payment.FIN_BankStatement;
 import org.openbravo.model.financialmgmt.payment.FIN_BankStatementLine;
 import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
@@ -53,9 +59,10 @@
   OBError myError = null;
   String filename = "";
 
-  /** TALONES - REINTEGROS */
   public static final String DOCUMENT_BankStatementFile = "BSF";
 
+  ArrayList<String> stringExceptions = null;
+
   public FIN_BankStatementImport(FIN_FinancialAccount _financialAccount) {
     setFinancialAccount(_financialAccount);
   }
@@ -131,7 +138,8 @@
     List<FIN_BankStatementLine> bankStatementLines = new ArrayList<FIN_BankStatementLine>();
     int previousNumberofLines = 0;
     int numberOfLines = 0;
-
+    BankFileFormat bff = getBankFileFormat();
+    stringExceptions = loadExceptions(bff);
     try {
       file = getFile(vars);
     } catch (IOException e) {
@@ -202,19 +210,34 @@
     BigDecimal crAmount;
     BigDecimal drAmount;
     for (FIN_BankStatementLine bankStatementLine : bankStatementLines) {
-      BusinessPartner businessPartner;
+      BusinessPartner businessPartner = null;
+      GLItem glItem = null;
       crAmount = bankStatementLine.getCramount();
       drAmount = bankStatementLine.getDramount();
       if (!(crAmount.compareTo(BigDecimal.ZERO) == 0)
           || !(drAmount.compareTo(BigDecimal.ZERO) == 0)) {
-        try {
-          businessPartner = matchBusinessPartner(bankStatementLine.getBpartnername(),
-              bankStatementLine.getOrganization(), bankStatementLine.getBankStatement()
-                  .getAccount());
-        } catch (Exception e) {
-          businessPartner = null;
+        // Try finding Previous matches
+        HashMap<String, String> previous = matchPreviousBSL(bankStatementLine.getBpartnername(),
+            bankStatementLine.getOrganization(), bankStatementLine.getBankStatement().getAccount());
+        if (!"".equals(previous.get("BPartnerID"))) {
+          businessPartner = OBDal.getInstance().get(BusinessPartner.class,
+              previous.get("BPartnerID"));
+        }
+        if (!"".equals(previous.get("GLItemID"))) {
+          glItem = OBDal.getInstance().get(GLItem.class, previous.get("GLItemID"));
+        }
+        // if no previous BSL is found, try match BP Name
+        if (businessPartner == null) {
+          try {
+            businessPartner = matchBusinessPartner(bankStatementLine.getBpartnername(),
+                bankStatementLine.getOrganization(), bankStatementLine.getBankStatement()
+                    .getAccount());
+          } catch (Exception e) {
+            businessPartner = null;
+          }
         }
         bankStatementLine.setBusinessPartner(businessPartner);
+        bankStatementLine.setGLItem(glItem);
         bankStatementLine.setLineNo(new Long((counter + 1) * 10));
         OBDal.getInstance().save(bankStatementLine);
         counter++;
@@ -249,18 +272,18 @@
   private BusinessPartner matchBusinessPartner(String partnername, Organization organization,
       FIN_FinancialAccount account) {
     // TODO extend with other matching methods. It will make it easier to later reconcile
-    BusinessPartner bp = matchBusinessPartnerByName(partnername, organization, account);
-    if (bp == null) {
-      bp = finBPByName(partnername, organization);
-    }
+    BusinessPartner bp = finBPByName(partnername, organization);
     if (bp == null) {
       bp = matchBusinessPartnerByNameTokens(partnername, organization);
     }
     return bp;
   }
 
-  private BusinessPartner matchBusinessPartnerByName(String partnername, Organization organization,
+  private HashMap<String, String> matchPreviousBSL(String partnername, Organization organization,
       FIN_FinancialAccount account) {
+    HashMap<String, String> result = new HashMap<String, String>();
+    result.put("BPartnerID", "");
+    result.put("GLItemID", "");
     if (partnername == null || "".equals(partnername.trim())) {
       return null;
     }
@@ -269,10 +292,11 @@
     OBContext.setAdminMode();
     try {
       whereClause.append(" as bsl ");
-      whereClause.append(" where bsl." + FIN_BankStatementLine.PROPERTY_BPARTNERNAME + " = ?");
+      whereClause.append(" where translate(bsl." + FIN_BankStatementLine.PROPERTY_BPARTNERNAME
+          + ",'0123456789', '          ') = translate( ?,'0123456789', '          ')");
       parameters.add(partnername);
-      whereClause.append(" and bsl." + FIN_BankStatementLine.PROPERTY_BUSINESSPARTNER
-          + " is not null");
+      whereClause.append(" and (bsl." + FIN_BankStatementLine.PROPERTY_BUSINESSPARTNER
+          + " is not null or bsl." + FIN_BankStatementLine.PROPERTY_GLITEM + " is not null)");
       whereClause.append(" and bsl." + FIN_BankStatementLine.PROPERTY_BANKSTATEMENT + ".");
       whereClause.append(FIN_BankStatement.PROPERTY_ACCOUNT + ".id = ?");
       parameters.add(account.getId());
@@ -284,12 +308,20 @@
       final OBQuery<FIN_BankStatementLine> bsl = OBDal.getInstance().createQuery(
           FIN_BankStatementLine.class, whereClause.toString(), parameters);
       bsl.setFilterOnReadableOrganization(false);
-      List<FIN_BankStatementLine> matchedLines = bsl.list();
-      if (matchedLines.size() == 0)
-        return null;
-      else
-        return matchedLines.get(0).getBusinessPartner();
-
+      // Just look in las 10 matches
+      bsl.setMaxResult(10);
+      for (FIN_BankStatementLine line : bsl.list()) {
+        if (line.getGLItem() != null && "".equals(result.get("GLItemID"))) {
+          result.put("GLItemID", line.getGLItem().getId());
+        }
+        if (line.getBusinessPartner() != null && "".equals(result.get("BPartnerID"))) {
+          result.put("BPartnerID", line.getBusinessPartner().getId());
+        }
+        if (!"".equals(result.get("BPartnerID")) && !"".equals(result.get("GLItemID"))) {
+          return result;
+        }
+      }
+      return result;
     } finally {
       OBContext.restorePreviousMode();
     }
@@ -332,7 +364,12 @@
     if (partnername == null || "".equals(partnername.trim())) {
       return null;
     }
-    StringTokenizer st = new StringTokenizer(partnername);
+    String parsedPartnername = partnername.toLowerCase();
+    // Remove exceptions
+    for (String eliminate : stringExceptions) {
+      parsedPartnername = parsedPartnername.replaceAll(eliminate.toLowerCase(), "");
+    }
+    StringTokenizer st = new StringTokenizer(parsedPartnername);
     List<String> list = new ArrayList<String>();
     while (st.hasMoreTokens()) {
       String token = st.nextToken();
@@ -378,22 +415,65 @@
     BusinessPartner targetBusinessPartner = businessPartners.get(0);
     int distance = StringUtils.getLevenshteinDistance(partnername, businessPartners.get(0)
         .getName());
+    String parsedPartnername = partnername.toLowerCase();
+    // Remove exceptions
+    for (String eliminate : stringExceptions) {
+      parsedPartnername = parsedPartnername.replaceAll(eliminate.toLowerCase(), "");
+    }
+    // Remove Numeric characters
+    char[] digits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+    for (char character : digits) {
+      parsedPartnername = parsedPartnername.replace(character, ' ');
+      parsedPartnername = parsedPartnername.trim();
+    }
+
     for (BusinessPartner bp : businessPartners) {
       // Calculates distance between two strings meaning number of changes required for a string to
       // convert in another string
-      int bpDistance = StringUtils.getLevenshteinDistance(partnername, bp.getName());
+      int bpDistance = StringUtils.getLevenshteinDistance(partnername, bp.getName().toLowerCase());
       if (bpDistance < distance) {
         distance = bpDistance;
         targetBusinessPartner = bp;
       }
     }
-    // Tolerance: discard business partners where number of changes needed to match is higher than
-    // half of its length
-    if (distance > (partnername.length() / 2)) {
-      return null;
-    } else {
-      return targetBusinessPartner;
-    }
+    return targetBusinessPartner;
   }
 
+  private BankFileFormat getBankFileFormat() {
+    List<BankFileFormat> bankFileFormat = new ArrayList<BankFileFormat>();
+    OBContext.setAdminMode();
+    final String JAVACLASSNAME = this.getClass().getName();
+    try {
+      OBCriteria<BankFileFormat> obc = OBDal.getInstance().createCriteria(BankFileFormat.class);
+      obc.add(Restrictions.eq(BankFileFormat.PROPERTY_JAVACLASSNAME, JAVACLASSNAME));
+      obc.setMaxResults(1);
+      bankFileFormat = obc.list();
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+    return bankFileFormat.size() > 0 ? bankFileFormat.get(0) : null;
+  }
+
+  ArrayList<String> loadExceptions(BankFileFormat bankFileFormat) {
+    ArrayList<String> exceptions = new ArrayList<String>();
+    List<BankFileException> bankFileExceptions = new ArrayList<BankFileException>();
+    OBContext.setAdminMode();
+    try {
+      OBCriteria<BankFileException> obc = OBDal.getInstance().createCriteria(
+          BankFileException.class);
+      obc.createAlias(BankFileException.PROPERTY_BANKFILEFORMAT, "BFF");
+      obc.add(Restrictions.eq("BFF." + BankFileFormat.PROPERTY_JAVACLASSNAME,
+          bankFileFormat.getJavaClassName()));
+      obc.add(Restrictions.or(
+          Restrictions.eq(BankFileException.PROPERTY_FINANCIALACCOUNT, financialAccount),
+          Restrictions.isNull(BankFileException.PROPERTY_FINANCIALACCOUNT)));
+      bankFileExceptions = obc.list();
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+    for (BankFileException ex : bankFileExceptions) {
+      exceptions.add(ex.getTextToExclude());
+    }
+    return exceptions;
+  }
 }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Tue Oct 23 12:29:09 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Mon Oct 22 16:36:31 2012 +0200
@@ -422,11 +422,16 @@
       String strFinancialAccountId, String strOrgId, boolean isMandatory,
       boolean excludePaymentMethodWithoutAccount, boolean isInPayment) {
     dao = new AdvPaymentMngtDao();
+    String selectedPaymentMethodId = strPaymentMethodId;
     List<FIN_PaymentMethod> paymentMethods = dao.getFilteredPaymentMethods(strFinancialAccountId,
         strOrgId, excludePaymentMethodWithoutAccount,
         isInPayment ? AdvPaymentMngtDao.PaymentDirection.IN
             : AdvPaymentMngtDao.PaymentDirection.OUT);
-    String options = getOptionsList(paymentMethods, strPaymentMethodId, isMandatory);
+    if ("".equals(selectedPaymentMethodId) && !"".equals(strFinancialAccountId)) {
+      selectedPaymentMethodId = dao.getDefaultPaymentMethodId(
+          OBDal.getInstance().get(FIN_FinancialAccount.class, strFinancialAccountId), isInPayment);
+    }
+    String options = getOptionsList(paymentMethods, selectedPaymentMethodId, isMandatory);
     return options;
   }
 
--- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js	Tue Oct 23 12:29:09 2012 +0200
+++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js	Mon Oct 22 16:36:31 2012 +0200
@@ -603,7 +603,12 @@
   // form, suggestion box and popup modal and grid components.
   initWidget: function () {
 
-    var baseTestRegistryName = 'org.openbravo.userinterface.selector.' + this.openbravoField + '.';
+    var baseTestRegistryName = 'org.openbravo.userinterface.selector.' + this.openbravoField + '.',
+        initialValueMap = {};
+
+    if (this.openbravoField.value) {
+      initialValueMap[this.openbravoField.value] = this.openbravoField.getAttribute('identifier');
+    }
 
     // Do not destroy dataSource after creation
     // https://issues.openbravo.com/view.php?id=18456
@@ -626,8 +631,7 @@
       shouldSaveValue: false,
       validateOnChange: true,
       completeOnTab: true,
-
-      valueMap: {},
+      valueMap: initialValueMap,
       icons: [{
         selector: this,
         showFocused: true,
@@ -784,6 +788,7 @@
     } else {
       this.selectorField.textBoxStyle = isc.OBSelectorWidget.styling.selectorFieldTextBoxStyle;
     }
+
     this.selectorField.setValue(this.openbravoField.value);
     this.initialValue = this.selectorField.getValue();
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/tables/FIN_BANKFILE_EXCEPTION.xml	Mon Oct 22 16:36:31 2012 +0200
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+  <database name="TABLE FIN_BANKFILE_EXCEPTION">
+    <table name="FIN_BANKFILE_EXCEPTION" primaryKey="FIN_BANKFILE_EXCEPTION_KEY">
+      <column name="FIN_BANKFILE_EXCEPTION_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="FIN_BANKFILE_FORMAT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="FIN_FINANCIAL_ACCOUNT_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="TEXTTOEXCLUDE" primaryKey="false" required="true" type="VARCHAR" size="255" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="FIN_BANKFILE_EXCEPT_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="FIN_BANKFILE_EXCEPTION_ADORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="FIN_BANKFILE_FORMAT" name="FIN_BANKFILE_EXCEPTION_BSL">
+        <reference local="FIN_BANKFILE_FORMAT_ID" foreign="FIN_BANKFILE_FORMAT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="FIN_FINANCIAL_ACCOUNT" name="FIN_BANKFILE_EXCEPTION_FA">
+        <reference local="FIN_FINANCIAL_ACCOUNT_ID" foreign="FIN_FINANCIAL_ACCOUNT_ID"/>
+      </foreign-key>
+      <check name="FIN_BANKFILE_EX_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- a/src-db/database/model/tables/FIN_BANKSTATEMENTLINE.xml	Tue Oct 23 12:29:09 2012 +0200
+++ b/src-db/database/model/tables/FIN_BANKSTATEMENTLINE.xml	Mon Oct 22 16:36:31 2012 +0200
@@ -77,6 +77,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="C_GLITEM_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="FIN_BANKSTATLINE_ADCLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -86,6 +90,9 @@
       <foreign-key foreignTable="C_BPARTNER" name="FIN_BANKSTATLINE_CBPARTNER">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_GLITEM" name="FIN_BANKSTATLINE_CGLITEM">
+        <reference local="C_GLITEM_ID" foreign="C_GLITEM_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="FIN_FINACC_TRANSACTION" name="FIN_BANKSTATLINE_FINACCTRX">
         <reference local="FIN_FINACC_TRANSACTION_ID" foreign="FIN_FINACC_TRANSACTION_ID"/>
       </foreign-key>
--- a/src-db/database/model/tables/FIN_FINACC_PAYMENTMETHOD.xml	Tue Oct 23 12:29:09 2012 +0200
+++ b/src-db/database/model/tables/FIN_FINACC_PAYMENTMETHOD.xml	Mon Oct 22 16:36:31 2012 +0200
@@ -121,6 +121,10 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault/>
       </column>
+      <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="FIN_FINACC_PAYMETHOD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -146,6 +150,7 @@
       <check name="FIN_FAPM_PINMULTICUR_CHECK"><![CDATA[PAYIN_ISMULTICURRENCY IN ('Y', 'N')]]></check>
       <check name="FIN_FAPM_POUTMULTICUR_CHECK"><![CDATA[PAYOUT_ISMULTICURRENCY IN ('Y', 'N')]]></check>
       <check name="FIN_FINACC_METHOD_ACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+      <check name="FIN_FINACC_METHOD_DEFAULT_CHK"><![CDATA[ISDEFAULT IN ('Y', 'N')]]></check>
       <check name="FIN_FINACC_METHOD_DEPOSIT_CHK"><![CDATA[AUTOMATIC_DEPOSIT IN ('Y', 'N')]]></check>
       <check name="FIN_FINACC_METHOD_PAYMENT_CHK"><![CDATA[AUTOMATIC_PAYMENT IN ('Y', 'N')]]></check>
       <check name="FIN_FINACC_METHOD_RECEIPT_CHK"><![CDATA[AUTOMATIC_RECEIPT IN ('Y', 'N')]]></check>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Tue Oct 23 12:29:09 2012 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Mon Oct 22 16:36:31 2012 +0200
@@ -221636,6 +221636,42 @@
 <!--11D5E322E2EC45E884C876155BCE29AA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--11D5E322E2EC45E884C876155BCE29AA--></AD_COLUMN>
 
+<!--11F755DE7007411FA9D61421815A71E1--><AD_COLUMN>
+<!--11F755DE7007411FA9D61421815A71E1-->  <AD_COLUMN_ID><![CDATA[11F755DE7007411FA9D61421815A71E1]]></AD_COLUMN_ID>
+<!--11F755DE7007411FA9D61421815A71E1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--11F755DE7007411FA9D61421815A71E1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--11F755DE7007411FA9D61421815A71E1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--11F755DE7007411FA9D61421815A71E1-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--11F755DE7007411FA9D61421815A71E1-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--11F755DE7007411FA9D61421815A71E1-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--11F755DE7007411FA9D61421815A71E1-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--11F755DE7007411FA9D61421815A71E1-->  <AD_TABLE_ID><![CDATA[66AED72572944ACB9BED8B132EC89A07]]></AD_TABLE_ID>
+<!--11F755DE7007411FA9D61421815A71E1-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--11F755DE7007411FA9D61421815A71E1-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--11F755DE7007411FA9D61421815A71E1-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--11F755DE7007411FA9D61421815A71E1-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--11F755DE7007411FA9D61421815A71E1-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--11F755DE7007411FA9D61421815A71E1-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--11F755DE7007411FA9D61421815A71E1-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--11F755DE7007411FA9D61421815A71E1-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--11F755DE7007411FA9D61421815A71E1-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--11F755DE7007411FA9D61421815A71E1-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--11F755DE7007411FA9D61421815A71E1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--11F755DE7007411FA9D61421815A71E1-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--11F755DE7007411FA9D61421815A71E1-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--11F755DE7007411FA9D61421815A71E1-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--11F755DE7007411FA9D61421815A71E1-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--11F755DE7007411FA9D61421815A71E1-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--11F755DE7007411FA9D61421815A71E1-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--11F755DE7007411FA9D61421815A71E1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--11F755DE7007411FA9D61421815A71E1-->  <POSITION><![CDATA[5]]></POSITION>
+<!--11F755DE7007411FA9D61421815A71E1-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--11F755DE7007411FA9D61421815A71E1-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--11F755DE7007411FA9D61421815A71E1-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--11F755DE7007411FA9D61421815A71E1-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--11F755DE7007411FA9D61421815A71E1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--11F755DE7007411FA9D61421815A71E1--></AD_COLUMN>
+
 <!--1322478AD1C444D7B9116099CA2B7787--><AD_COLUMN>
 <!--1322478AD1C444D7B9116099CA2B7787-->  <AD_COLUMN_ID><![CDATA[1322478AD1C444D7B9116099CA2B7787]]></AD_COLUMN_ID>
 <!--1322478AD1C444D7B9116099CA2B7787-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -225230,6 +225266,42 @@
 <!--2FD790AF217148AE8D7628ECC9F3D7C3-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--2FD790AF217148AE8D7628ECC9F3D7C3--></AD_COLUMN>
 
+<!--3016237232444E83962F47A938F811CD--><AD_COLUMN>
+<!--3016237232444E83962F47A938F811CD-->  <AD_COLUMN_ID><![CDATA[3016237232444E83962F47A938F811CD]]></AD_COLUMN_ID>
+<!--3016237232444E83962F47A938F811CD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3016237232444E83962F47A938F811CD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3016237232444E83962F47A938F811CD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3016237232444E83962F47A938F811CD-->  <NAME><![CDATA[Organization]]></NAME>
+<!--3016237232444E83962F47A938F811CD-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--3016237232444E83962F47A938F811CD-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--3016237232444E83962F47A938F811CD-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--3016237232444E83962F47A938F811CD-->  <AD_TABLE_ID><![CDATA[66AED72572944ACB9BED8B132EC89A07]]></AD_TABLE_ID>
+<!--3016237232444E83962F47A938F811CD-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--3016237232444E83962F47A938F811CD-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--3016237232444E83962F47A938F811CD-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--3016237232444E83962F47A938F811CD-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--3016237232444E83962F47A938F811CD-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--3016237232444E83962F47A938F811CD-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--3016237232444E83962F47A938F811CD-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--3016237232444E83962F47A938F811CD-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--3016237232444E83962F47A938F811CD-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--3016237232444E83962F47A938F811CD-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--3016237232444E83962F47A938F811CD-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3016237232444E83962F47A938F811CD-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--3016237232444E83962F47A938F811CD-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--3016237232444E83962F47A938F811CD-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--3016237232444E83962F47A938F811CD-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--3016237232444E83962F47A938F811CD-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--3016237232444E83962F47A938F811CD-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--3016237232444E83962F47A938F811CD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3016237232444E83962F47A938F811CD-->  <POSITION><![CDATA[4]]></POSITION>
+<!--3016237232444E83962F47A938F811CD-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--3016237232444E83962F47A938F811CD-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--3016237232444E83962F47A938F811CD-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3016237232444E83962F47A938F811CD-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--3016237232444E83962F47A938F811CD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--3016237232444E83962F47A938F811CD--></AD_COLUMN>
+
 <!--312FAD7A620C4602A767F3A1C430D2C8--><AD_COLUMN>
 <!--312FAD7A620C4602A767F3A1C430D2C8-->  <AD_COLUMN_ID><![CDATA[312FAD7A620C4602A767F3A1C430D2C8]]></AD_COLUMN_ID>
 <!--312FAD7A620C4602A767F3A1C430D2C8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -226821,6 +226893,42 @@
 <!--3D81BAED7AA844A3923EE6015B1862D1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--3D81BAED7AA844A3923EE6015B1862D1--></AD_COLUMN>
 
+<!--3DEA9E29E18F433E9E039208AF009F04--><AD_COLUMN>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <AD_COLUMN_ID><![CDATA[3DEA9E29E18F433E9E039208AF009F04]]></AD_COLUMN_ID>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <NAME><![CDATA[Updated]]></NAME>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <AD_TABLE_ID><![CDATA[66AED72572944ACB9BED8B132EC89A07]]></AD_TABLE_ID>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <POSITION><![CDATA[7]]></POSITION>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--3DEA9E29E18F433E9E039208AF009F04-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--3DEA9E29E18F433E9E039208AF009F04--></AD_COLUMN>
+
 <!--3DFAB9DBB8D143A3951271CBE02C224F--><AD_COLUMN>
 <!--3DFAB9DBB8D143A3951271CBE02C224F-->  <AD_COLUMN_ID><![CDATA[3DFAB9DBB8D143A3951271CBE02C224F]]></AD_COLUMN_ID>
 <!--3DFAB9DBB8D143A3951271CBE02C224F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -228415,6 +228523,41 @@
 <!--49D072B712FE4B25A3F3A1C608A26898-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--49D072B712FE4B25A3F3A1C608A26898--></AD_COLUMN>
 
+<!--4A5B0A7182CB47F79CC717AE05611721--><AD_COLUMN>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <AD_COLUMN_ID><![CDATA[4A5B0A7182CB47F79CC717AE05611721]]></AD_COLUMN_ID>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <AD_TABLE_ID><![CDATA[66AED72572944ACB9BED8B132EC89A07]]></AD_TABLE_ID>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <POSITION><![CDATA[8]]></POSITION>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--4A5B0A7182CB47F79CC717AE05611721-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--4A5B0A7182CB47F79CC717AE05611721--></AD_COLUMN>
+
 <!--4B5F942C49634A9B8507A6DD4F66750B--><AD_COLUMN>
 <!--4B5F942C49634A9B8507A6DD4F66750B-->  <AD_COLUMN_ID><![CDATA[4B5F942C49634A9B8507A6DD4F66750B]]></AD_COLUMN_ID>
 <!--4B5F942C49634A9B8507A6DD4F66750B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -232209,6 +232352,41 @@
 <!--569E7164AA3DAC7FE040007F01003003-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--569E7164AA3DAC7FE040007F01003003--></AD_COLUMN>
 
+<!--56B1B52BB7564161AC891887DF1B966C--><AD_COLUMN>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <AD_COLUMN_ID><![CDATA[56B1B52BB7564161AC891887DF1B966C]]></AD_COLUMN_ID>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <NAME><![CDATA[Created By]]></NAME>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <AD_TABLE_ID><![CDATA[66AED72572944ACB9BED8B132EC89A07]]></AD_TABLE_ID>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <POSITION><![CDATA[6]]></POSITION>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--56B1B52BB7564161AC891887DF1B966C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--56B1B52BB7564161AC891887DF1B966C--></AD_COLUMN>
+
 <!--56EB0A0CAC47B232E040007F01001BD8--><AD_COLUMN>
 <!--56EB0A0CAC47B232E040007F01001BD8-->  <AD_COLUMN_ID><![CDATA[56EB0A0CAC47B232E040007F01001BD8]]></AD_COLUMN_ID>
 <!--56EB0A0CAC47B232E040007F01001BD8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -267611,6 +267789,41 @@
 <!--82F006C15CDD3718E040007F01003790-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82F006C15CDD3718E040007F01003790--></AD_COLUMN>
 
+<!--830EA0658496418C9DF8D68A8AC50DF5--><AD_COLUMN>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <AD_COLUMN_ID><![CDATA[830EA0658496418C9DF8D68A8AC50DF5]]></AD_COLUMN_ID>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <NAME><![CDATA[TextToExclude]]></NAME>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <DESCRIPTION><![CDATA[Test to be excluded when trying to match Business Partner by name.]]></DESCRIPTION>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <HELP><![CDATA[Add here the strings not to be taken into account when trying to match business partner name.]]></HELP>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <COLUMNNAME><![CDATA[TextToExclude]]></COLUMNNAME>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <AD_TABLE_ID><![CDATA[66AED72572944ACB9BED8B132EC89A07]]></AD_TABLE_ID>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <AD_REFERENCE_ID><![CDATA[34]]></AD_REFERENCE_ID>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <AD_ELEMENT_ID><![CDATA[8C3671C9BF164A87A72FC6036C29DC52]]></AD_ELEMENT_ID>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <POSITION><![CDATA[10]]></POSITION>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--830EA0658496418C9DF8D68A8AC50DF5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--830EA0658496418C9DF8D68A8AC50DF5--></AD_COLUMN>
+
 <!--831B272EE4364C208EFA70098EDF29B4--><AD_COLUMN>
 <!--831B272EE4364C208EFA70098EDF29B4-->  <AD_COLUMN_ID><![CDATA[831B272EE4364C208EFA70098EDF29B4]]></AD_COLUMN_ID>
 <!--831B272EE4364C208EFA70098EDF29B4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -268370,6 +268583,41 @@
 <!--8672E2CEC4B143EDA3FD16235CE39FF3-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8672E2CEC4B143EDA3FD16235CE39FF3--></AD_COLUMN>
 
+<!--868ED7F486244CBBA580FD4536E740D1--><AD_COLUMN>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <AD_COLUMN_ID><![CDATA[868ED7F486244CBBA580FD4536E740D1]]></AD_COLUMN_ID>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <NAME><![CDATA[Financial Account]]></NAME>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <DESCRIPTION><![CDATA[Financial account used to deposit / withdrawal money such as bank accounts or petty cash]]></DESCRIPTION>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <HELP><![CDATA[Financial account used to deposit / withdrawal money such as bank accounts or petty cash]]></HELP>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <COLUMNNAME><![CDATA[FIN_Financial_Account_ID]]></COLUMNNAME>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <AD_TABLE_ID><![CDATA[66AED72572944ACB9BED8B132EC89A07]]></AD_TABLE_ID>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <AD_ELEMENT_ID><![CDATA[7891269C840C655DE040007F010155CE]]></AD_ELEMENT_ID>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <POSITION><![CDATA[11]]></POSITION>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--868ED7F486244CBBA580FD4536E740D1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--868ED7F486244CBBA580FD4536E740D1--></AD_COLUMN>
+
 <!--86DF0DF2E002BFFEE040007F010175A6--><AD_COLUMN>
 <!--86DF0DF2E002BFFEE040007F010175A6-->  <AD_COLUMN_ID><![CDATA[86DF0DF2E002BFFEE040007F010175A6]]></AD_COLUMN_ID>
 <!--86DF0DF2E002BFFEE040007F010175A6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -272758,6 +273006,42 @@
 <!--8D87BBF4A1EBD0C9E040007F01011665-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8D87BBF4A1EBD0C9E040007F01011665--></AD_COLUMN>
 
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08--><AD_COLUMN>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <AD_COLUMN_ID><![CDATA[8DB7EC5C96A34DAF8ECB3E34BF336F08]]></AD_COLUMN_ID>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <NAME><![CDATA[Default]]></NAME>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <DESCRIPTION><![CDATA[A value that is shown whenever a record is created.]]></DESCRIPTION>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <HELP><![CDATA[The Default Checkbox indicates if this record will be used as a default value.]]></HELP>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <COLUMNNAME><![CDATA[Isdefault]]></COLUMNNAME>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <AD_TABLE_ID><![CDATA[AC389EBD8A774AAE8223A77F692983D8]]></AD_TABLE_ID>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <SEQNO><![CDATA[310]]></SEQNO>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <AD_ELEMENT_ID><![CDATA[1103]]></AD_ELEMENT_ID>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <POSITION><![CDATA[31]]></POSITION>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--8DB7EC5C96A34DAF8ECB3E34BF336F08--></AD_COLUMN>
+
 <!--8DD7E4103EDA46AEB7A4692578740286--><AD_COLUMN>
 <!--8DD7E4103EDA46AEB7A4692578740286-->  <AD_COLUMN_ID><![CDATA[8DD7E4103EDA46AEB7A4692578740286]]></AD_COLUMN_ID>
 <!--8DD7E4103EDA46AEB7A4692578740286-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -276403,6 +276687,44 @@
 <!--949E626A5896C713E040A8C0BD062033-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--949E626A5896C713E040A8C0BD062033--></AD_COLUMN>
 
+<!--94B2AA0F857B4CF6ACC55807904C64CF--><AD_COLUMN>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <AD_COLUMN_ID><![CDATA[94B2AA0F857B4CF6ACC55807904C64CF]]></AD_COLUMN_ID>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <NAME><![CDATA[Active]]></NAME>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
+(1) The system requires the record for auditing purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <AD_TABLE_ID><![CDATA[66AED72572944ACB9BED8B132EC89A07]]></AD_TABLE_ID>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <POSITION><![CDATA[9]]></POSITION>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--94B2AA0F857B4CF6ACC55807904C64CF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--94B2AA0F857B4CF6ACC55807904C64CF--></AD_COLUMN>
+
 <!--94C40D6E18376001E040007F01001FF3--><AD_COLUMN>
 <!--94C40D6E18376001E040007F01001FF3-->  <AD_COLUMN_ID><![CDATA[94C40D6E18376001E040007F01001FF3]]></AD_COLUMN_ID>
 <!--94C40D6E18376001E040007F01001FF3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -276649,6 +276971,41 @@
 <!--9696480B6CDF4C83BD20407C1C32C6B8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--9696480B6CDF4C83BD20407C1C32C6B8--></AD_COLUMN>
 
+<!--972A12BF9BE24FDC9DA8761D9528778A--><AD_COLUMN>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <AD_COLUMN_ID><![CDATA[972A12BF9BE24FDC9DA8761D9528778A]]></AD_COLUMN_ID>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <NAME><![CDATA[BankFile Format]]></NAME>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <DESCRIPTION><![CDATA[Identifies each supported bank file format supported]]></DESCRIPTION>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <HELP><![CDATA[Identifies each supported bank file format supported]]></HELP>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <COLUMNNAME><![CDATA[FIN_Bankfile_Format_ID]]></COLUMNNAME>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <AD_TABLE_ID><![CDATA[66AED72572944ACB9BED8B132EC89A07]]></AD_TABLE_ID>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <AD_ELEMENT_ID><![CDATA[828EE0AE7FE45FA1E040007F010067C7]]></AD_ELEMENT_ID>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <POSITION><![CDATA[2]]></POSITION>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--972A12BF9BE24FDC9DA8761D9528778A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--972A12BF9BE24FDC9DA8761D9528778A--></AD_COLUMN>
+
 <!--983E80EFA97649ECB849DE2AB6D7578A--><AD_COLUMN>
 <!--983E80EFA97649ECB849DE2AB6D7578A-->  <AD_COLUMN_ID><![CDATA[983E80EFA97649ECB849DE2AB6D7578A]]></AD_COLUMN_ID>
 <!--983E80EFA97649ECB849DE2AB6D7578A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -278921,6 +279278,39 @@
 <!--A0C098361E4C4DC28430235417130B92-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A0C098361E4C4DC28430235417130B92--></AD_COLUMN>
 
+<!--A1299D75B2E64D7CA38D037F1D6F759D--><AD_COLUMN>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <AD_COLUMN_ID><![CDATA[A1299D75B2E64D7CA38D037F1D6F759D]]></AD_COLUMN_ID>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <NAME><![CDATA[FIN_Bankfile_Exception_ID]]></NAME>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <COLUMNNAME><![CDATA[FIN_Bankfile_Exception_ID]]></COLUMNNAME>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <AD_TABLE_ID><![CDATA[66AED72572944ACB9BED8B132EC89A07]]></AD_TABLE_ID>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <AD_ELEMENT_ID><![CDATA[3B80C5B8926B4057B9F683236CB6BD1E]]></AD_ELEMENT_ID>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <POSITION><![CDATA[1]]></POSITION>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--A1299D75B2E64D7CA38D037F1D6F759D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--A1299D75B2E64D7CA38D037F1D6F759D--></AD_COLUMN>
+
 <!--A2310AE5FF26434D81FA816C02AC7F8B--><AD_COLUMN>
 <!--A2310AE5FF26434D81FA816C02AC7F8B-->  <AD_COLUMN_ID><![CDATA[A2310AE5FF26434D81FA816C02AC7F8B]]></AD_COLUMN_ID>
 <!--A2310AE5FF26434D81FA816C02AC7F8B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -293125,6 +293515,77 @@
 <!--EB0B8E4554EF4A9CA512B9C5FF4FFABF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--EB0B8E4554EF4A9CA512B9C5FF4FFABF--></AD_COLUMN>
 
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A--><AD_COLUMN>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <AD_COLUMN_ID><![CDATA[EB3D1953573F4E07B5EAAF7FE8AF4F8A]]></AD_COLUMN_ID>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <NAME><![CDATA[Client]]></NAME>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <AD_TABLE_ID><![CDATA[66AED72572944ACB9BED8B132EC89A07]]></AD_TABLE_ID>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <POSITION><![CDATA[3]]></POSITION>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--EB3D1953573F4E07B5EAAF7FE8AF4F8A--></AD_COLUMN>
+
+<!--ECB2E6217957452592B24F63D4DFAC88--><AD_COLUMN>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <AD_COLUMN_ID><![CDATA[ECB2E6217957452592B24F63D4DFAC88]]></AD_COLUMN_ID>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <NAME><![CDATA[G/L Item]]></NAME>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <DESCRIPTION><![CDATA[An alias for the Account Combination which can be commonly used in daily operations.]]></DESCRIPTION>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <HELP><![CDATA[General ledger item.]]></HELP>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <COLUMNNAME><![CDATA[C_Glitem_ID]]></COLUMNNAME>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <AD_TABLE_ID><![CDATA[84203CBEBDA349C38319C0E549751546]]></AD_TABLE_ID>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <SEQNO><![CDATA[200]]></SEQNO>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <AD_ELEMENT_ID><![CDATA[800080]]></AD_ELEMENT_ID>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <POSITION><![CDATA[20]]></POSITION>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--ECB2E6217957452592B24F63D4DFAC88-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--ECB2E6217957452592B24F63D4DFAC88--></AD_COLUMN>
+
 <!--ECD90C86634B4A51B2FFCE7248293BED--><AD_COLUMN>
 <!--ECD90C86634B4A51B2FFCE7248293BED-->  <AD_COLUMN_ID><![CDATA[ECD90C86634B4A51B2FFCE7248293BED]]></AD_COLUMN_ID>
 <!--ECD90C86634B4A51B2FFCE7248293BED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Oct 23 12:29:09 2012 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Mon Oct 22 16:36:31 2012 +0200
@@ -21280,6 +21280,18 @@
 <!--3B584D993CCF41B698DBE642AFC21AE4-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--3B584D993CCF41B698DBE642AFC21AE4--></AD_ELEMENT>
 
+<!--3B80C5B8926B4057B9F683236CB6BD1E--><AD_ELEMENT>
+<!--3B80C5B8926B4057B9F683236CB6BD1E-->  <AD_ELEMENT_ID><![CDATA[3B80C5B8926B4057B9F683236CB6BD1E]]></AD_ELEMENT_ID>
+<!--3B80C5B8926B4057B9F683236CB6BD1E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3B80C5B8926B4057B9F683236CB6BD1E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3B80C5B8926B4057B9F683236CB6BD1E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3B80C5B8926B4057B9F683236CB6BD1E-->  <COLUMNNAME><![CDATA[FIN_Bankfile_Exception_ID]]></COLUMNNAME>
+<!--3B80C5B8926B4057B9F683236CB6BD1E-->  <NAME><![CDATA[FIN_Bankfile_Exception_ID]]></NAME>
+<!--3B80C5B8926B4057B9F683236CB6BD1E-->  <PRINTNAME><![CDATA[FIN_Bankfile_Exception_ID]]></PRINTNAME>
+<!--3B80C5B8926B4057B9F683236CB6BD1E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3B80C5B8926B4057B9F683236CB6BD1E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--3B80C5B8926B4057B9F683236CB6BD1E--></AD_ELEMENT>
+
 <!--3C45DFEEC7B8494F8A8F2043D43DBED4--><AD_ELEMENT>
 <!--3C45DFEEC7B8494F8A8F2043D43DBED4-->  <AD_ELEMENT_ID><![CDATA[3C45DFEEC7B8494F8A8F2043D43DBED4]]></AD_ELEMENT_ID>
 <!--3C45DFEEC7B8494F8A8F2043D43DBED4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -26866,6 +26878,20 @@
 <!--8BCFEC1D2693D1A8E040007F010135A9-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--8BCFEC1D2693D1A8E040007F010135A9--></AD_ELEMENT>
 
+<!--8C3671C9BF164A87A72FC6036C29DC52--><AD_ELEMENT>
+<!--8C3671C9BF164A87A72FC6036C29DC52-->  <AD_ELEMENT_ID><![CDATA[8C3671C9BF164A87A72FC6036C29DC52]]></AD_ELEMENT_ID>
+<!--8C3671C9BF164A87A72FC6036C29DC52-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8C3671C9BF164A87A72FC6036C29DC52-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8C3671C9BF164A87A72FC6036C29DC52-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8C3671C9BF164A87A72FC6036C29DC52-->  <COLUMNNAME><![CDATA[TextToExclude]]></COLUMNNAME>
+<!--8C3671C9BF164A87A72FC6036C29DC52-->  <NAME><![CDATA[Text To Exclude]]></NAME>
+<!--8C3671C9BF164A87A72FC6036C29DC52-->  <PRINTNAME><![CDATA[Text To Exclude]]></PRINTNAME>
+<!--8C3671C9BF164A87A72FC6036C29DC52-->  <DESCRIPTION><![CDATA[Test to be excluded when trying to match Business Partner by name.]]></DESCRIPTION>
+<!--8C3671C9BF164A87A72FC6036C29DC52-->  <HELP><![CDATA[Add here the strings not to be taken into account when trying to match business partner name.]]></HELP>
+<!--8C3671C9BF164A87A72FC6036C29DC52-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8C3671C9BF164A87A72FC6036C29DC52-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--8C3671C9BF164A87A72FC6036C29DC52--></AD_ELEMENT>
+
 <!--8C84C8C2042BA648E040007F010137E1--><AD_ELEMENT>
 <!--8C84C8C2042BA648E040007F010137E1-->  <AD_ELEMENT_ID><![CDATA[8C84C8C2042BA648E040007F010137E1]]></AD_ELEMENT_ID>
 <!--8C84C8C2042BA648E040007F010137E1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Tue Oct 23 12:29:09 2012 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Mon Oct 22 16:36:31 2012 +0200
@@ -177923,6 +177923,31 @@
 <!--19001A6871F8477CB5B9F2A257EE3DC5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--19001A6871F8477CB5B9F2A257EE3DC5--></AD_FIELD>
 
+<!--194DC28A00F34C3DAFC1574AD8A6B004--><AD_FIELD>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <AD_FIELD_ID><![CDATA[194DC28A00F34C3DAFC1574AD8A6B004]]></AD_FIELD_ID>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <NAME><![CDATA[FIN_Bankfile_Exception_ID]]></NAME>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <AD_TAB_ID><![CDATA[FFA978C976384149AF6F11364957EA4C]]></AD_TAB_ID>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <AD_COLUMN_ID><![CDATA[A1299D75B2E64D7CA38D037F1D6F759D]]></AD_COLUMN_ID>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--194DC28A00F34C3DAFC1574AD8A6B004-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--194DC28A00F34C3DAFC1574AD8A6B004--></AD_FIELD>
+
 <!--195CCC8EDC094481AAF5ACA4F6381E09--><AD_FIELD>
 <!--195CCC8EDC094481AAF5ACA4F6381E09-->  <AD_FIELD_ID><![CDATA[195CCC8EDC094481AAF5ACA4F6381E09]]></AD_FIELD_ID>
 <!--195CCC8EDC094481AAF5ACA4F6381E09-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -183092,6 +183117,33 @@
 <!--41AE565AFD0948F18A78A09BB41106CD-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--41AE565AFD0948F18A78A09BB41106CD--></AD_FIELD>
 
+<!--41B80A9E463A4F4B95B6DC11FBC80C35--><AD_FIELD>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <AD_FIELD_ID><![CDATA[41B80A9E463A4F4B95B6DC11FBC80C35]]></AD_FIELD_ID>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <NAME><![CDATA[Client]]></NAME>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <AD_TAB_ID><![CDATA[FFA978C976384149AF6F11364957EA4C]]></AD_TAB_ID>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <AD_COLUMN_ID><![CDATA[EB3D1953573F4E07B5EAAF7FE8AF4F8A]]></AD_COLUMN_ID>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--41B80A9E463A4F4B95B6DC11FBC80C35--></AD_FIELD>
+
 <!--41E8B982FCDF4D82929AC1A6906864BF--><AD_FIELD>
 <!--41E8B982FCDF4D82929AC1A6906864BF-->  <AD_FIELD_ID><![CDATA[41E8B982FCDF4D82929AC1A6906864BF]]></AD_FIELD_ID>
 <!--41E8B982FCDF4D82929AC1A6906864BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -188090,6 +188142,34 @@
 <!--569E7164AA3BAC7FE040007F01003003-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--569E7164AA3BAC7FE040007F01003003--></AD_FIELD>
 
+<!--56E77EF07A4E48FA917DB37EA5A619D9--><AD_FIELD>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <AD_FIELD_ID><![CDATA[56E77EF07A4E48FA917DB37EA5A619D9]]></AD_FIELD_ID>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <NAME><![CDATA[Organization]]></NAME>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <AD_TAB_ID><![CDATA[FFA978C976384149AF6F11364957EA4C]]></AD_TAB_ID>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <AD_COLUMN_ID><![CDATA[3016237232444E83962F47A938F811CD]]></AD_COLUMN_ID>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--56E77EF07A4E48FA917DB37EA5A619D9-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--56E77EF07A4E48FA917DB37EA5A619D9--></AD_FIELD>
+
 <!--56EB0A0CAC4FB232E040007F01001BD8--><AD_FIELD>
 <!--56EB0A0CAC4FB232E040007F01001BD8-->  <AD_FIELD_ID><![CDATA[56EB0A0CAC4FB232E040007F01001BD8]]></AD_FIELD_ID>
 <!--56EB0A0CAC4FB232E040007F01001BD8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -203003,6 +203083,37 @@
 <!--7E3C61095BB2AE9DE040007F01006BC6-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--7E3C61095BB2AE9DE040007F01006BC6--></AD_FIELD>
 
+<!--7E45A94BE3F040768D89DC4A7B39CD78--><AD_FIELD>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <AD_FIELD_ID><![CDATA[7E45A94BE3F040768D89DC4A7B39CD78]]></AD_FIELD_ID>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <NAME><![CDATA[Active]]></NAME>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
+(1) The system requires the record for auditing purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <AD_TAB_ID><![CDATA[FFA978C976384149AF6F11364957EA4C]]></AD_TAB_ID>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <AD_COLUMN_ID><![CDATA[94B2AA0F857B4CF6ACC55807904C64CF]]></AD_COLUMN_ID>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--7E45A94BE3F040768D89DC4A7B39CD78-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--7E45A94BE3F040768D89DC4A7B39CD78--></AD_FIELD>
+
 <!--7E4D5EB2C5DF48DB83971B8F46168E6E--><AD_FIELD>
 <!--7E4D5EB2C5DF48DB83971B8F46168E6E-->  <AD_FIELD_ID><![CDATA[7E4D5EB2C5DF48DB83971B8F46168E6E]]></AD_FIELD_ID>
 <!--7E4D5EB2C5DF48DB83971B8F46168E6E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -206496,7 +206607,7 @@
 <!--82B7B2BAEDF74980E040007F010008E7-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--82B7B2BAEDF74980E040007F010008E7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--82B7B2BAEDF74980E040007F010008E7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--82B7B2BAEDF74980E040007F010008E7-->  <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO>
+<!--82B7B2BAEDF74980E040007F010008E7-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
 <!--82B7B2BAEDF74980E040007F010008E7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--82B7B2BAEDF74980E040007F010008E7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--82B7B2BAEDF74980E040007F010008E7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -206522,9 +206633,10 @@
 <!--82B7B2BAEDF84980E040007F010008E7-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--82B7B2BAEDF84980E040007F010008E7-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--82B7B2BAEDF84980E040007F010008E7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--82B7B2BAEDF84980E040007F010008E7-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--82B7B2BAEDF84980E040007F010008E7-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--82B7B2BAEDF84980E040007F010008E7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--82B7B2BAEDF84980E040007F010008E7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--82B7B2BAEDF84980E040007F010008E7-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
 <!--82B7B2BAEDF84980E040007F010008E7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--82B7B2BAEDF84980E040007F010008E7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--82B7B2BAEDF84980E040007F010008E7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -206554,7 +206666,7 @@
 <!--82B7B2BAEDF94980E040007F010008E7-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--82B7B2BAEDF94980E040007F010008E7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--82B7B2BAEDF94980E040007F010008E7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--82B7B2BAEDF94980E040007F010008E7-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
+<!--82B7B2BAEDF94980E040007F010008E7-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
 <!--82B7B2BAEDF94980E040007F010008E7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--82B7B2BAEDF94980E040007F010008E7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--82B7B2BAEDF94980E040007F010008E7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -206583,7 +206695,7 @@
 <!--82B7B2BAEDFA4980E040007F010008E7-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--82B7B2BAEDFA4980E040007F010008E7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--82B7B2BAEDFA4980E040007F010008E7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--82B7B2BAEDFA4980E040007F010008E7-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
+<!--82B7B2BAEDFA4980E040007F010008E7-->  <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO>
 <!--82B7B2BAEDFA4980E040007F010008E7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--82B7B2BAEDFA4980E040007F010008E7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--82B7B2BAEDFA4980E040007F010008E7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -206613,7 +206725,7 @@
 <!--82B7B2BAEDFB4980E040007F010008E7-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--82B7B2BAEDFB4980E040007F010008E7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--82B7B2BAEDFB4980E040007F010008E7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--82B7B2BAEDFB4980E040007F010008E7-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
+<!--82B7B2BAEDFB4980E040007F010008E7-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
 <!--82B7B2BAEDFB4980E040007F010008E7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--82B7B2BAEDFB4980E040007F010008E7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--82B7B2BAEDFB4980E040007F010008E7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -206695,7 +206807,7 @@
 <!--82B7B2BAEDFE4980E040007F010008E7-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--82B7B2BAEDFE4980E040007F010008E7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--82B7B2BAEDFE4980E040007F010008E7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--82B7B2BAEDFE4980E040007F010008E7-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
+<!--82B7B2BAEDFE4980E040007F010008E7-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
 <!--82B7B2BAEDFE4980E040007F010008E7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--82B7B2BAEDFE4980E040007F010008E7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--82B7B2BAEDFE4980E040007F010008E7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -206754,7 +206866,7 @@
 <!--82B7B2BAEE004980E040007F010008E7-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--82B7B2BAEE004980E040007F010008E7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--82B7B2BAEE004980E040007F010008E7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--82B7B2BAEE004980E040007F010008E7-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
+<!--82B7B2BAEE004980E040007F010008E7-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
 <!--82B7B2BAEE004980E040007F010008E7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--82B7B2BAEE004980E040007F010008E7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--82B7B2BAEE004980E040007F010008E7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -206783,7 +206895,7 @@
 <!--82B7B2BAEE014980E040007F010008E7-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--82B7B2BAEE014980E040007F010008E7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--82B7B2BAEE014980E040007F010008E7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--82B7B2BAEE014980E040007F010008E7-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
+<!--82B7B2BAEE014980E040007F010008E7-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
 <!--82B7B2BAEE014980E040007F010008E7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--82B7B2BAEE014980E040007F010008E7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--82B7B2BAEE014980E040007F010008E7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -215832,7 +215944,7 @@
 <!--A3286F143A8870FAE040007F0100603E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--A3286F143A8870FAE040007F0100603E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--A3286F143A8870FAE040007F0100603E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--A3286F143A8870FAE040007F0100603E-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--A3286F143A8870FAE040007F0100603E-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--A3286F143A8870FAE040007F0100603E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--A3286F143A8870FAE040007F0100603E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--A3286F143A8870FAE040007F0100603E-->  <GRID_SEQNO><![CDATA[0]]></GRID_SEQNO>
@@ -225766,6 +225878,34 @@
 <!--B241EA039AA039E9E040007F01005C90-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--B241EA039AA039E9E040007F01005C90--></AD_FIELD>
 
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9--><AD_FIELD>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <AD_FIELD_ID><![CDATA[B2CFE7788C5E4198A830FAB8CEAAEDD9]]></AD_FIELD_ID>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <NAME><![CDATA[BankFile Format]]></NAME>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <DESCRIPTION><![CDATA[Identifies each supported bank file format supported]]></DESCRIPTION>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <HELP><![CDATA[Identifies each supported bank file format supported]]></HELP>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <AD_TAB_ID><![CDATA[FFA978C976384149AF6F11364957EA4C]]></AD_TAB_ID>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <AD_COLUMN_ID><![CDATA[972A12BF9BE24FDC9DA8761D9528778A]]></AD_COLUMN_ID>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--B2CFE7788C5E4198A830FAB8CEAAEDD9--></AD_FIELD>
+
 <!--B2D2DD98BB0F43F9B7A9E98CDB30A60C--><AD_FIELD>
 <!--B2D2DD98BB0F43F9B7A9E98CDB30A60C-->  <AD_FIELD_ID><![CDATA[B2D2DD98BB0F43F9B7A9E98CDB30A60C]]></AD_FIELD_ID>
 <!--B2D2DD98BB0F43F9B7A9E98CDB30A60C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -232106,6 +232246,35 @@
 <!--D31B602FAE194D8D8D416281D760488B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--D31B602FAE194D8D8D416281D760488B--></AD_FIELD>
 
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9--><AD_FIELD>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <AD_FIELD_ID><![CDATA[D3F1C0F0C9EB4D60A39E8221A81133B9]]></AD_FIELD_ID>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <NAME><![CDATA[G/L Item]]></NAME>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <DESCRIPTION><![CDATA[An alias for the Account Combination which can be commonly used in daily operations.]]></DESCRIPTION>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <HELP><![CDATA[General ledger item.]]></HELP>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <AD_TAB_ID><![CDATA[7F5E8E4C55914138A358F5087B532B59]]></AD_TAB_ID>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <AD_COLUMN_ID><![CDATA[ECB2E6217957452592B24F63D4DFAC88]]></AD_COLUMN_ID>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <SEQNO><![CDATA[65]]></SEQNO>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--D3F1C0F0C9EB4D60A39E8221A81133B9--></AD_FIELD>
+
 <!--D40FC53464A54922BD8951019D6AC994--><AD_FIELD>
 <!--D40FC53464A54922BD8951019D6AC994-->  <AD_FIELD_ID><![CDATA[D40FC53464A54922BD8951019D6AC994]]></AD_FIELD_ID>
 <!--D40FC53464A54922BD8951019D6AC994-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -234998,6 +235167,35 @@
 <!--E9F44041D66540A6ACD576CBBCAD6364-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--E9F44041D66540A6ACD576CBBCAD6364--></AD_FIELD>
 
+<!--EA0A71EA42CA4E8B8842113430A9CF38--><AD_FIELD>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <AD_FIELD_ID><![CDATA[EA0A71EA42CA4E8B8842113430A9CF38]]></AD_FIELD_ID>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <NAME><![CDATA[Financial Account]]></NAME>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <DESCRIPTION><![CDATA[Financial account used to deposit / withdrawal money such as bank accounts or petty cash]]></DESCRIPTION>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <HELP><![CDATA[Financial account used to deposit / withdrawal money such as bank accounts or petty cash]]></HELP>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <AD_TAB_ID><![CDATA[FFA978C976384149AF6F11364957EA4C]]></AD_TAB_ID>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <AD_COLUMN_ID><![CDATA[868ED7F486244CBBA580FD4536E740D1]]></AD_COLUMN_ID>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--EA0A71EA42CA4E8B8842113430A9CF38-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--EA0A71EA42CA4E8B8842113430A9CF38--></AD_FIELD>
+
 <!--EA88F71D3BF64B9F86A46AC02668790A--><AD_FIELD>
 <!--EA88F71D3BF64B9F86A46AC02668790A-->  <AD_FIELD_ID><![CDATA[EA88F71D3BF64B9F86A46AC02668790A]]></AD_FIELD_ID>
 <!--EA88F71D3BF64B9F86A46AC02668790A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -235703,6 +235901,35 @@
 <!--F0781E3928594183BCE1F538A9D98E1B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--F0781E3928594183BCE1F538A9D98E1B--></AD_FIELD>
 
+<!--F07B9467FB5D4905A0B8DE774F10D0F8--><AD_FIELD>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <AD_FIELD_ID><![CDATA[F07B9467FB5D4905A0B8DE774F10D0F8]]></AD_FIELD_ID>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <NAME><![CDATA[Text To Exclude]]></NAME>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <DESCRIPTION><![CDATA[Test to be excluded when trying to match Business Partner by name.]]></DESCRIPTION>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <HELP><![CDATA[Add here the strings not to be taken into account when trying to match business partner name.]]></HELP>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <AD_TAB_ID><![CDATA[FFA978C976384149AF6F11364957EA4C]]></AD_TAB_ID>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <AD_COLUMN_ID><![CDATA[830EA0658496418C9DF8D68A8AC50DF5]]></AD_COLUMN_ID>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <DISPLAYLENGTH><![CDATA[255]]></DISPLAYLENGTH>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--F07B9467FB5D4905A0B8DE774F10D0F8--></AD_FIELD>
+
 <!--F100F74DDDF145B0BC97F745252E1974--><AD_FIELD>
 <!--F100F74DDDF145B0BC97F745252E1974-->  <AD_FIELD_ID><![CDATA[F100F74DDDF145B0BC97F745252E1974]]></AD_FIELD_ID>
 <!--F100F74DDDF145B0BC97F745252E1974-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -236898,6 +237125,35 @@
 <!--FC53D4705CB44A4789E7E827341BC584-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--FC53D4705CB44A4789E7E827341BC584--></AD_FIELD>
 
+<!--FC5B598B6CD442CBBB521748EAB098EF--><AD_FIELD>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <AD_FIELD_ID><![CDATA[FC5B598B6CD442CBBB521748EAB098EF]]></AD_FIELD_ID>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <NAME><![CDATA[Default]]></NAME>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <DESCRIPTION><![CDATA[A value that is shown whenever a record is created.]]></DESCRIPTION>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <HELP><![CDATA[The Default Checkbox indicates if this record will be used as a default value.]]></HELP>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <AD_TAB_ID><![CDATA[01F5E95D71544D428E1B9004B05D0298]]></AD_TAB_ID>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <AD_COLUMN_ID><![CDATA[8DB7EC5C96A34DAF8ECB3E34BF336F08]]></AD_COLUMN_ID>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <SEQNO><![CDATA[25]]></SEQNO>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--FC5B598B6CD442CBBB521748EAB098EF-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--FC5B598B6CD442CBBB521748EAB098EF--></AD_FIELD>
+
 <!--FC5DB679657A45C8B3CB4D8FCD52A52F--><AD_FIELD>
 <!--FC5DB679657A45C8B3CB4D8FCD52A52F-->  <AD_FIELD_ID><![CDATA[FC5DB679657A45C8B3CB4D8FCD52A52F]]></AD_FIELD_ID>
 <!--FC5DB679657A45C8B3CB4D8FCD52A52F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_TAB.xml	Tue Oct 23 12:29:09 2012 +0200
+++ b/src-db/database/sourcedata/AD_TAB.xml	Mon Oct 22 16:36:31 2012 +0200
@@ -15038,4 +15038,30 @@
 <!--FF80818132AFC4050132AFC7F94A000A-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
 <!--FF80818132AFC4050132AFC7F94A000A--></AD_TAB>
 
+<!--FFA978C976384149AF6F11364957EA4C--><AD_TAB>
+<!--FFA978C976384149AF6F11364957EA4C-->  <AD_TAB_ID><![CDATA[FFA978C976384149AF6F11364957EA4C]]></AD_TAB_ID>
+<!--FFA978C976384149AF6F11364957EA4C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FFA978C976384149AF6F11364957EA4C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FFA978C976384149AF6F11364957EA4C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FFA978C976384149AF6F11364957EA4C-->  <NAME><![CDATA[Exceptions]]></NAME>
+<!--FFA978C976384149AF6F11364957EA4C-->  <AD_TABLE_ID><![CDATA[66AED72572944ACB9BED8B132EC89A07]]></AD_TABLE_ID>
+<!--FFA978C976384149AF6F11364957EA4C-->  <AD_WINDOW_ID><![CDATA[557A0AA1D0D745F9A61557C05483072C]]></AD_WINDOW_ID>
+<!--FFA978C976384149AF6F11364957EA4C-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--FFA978C976384149AF6F11364957EA4C-->  <TABLEVEL><![CDATA[1]]></TABLEVEL>
+<!--FFA978C976384149AF6F11364957EA4C-->  <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW>
+<!--FFA978C976384149AF6F11364957EA4C-->  <ISINFOTAB><![CDATA[N]]></ISINFOTAB>
+<!--FFA978C976384149AF6F11364957EA4C-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
+<!--FFA978C976384149AF6F11364957EA4C-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--FFA978C976384149AF6F11364957EA4C-->  <HASTREE><![CDATA[N]]></HASTREE>
+<!--FFA978C976384149AF6F11364957EA4C-->  <PROCESSING><![CDATA[N]]></PROCESSING>
+<!--FFA978C976384149AF6F11364957EA4C-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
+<!--FFA978C976384149AF6F11364957EA4C-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
+<!--FFA978C976384149AF6F11364957EA4C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FFA978C976384149AF6F11364957EA4C-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
+<!--FFA978C976384149AF6F11364957EA4C-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--FFA978C976384149AF6F11364957EA4C-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--FFA978C976384149AF6F11364957EA4C-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
+<!--FFA978C976384149AF6F11364957EA4C-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
+<!--FFA978C976384149AF6F11364957EA4C--></AD_TAB>
+
 </data>
--- a/src-db/database/sourcedata/AD_TABLE.xml	Tue Oct 23 12:29:09 2012 +0200
+++ b/src-db/database/sourcedata/AD_TABLE.xml	Mon Oct 22 16:36:31 2012 +0200
@@ -8947,6 +8947,29 @@
 <!--660314BF9A074029814AA12D4CB8340C-->  <AD_PACKAGE_ID><![CDATA[5A3ED54AB1EF4B84E040007F01006125]]></AD_PACKAGE_ID>
 <!--660314BF9A074029814AA12D4CB8340C--></AD_TABLE>
 
+<!--66AED72572944ACB9BED8B132EC89A07--><AD_TABLE>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <AD_TABLE_ID><![CDATA[66AED72572944ACB9BED8B132EC89A07]]></AD_TABLE_ID>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <NAME><![CDATA[FinancialMgmtBankFileException]]></NAME>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <DESCRIPTION><![CDATA[Contains strings to be excluded when trying to match a business partner at importing time.]]></DESCRIPTION>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <HELP><![CDATA[Add here strings to be excluded when trying to guess a business partner from a bank file.]]></HELP>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <TABLENAME><![CDATA[FIN_BankFile_Exception]]></TABLENAME>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <CLASSNAME><![CDATA[BankFileException]]></CLASSNAME>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <ISVIEW><![CDATA[N]]></ISVIEW>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <AD_WINDOW_ID><![CDATA[557A0AA1D0D745F9A61557C05483072C]]></AD_WINDOW_ID>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <ISDELETEABLE><![CDATA[Y]]></ISDELETEABLE>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <IMPORTTABLE><![CDATA[N]]></IMPORTTABLE>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <ISCHANGELOG><![CDATA[N]]></ISCHANGELOG>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--66AED72572944ACB9BED8B132EC89A07-->  <AD_PACKAGE_ID><![CDATA[5A3ED54AB1E64B84E040007F01006125]]></AD_PACKAGE_ID>
+<!--66AED72572944ACB9BED8B132EC89A07--></AD_TABLE>
+
 <!--66C2A14049FD44808B686F2B5B0A321E--><AD_TABLE>
 <!--66C2A14049FD44808B686F2B5B0A321E-->  <AD_TABLE_ID><![CDATA[66C2A14049FD44808B686F2B5B0A321E]]></AD_TABLE_ID>
 <!--66C2A14049FD44808B686F2B5B0A321E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>