Merge into main
authorJuan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com>
Wed, 15 Jun 2011 04:53:52 +0000
changeset 12790 96d010efaf59
parent 12730 aefaedafb236 (current diff)
parent 12789 60a38f208a3f (diff)
child 12836 89db801d7177
child 12881 0b2ee3629aef
Merge into main
.hgsigs
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src-db/database/sourcedata/AD_MODULE.xml
src/org/openbravo/base/util/Convert.java
src/org/openbravo/erpCommon/ad_callouts/SE_Payment_AmountOrConvertRate.java
src/org/openbravo/erpCommon/ad_callouts/SE_Payment_Currency.java
src/org/openbravo/erpCommon/ad_callouts/SE_Payment_FinAccTransactionAmount.java
--- a/.hgsigs	Tue Jun 07 03:36:45 2011 +0200
+++ b/.hgsigs	Wed Jun 15 04:53:52 2011 +0000
@@ -15,7 +15,6 @@
 75b887d57378e59138c0362b928a504db568ed9b 0 iEYEABECAAYFAkuSHAsACgkQCX/oGf+2qkOEpwCeM6aKuQ/VK5ywylW5Jiki2L5YX0UAoPtzt8ELfu+2n0hTB2E36NgVq1IU
 8df12cedf6a200183c73497ae0cefa3fee0a0427 0 iEYEABECAAYFAkuzHu4ACgkQCX/oGf+2qkNkzwCeJC2mfV4HG3jDDH4B9ovaplpzyWwAoOQY9wuMO2XNnVJ9xw7JS+Qjy52k
 5c7276ed55f2605be4e0163a90820437ae51b35a 0 iEYEABECAAYFAkvoPD0ACgkQCX/oGf+2qkPJwwCgvsSfRbgj8XvBTAe0D98MuzYC9X0AnR61u2gYKK5GgGlgo6B6S7dfDCUr
-a56977f8bc9c70b88f49eccc4e05d4703926df8b 0 iEYEABECAAYFAkvpHhQACgkQCX/oGf+2qkNE2gCfRUvL9gvk0xEg6OjMlTbJbplKpNkAnAz8f8WZ4NY9NFmiefa6afLiiyIG
 8594549ee5becd6e51d6a295a6b473c42bacbbb9 0 iEYEABECAAYFAkvq4o4ACgkQCX/oGf+2qkPvLACfdPEl+S1cRY59u90LiQRmROPIL8cAniZtSjiAg13GifqOFZCZZ+zilCep
 9f343a616b2f998c3867661467de5dd9daeb7112 0 iEYEABECAAYFAkvq7PIACgkQCX/oGf+2qkMcHQCg3eHGql848ExhA5oOgtqfjIE3toUAn0GiWHkItn3YxPFitn8+e0IfOEaj
 9b4bbe8362f54f7212653fddf5bd053183a7ffda 0 iEYEABECAAYFAkv8vDgACgkQCX/oGf+2qkPC3ACfURoh78/OY95XuFkAKNfaLQQzuCsAoNoNLdSqMVYuAJMAI2mimGZ5BXaw
@@ -34,3 +33,4 @@
 6476aa1e07119478af0225400d92664a698c4d92 0 iEYEABECAAYFAk2tOmkACgkQCX/oGf+2qkOdjQCfbLZLz0XBihiG+saQfXDmrFB6Tl8AoNsbxxXriyOl3cEOgzir5OwVzMYe
 d966facd4b0f349024c65098e97d877604b633f8 0 iEYEABECAAYFAk2yfgAACgkQCX/oGf+2qkPg7QCg+KcrtTvoOhqRFuZSyamnjNgoMGcAnA/zSMJDkZXRxAYxQmcrz7xdQvcB
 ac9b2af2db710efe23dfc0bacc4de56e60329d50 0 iEYEABECAAYFAk3VRlQACgkQCX/oGf+2qkO0wwCgz2hgg3neW9/t6zps8BOtzPWb8d4AoOXpmy5oqoXoAvMG3e+FvGy/23sr
+99fb3658a953bb30e5b4850aca947102942b4659 0 iEYEABECAAYFAk32R/EACgkQCX/oGf+2qkPedQCgiUtwjVa9BInf4zD2a1rIDU8CW8gAoOqRFJ/4MzHb0pzYjJIfKwMyA0pf
--- a/.hgtags	Tue Jun 07 03:36:45 2011 +0200
+++ b/.hgtags	Wed Jun 15 04:53:52 2011 +0000
@@ -44,3 +44,4 @@
 9fbc1df28282a4a8fb30755c67f6b1fde74dc167 3.0RC6
 31c9f7abb644b441de8b69a4493f6953621e1017 3.0RC6.1
 4e790673106e04d55e9e151f08adb16f39d5a586 3.0RC7
+1cb20ca392d7b5cca925cc6fdca4f718d3df1d10 3.0MP0
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -517,7 +517,8 @@
               INSERT INTO fin_payment(
                 fin_payment_id, ad_client_id, ad_org_id, created, createdby,
                 updated, updatedby, isactive, isreceipt, c_bpartner_id, paymentdate,
-                c_currency_id, amount, writeoffamt, fin_paymentmethod_id, documentno,
+                c_currency_id, amount, writeoffamt,
+                finacc_txn_amount,fin_paymentmethod_id, documentno,
                 referenceno,
                 status,
                 processed, processing, posted, description,
@@ -526,7 +527,8 @@
                 em_aprm_add_scheduledpayments)
               VALUES (v_FIN_PAYMENT_ID, v_client_id, cur_paymentschedule.AD_ORG_ID, now(), p_user,
                 now(), p_user, 'Y', v_IsSOTrx, v_bpartner_id, cur_paymentschedule.DUEDATE,
-                cur_paymentschedule.C_CURRENCY_ID, COALESCE(cur_paymentschedule.OUTSTANDINGAMT,0), 0, cur_paymentschedule.FIN_PAYMENTMETHOD_ID, v_PaymentDocumentNo,
+                cur_paymentschedule.C_CURRENCY_ID, COALESCE(cur_paymentschedule.OUTSTANDINGAMT,0), 0,
+                COALESCE(cur_paymentschedule.OUTSTANDINGAMT,0), cur_paymentschedule.FIN_PAYMENTMETHOD_ID, v_PaymentDocumentNo,
                 '',
                 CASE
                   WHEN cur_finaccpaymentmethod.ExecutionType = 'A' THEN 'RPAE'
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -22,4 +22,15 @@
 <!--D08EBACB459849488F49089EA28F96D9-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--D08EBACB459849488F49089EA28F96D9--></AD_AUXILIARINPUT>
 
+<!--FF808081308851A40130887E45400063--><AD_AUXILIARINPUT>
+<!--FF808081308851A40130887E45400063-->  <AD_AUXILIARINPUT_ID><![CDATA[FF808081308851A40130887E45400063]]></AD_AUXILIARINPUT_ID>
+<!--FF808081308851A40130887E45400063-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF808081308851A40130887E45400063-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF808081308851A40130887E45400063-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF808081308851A40130887E45400063-->  <AD_TAB_ID><![CDATA[FF8080812F213146012F2135BC25000E]]></AD_TAB_ID>
+<!--FF808081308851A40130887E45400063-->  <NAME><![CDATA[IsSOTrx]]></NAME>
+<!--FF808081308851A40130887E45400063-->  <CODE><![CDATA[@SQL=SELECT COALESCE(ISRECEIPT,'Y') AS ISRECEIPT FROM FIN_PAYMENT WHERE FIN_PAYMENT_ID = @FIN_PAYMENT_ID@]]></CODE>
+<!--FF808081308851A40130887E45400063-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--FF808081308851A40130887E45400063--></AD_AUXILIARINPUT>
+
 </data>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.12729]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.12774]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP>
@@ -25,7 +25,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time.
 Fixed issue 15305.]]></UPDATEINFO>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE>
 
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--B97FC854C6DD41E692161585645A900F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html	Wed Jun 15 04:53:52 2011 +0000
@@ -455,11 +455,6 @@
 function onResizeDo(){
   resizeAreaCreateFrom(true);
 }
-isc.OBSelectorWidget.addProperties({
-  onValueChanged: function(selected) {
-                    loadGridList();
-                  }
-});
 function closeThisPage() {
   removeAllGLItem(true);
   return true;
@@ -952,7 +947,7 @@
                     <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>
-                      <script id="selectorLink" src="../org.openbravo.client.kernel/OBUISEL_Selector/A98899B1C75A4F4EBD3414F1B654EFAB?columnName=C_BPartner_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&required=true&filterClass=org.openbravo.userinterface.selector.SelectorDataSourceFilter&_selectorDefinitionId=A98899B1C75A4F4EBD3414F1B654EFAB"></script>
+                      <script id="selectorLink" src="../org.openbravo.client.kernel/OBUISEL_Selector/A98899B1C75A4F4EBD3414F1B654EFAB?columnName=C_BPartner_ID&disabled=false&CssSize=TwoCells&callOut=loadGridList&DisplayLength=45.0&required=true&filterClass=org.openbravo.userinterface.selector.SelectorDataSourceFilter&_selectorDefinitionId=A98899B1C75A4F4EBD3414F1B654EFAB"></script>
                     </td>
                   </tr>
                 </table>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java	Wed Jun 15 04:53:52 2011 +0000
@@ -37,7 +37,6 @@
 import org.openbravo.base.filter.ValueListFilter;
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.base.util.Convert;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.data.FieldProvider;
@@ -286,8 +285,8 @@
     xmlDocument.setParameter("isReceipt", (payment.isReceipt() ? "Y" : "N"));
     xmlDocument.setParameter("isSoTrx", (payment.isReceipt()) ? "Y" : "N");
     if (payment.getBusinessPartner() == null
-        && (payment.getGeneratedCredit() != null || payment.getGeneratedCredit().compareTo(
-            BigDecimal.ZERO) != 0)) {
+        && (payment.getGeneratedCredit() == null || BigDecimal.ZERO.compareTo(payment
+            .getGeneratedCredit()) != 0)) {
       payment.setGeneratedCredit(BigDecimal.ZERO);
       OBDal.getInstance().save(payment);
       OBDal.getInstance().flush();
@@ -303,12 +302,15 @@
       xmlDocument.setParameter("financialAccountCurrencyPrecision", financialAccountCurrency
           .getStandardPrecision().toString());
     }
-    xmlDocument.setParameter("exchangeRate", Convert.toString(payment
-        .getFinancialTransactionConvertRate()));
-    xmlDocument.setParameter("actualConverted", Convert.toString(payment
-        .getFinancialTransactionAmount()));
-    xmlDocument.setParameter("expectedConverted", Convert.toString(payment
-        .getFinancialTransactionAmount()));
+    xmlDocument.setParameter("exchangeRate",
+        payment.getFinancialTransactionConvertRate() == null ? "" : payment
+            .getFinancialTransactionConvertRate().toPlainString());
+    xmlDocument.setParameter("actualConverted",
+        payment.getFinancialTransactionAmount() == null ? "" : payment
+            .getFinancialTransactionAmount().toString());
+    xmlDocument.setParameter("expectedConverted",
+        payment.getFinancialTransactionAmount() == null ? "" : payment
+            .getFinancialTransactionAmount().toPlainString());
     xmlDocument.setParameter("currencyId", payment.getCurrency().getId());
     xmlDocument.setParameter("currencyName", payment.getCurrency().getISOCode());
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java	Wed Jun 15 04:53:52 2011 +0000
@@ -334,8 +334,14 @@
     xmlDocument.setParameter("sectionDetailPaymentMethod", paymentMethodComboHtml);
 
     // Financial Account combobox
-    String finAccountComboHtml = FIN_Utility.getFinancialAccountList(strPaymentMethodId,
-        strFinancialAccountId, strOrgId, true, strCurrencyId, isReceipt);
+    List<FIN_FinancialAccount> financialAccounts = dao.getFilteredFinancialAccounts(
+        strPaymentMethodId, strOrgId, strCurrencyId,
+        isReceipt ? AdvPaymentMngtDao.PaymentDirection.IN : AdvPaymentMngtDao.PaymentDirection.OUT);
+    String finAccountComboHtml = FIN_Utility.getOptionsList(financialAccounts,
+        strFinancialAccountId, true);
+    if (financialAccounts.size() > 0 && account == null) {
+      strFinancialAccountId = financialAccounts.get(0).getId();
+    }
     xmlDocument.setParameter("sectionDetailFinancialAccount", finAccountComboHtml);
 
     // Currency
@@ -510,7 +516,7 @@
   private String findExchangeRate(Currency paymentCurrency, Currency financialAccountCurrency,
       Date paymentDate, Organization organization, int conversionRatePrecision) {
     String exchangeRate = "1.0";
-    if (!financialAccountCurrency.equals(paymentCurrency)) {
+    if (financialAccountCurrency != null && !financialAccountCurrency.equals(paymentCurrency)) {
       final ConversionRate conversionRate = FIN_Utility.getConversionRate(paymentCurrency,
           financialAccountCurrency, paymentDate, organization);
       if (conversionRate == null) {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java	Wed Jun 15 04:53:52 2011 +0000
@@ -564,7 +564,7 @@
   private String findExchangeRate(Currency paymentCurrency, Currency financialAccountCurrency,
       Date paymentDate, Organization organization, int conversionRatePrecision) {
     String exchangeRate = "1.0";
-    if (!financialAccountCurrency.equals(paymentCurrency)) {
+    if (financialAccountCurrency != null && !financialAccountCurrency.equals(paymentCurrency)) {
       final ConversionRate conversionRate = FIN_Utility.getConversionRate(paymentCurrency,
           financialAccountCurrency, paymentDate, organization);
       if (conversionRate == null) {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Wed Jun 15 04:53:52 2011 +0000
@@ -449,7 +449,7 @@
     OBDal.getInstance().save(payment);
     OBDal.getInstance().save(newPaymentDetail);
     OBDal.getInstance().save(paymentScheduleDetail);
-    // OBDal.getInstance().flush();
+    OBDal.getInstance().flush();
 
     return newPaymentDetail;
   }
@@ -1081,8 +1081,10 @@
 
       }
 
-      obc.add(exp.getCriterion()); // compoundexp will be always != null because
-      // finAccsMethods.isEmpty() == false
+      Criterion crit = exp.getCriterion();
+      if (crit != null) {
+        obc.add(crit);
+      }
     }
     return obc.list();
   }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Wed Jun 15 04:53:52 2011 +0000
@@ -20,6 +20,7 @@
 
 import java.math.BigDecimal;
 import java.math.MathContext;
+import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -36,7 +37,6 @@
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.base.session.OBPropertiesProvider;
-import org.openbravo.base.util.Convert;
 import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
@@ -131,7 +131,8 @@
       payment = _payment;
     else {
       payment = dao.getNewPayment(isReceipt, organization, docType, strPaymentDocumentNo,
-          businessPartner, paymentMethod, finAccount, strPaymentAmount, paymentDate, referenceNo);
+          businessPartner, paymentMethod, finAccount, strPaymentAmount, paymentDate, referenceNo,
+          paymentCurrency, finTxnConvertRate, finTxnAmount);
       OBDal.getInstance().flush();
     }
 
@@ -275,8 +276,9 @@
     } else {
       Currency finAccountCurrency = paymentProposal.getAccount().getCurrency();
       BigDecimal finAccountTxnAmount = paymentAmount.multiply(convertRate);
-      finAccountTxnAmount = Convert.toNumberWithPrecision(finAccountTxnAmount, finAccountCurrency
-          .getStandardPrecision());
+      long faPrecision = finAccountCurrency.getStandardPrecision();
+      finAccountTxnAmount = finAccountTxnAmount.setScale((int) faPrecision, RoundingMode.HALF_UP);
+
       paymentProposal.setFinancialTransactionAmount(finAccountTxnAmount);
     }
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProposalProcess.java	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProposalProcess.java	Wed Jun 15 04:53:52 2011 +0000
@@ -19,6 +19,7 @@
 package org.openbravo.advpaymentmngt.process;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -29,7 +30,6 @@
 import org.openbravo.advpaymentmngt.utility.FIN_Utility;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.base.util.Convert;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.database.ConnectionProvider;
@@ -129,8 +129,9 @@
               String strPaymentDocumentNo = FIN_Utility.getDocumentNo(orgId, (isReceipt) ? "ARR"
                   : "APP", "DocumentNo_FIN_Payment_Proposal");
 
-              BigDecimal finAccTxnAmount = Convert.toNumberWithPrecision(paymentTotal
-                  .multiply(exchangeRate), financialAccountCurrency.getStandardPrecision());
+              BigDecimal finAccTxnAmount = paymentTotal.multiply(exchangeRate);
+              long faPrecision = financialAccountCurrency.getStandardPrecision();
+              finAccTxnAmount = finAccTxnAmount.setScale((int) faPrecision, RoundingMode.HALF_UP);
               FIN_Payment payment = FIN_AddPayment.savePayment(null, isReceipt, dao.getObject(
                   DocumentType.class, strDocTypeId), strPaymentDocumentNo, dao.getObject(
                   BusinessPartner.class, strBusinessPartner_old), paymentMethodId,
@@ -172,8 +173,9 @@
           String strPaymentDocumentNo = FIN_Utility.getDocumentNo(orgId, (isReceipt) ? "ARR"
               : "APP", "DocumentNo_FIN_Payment_Proposal");
 
-          BigDecimal finAccTxnAmount = Convert.toNumberWithPrecision(paymentTotal
-              .multiply(exchangeRate), financialAccountCurrency.getStandardPrecision());
+          BigDecimal finAccTxnAmount = paymentTotal.multiply(exchangeRate);
+          long faPrecision = financialAccountCurrency.getStandardPrecision();
+          finAccTxnAmount = finAccTxnAmount.setScale((int) faPrecision, RoundingMode.HALF_UP);
 
           FIN_Payment payment = FIN_AddPayment.savePayment(null, isReceipt, dao.getObject(
               DocumentType.class, strDocTypeId), strPaymentDocumentNo, dao.getObject(
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Wed Jun 15 04:53:52 2011 +0000
@@ -22,6 +22,7 @@
 import java.math.BigDecimal;
 import java.sql.BatchUpdateException;
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -34,6 +35,7 @@
 import java.util.StringTokenizer;
 import java.util.TimeZone;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.apache.log4j.Logger;
 import org.hibernate.criterion.Restrictions;
@@ -745,7 +747,24 @@
     StringBuffer out = new StringBuffer();
     final UIDefinitionController.FormatDefinition formatDef = UIDefinitionController.getInstance()
         .getFormatDefinition("euro", "Edition");
-    DecimalFormat amountFormatter = new DecimalFormat(formatDef.getFormat());
+
+    String formatWithDot = formatDef.getFormat();
+    DecimalFormatSymbols dfs = new DecimalFormatSymbols();
+    try {
+      dfs.setDecimalSeparator(formatDef.getDecimalSymbol().charAt(0));
+      dfs.setGroupingSeparator(formatDef.getGroupingSymbol().charAt(0));
+      // Use . as decimal separator
+      final String DOT = ".";
+      if (!DOT.equals(formatDef.getDecimalSymbol())) {
+        formatWithDot = formatWithDot.replace(formatDef.getGroupingSymbol(), "@");
+        formatWithDot = formatWithDot.replace(formatDef.getDecimalSymbol(), ".");
+        formatWithDot = formatWithDot.replace("@", ",");
+      }
+    } catch (Exception e) {
+      // If any error use euroEdition default format
+      formatWithDot = "#0.00";
+    }
+    DecimalFormat amountFormatter = new DecimalFormat(formatWithDot, dfs);
     amountFormatter.setMaximumFractionDigits(currency.getStandardPrecision().intValue());
 
     out.append(amountFormatter.format(amt));
@@ -811,7 +830,7 @@
   public static int getConversionRatePrecision(VariablesSecureApp vars) {
     try {
       String formatOutput = vars.getSessionValue("#FormatOutput|generalQtyEdition", "#0.######");
-      String decimalSeparator = vars.getSessionValue("#DecimalSeparator|generalQtyEdition", ".");
+      String decimalSeparator = ".";
       if (formatOutput.contains(decimalSeparator)) {
         formatOutput = formatOutput.substring(formatOutput.indexOf(decimalSeparator), formatOutput
             .length());
@@ -825,4 +844,74 @@
     }
   }
 
+  /**
+   * Formats a number using the given format, decimal and grouping separator.
+   * 
+   * @param number
+   *          Number to be formatted.
+   * @param format
+   *          Java number format pattern.
+   * @param decimalSeparator
+   *          Symbol used as decimal separator.
+   * @param groupingSeparator
+   *          Symbol used as grouping separator.
+   * @return Formatted string.
+   */
+  public static String formatNumber(BigDecimal number, String javaFormat, String _decimalSeparator,
+      String _groupingSeparator) {
+    if (StringUtils.isEmpty(javaFormat)) {
+      return formatNumber(number);
+    }
+    String decimalSeparator = _decimalSeparator;
+    String groupingSeparator = _groupingSeparator;
+    if (StringUtils.isEmpty(decimalSeparator) || StringUtils.isEmpty(groupingSeparator)) {
+      decimalSeparator = ".";
+      groupingSeparator = ",";
+    }
+    DecimalFormatSymbols dfs = new DecimalFormatSymbols();
+    DecimalFormat dc;
+    try {
+      dfs.setDecimalSeparator(decimalSeparator.charAt(0));
+      dfs.setGroupingSeparator(groupingSeparator.charAt(0));
+      dc = new DecimalFormat(javaFormat, dfs);
+
+    } catch (Exception e) {
+      // If any error use euroEdition default format
+      dc = new DecimalFormat("#0.00", dfs);
+    }
+    return dc.format(number);
+  }
+
+  /**
+   * Formats a number using the euroEdition (see Format.xml) format.
+   * 
+   * @param number
+   *          Number to be formatted.
+   * @return Formatted string.
+   */
+  public static String formatNumber(BigDecimal number) {
+    final UIDefinitionController.FormatDefinition formatDef = UIDefinitionController.getInstance()
+        .getFormatDefinition("euro", "Edition");
+
+    String formatWithDot = formatDef.getFormat();
+    DecimalFormatSymbols dfs = new DecimalFormatSymbols();
+    DecimalFormat amountFormatter;
+    try {
+      dfs.setDecimalSeparator(formatDef.getDecimalSymbol().charAt(0));
+      dfs.setGroupingSeparator(formatDef.getGroupingSymbol().charAt(0));
+      // Use . as decimal separator
+      final String DOT = ".";
+      if (!DOT.equals(formatDef.getDecimalSymbol())) {
+        formatWithDot = formatWithDot.replace(formatDef.getGroupingSymbol(), "@");
+        formatWithDot = formatWithDot.replace(formatDef.getDecimalSymbol(), ".");
+        formatWithDot = formatWithDot.replace("@", ",");
+      }
+      amountFormatter = new DecimalFormat(formatWithDot, dfs);
+    } catch (Exception e) {
+      // If any error use euroEdition default format
+      amountFormatter = new DecimalFormat("#0.00", dfs);
+    }
+    return amountFormatter.format(number);
+  }
+
 }
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.12729]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.12774]]></VERSION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
@@ -22,7 +22,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <UPDATEINFO><![CDATA[Bug fixing.]]></UPDATEINFO>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--C70732EA90A14EC0916078B85CC33D2D--></AD_MODULE>
 
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -2391,8 +2391,7 @@
 <!--FF808181304F1CD101304F8F7D580035-->  <MSGTEXT><![CDATA[The following configuration script(s) were not exported:<br/>
 %0.<br/>
 Field layout modifications in these template(s) were removed during the upgrade process.<br/>
-You should export your configuration script to synchronize it with your source code.<br/>
-<a target="_blank" href="http://wiki.openbravo.com/wiki/ERP/2.50/Developers_Guide/Concepts/Development_Build_Tasks#Modules" class="OBNoteListGridDelete">Learn more about exporting configuration script. </a><br/>
+You should export your configuration script to update your source code.  <a target="_blank" href="http://wiki.openbravo.com/wiki/ERP/2.50/Developers_Guide/Concepts/Development_Build_Tasks#Modules" class="OBNoteListGridDelete">Learn more about exporting configuration script. </a><br/>
 You then need to logout and re-login for the changes to be effective.]]></MSGTEXT>
 <!--FF808181304F1CD101304F8F7D580035-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--FF808181304F1CD101304F8F7D580035-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
@@ -2421,7 +2420,7 @@
 <ul>
 <li>Read the <a class="OBNoteListGridDelete" href="http://wiki.openbravo.com/wiki/ERP/3.0/Release_Notes" target="_blank">release notes</a></li>
 <li>In case your previous instance used a customized field layout, it is recommended to review the new layout and modify it if needed. <a class="OBNoteListGridDelete" target="_blank" href="http://wiki.openbravo.com/wiki/ERP/3.0/Developers_Guide/How_to_customize_the_Openbravo_look_and_feel">Learn how to do it.</a></li>
-<li>Some special customizations could prevent Openbravo elements (windows, pop-ups and so on) to be shown in the new user interface. <a class="OBNoteListGridDelete" herf="http://wiki.openbravo.com/wiki/ERP/2.50/Developers_Guide/Concepts/How_to_Migrate_2.50_Modules_to_3.0#Required_changes" target="_blank">Learn more how to detect and fix those cases.</a></li>
+<li>Some special customizations could prevent Openbravo elements (windows, pop-ups and so on) to be shown in the new user interface. <a class="OBNoteListGridDelete" href="http://wiki.openbravo.com/wiki/ERP/2.50/Developers_Guide/Concepts/How_to_Migrate_2.50_Modules_to_3.0#Required_changes" target="_blank">Learn more how to detect and fix those cases.</a></li>
 <li>Test your business processes before deploying release into a production environment</li>
 </ul>]]></MSGTEXT>
 <!--FF808181304F1CD101304F927C880049-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <NAME><![CDATA[User Interface Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.12729]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.12774]]></VERSION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>
@@ -22,7 +22,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC--></AD_MODULE>
 
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.12729]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.12774]]></STARTVERSION>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/HeartBeatPopupActionHandler.java	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/HeartBeatPopupActionHandler.java	Wed Jun 15 04:53:52 2011 +0000
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2009 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2011 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -71,37 +71,42 @@
       boolean usingAprm = true;
       boolean exportConfigScript = false;
       if (isUpgrading) {
-        sysAdmin = "S".equals(OBContext.getOBContext().getRole().getUserLevel());
-        if (sysAdmin) {
-          if (OBDal.getInstance().exists(Module.ENTITY_NAME, APRM_MIGRATION_TOOL_ID)) {
-            usingAprm = new AdvPaymentMngtDao().existsAPRMReadyPreference();
-          }
+        OBContext.setAdminMode();
+        try {
+          sysAdmin = "S".equals(OBContext.getOBContext().getRole().getUserLevel());
+          if (sysAdmin) {
+            if (OBDal.getInstance().exists(Module.ENTITY_NAME, APRM_MIGRATION_TOOL_ID)) {
+              usingAprm = new AdvPaymentMngtDao().existsAPRMReadyPreference();
+            }
 
-          // Check all applied configuration scripts are exported in 3.0
-          OBCriteria<Module> qMod = OBDal.getInstance().createCriteria(Module.class);
-          qMod.add(Restrictions.eq(Module.PROPERTY_TYPE, "T"));
-          qMod.add(Restrictions.eq(Module.PROPERTY_ENABLED, true));
-          qMod.add(Restrictions.eq(Module.PROPERTY_APPLYCONFIGURATIONSCRIPT, true));
-          String obDir = OBPropertiesProvider.getInstance().getOpenbravoProperties().getProperty(
-              "source.path");
-          String oldScripts = "";
-          for (Module mod : qMod.list()) {
-            File cfScript = new File(obDir + "/modules/" + mod.getJavaPackage()
-                + "/src-db/database", "configScript.xml");
-            if (cfScript.exists() && DBSMOBUtil.isOldConfigScript(cfScript)) {
-              if (!oldScripts.isEmpty()) {
-                oldScripts += ", ";
+            // Check all applied configuration scripts are exported in 3.0
+            OBCriteria<Module> qMod = OBDal.getInstance().createCriteria(Module.class);
+            qMod.add(Restrictions.eq(Module.PROPERTY_TYPE, "T"));
+            qMod.add(Restrictions.eq(Module.PROPERTY_ENABLED, true));
+            qMod.add(Restrictions.eq(Module.PROPERTY_APPLYCONFIGURATIONSCRIPT, true));
+            String obDir = OBPropertiesProvider.getInstance().getOpenbravoProperties().getProperty(
+                "source.path");
+            String oldScripts = "";
+            for (Module mod : qMod.list()) {
+              File cfScript = new File(obDir + "/modules/" + mod.getJavaPackage()
+                  + "/src-db/database", "configScript.xml");
+              if (cfScript.exists() && DBSMOBUtil.isOldConfigScript(cfScript)) {
+                if (!oldScripts.isEmpty()) {
+                  oldScripts += ", ";
+                }
+                oldScripts += mod.getName();
+                log.info(mod.getName() + " config script is not exported in 3.0");
               }
-              oldScripts += mod.getName();
-              log.info(mod.getName() + " config script is not exported in 3.0");
+            }
+
+            exportConfigScript = !oldScripts.isEmpty();
+
+            if (exportConfigScript) {
+              result.put("oldConfigScripts", oldScripts);
             }
           }
-
-          exportConfigScript = !oldScripts.isEmpty();
-
-          if (exportConfigScript) {
-            result.put("oldConfigScripts", oldScripts);
-          }
+        } finally {
+          OBContext.restorePreviousMode();
         }
       }
 
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl	Wed Jun 15 04:53:52 2011 +0000
@@ -59,6 +59,7 @@
         ${field.filterEditorProperties}
         , title: '${field.title?js_string}'
         , prompt: '${field.title?js_string}'
+        , required: ${field.required?string}
         , escapeHTML: true
         , showIf: '${field.initialShow?string}'
         , columnName: '${field.columnName?js_string}'
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Wed Jun 15 04:53:52 2011 +0000
@@ -1169,8 +1169,7 @@
                           rq.setRequestParameter(colId, jsonobj.getString("classicValue"));
                         }
                       } else {
-                        log
-                            .debug("Column value didn't change. We do not attempt to execute any additional callout");
+                        log.debug("Column value didn't change. We do not attempt to execute any additional callout");
                       }
                     }
                     if (changed && col.getCallout() != null) {
@@ -1363,7 +1362,7 @@
     try {
       String code = auxIn.getValidationCode();
       log.debug("Auxiliary Input: " + auxIn.getName() + " Code:" + code);
-      String fvalue = null;
+      Object fvalue = null;
       if (code.startsWith("@SQL=")) {
         ArrayList<String> params = new ArrayList<String>();
         String sql = UIDefinition.parseSQL(code, params);
@@ -1389,7 +1388,7 @@
         }
         ResultSet rs = ps.executeQuery();
         if (rs.next()) {
-          fvalue = rs.getString(1);
+          fvalue = rs.getObject(1);
         }
       } else if (code.startsWith("@")) {
         String codeWithoutAt = code.substring(1, code.length() - 1);
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java	Wed Jun 15 04:53:52 2011 +0000
@@ -165,8 +165,7 @@
 
     if (!filterName.isEmpty()) {
       filterName = Utility.messageBD(new DalConnectionProvider(false), "OBUIAPP_FilteredGrid",
-          OBContext.getOBContext().getLanguage().getLanguage())
-          + " " + filterName + ".";
+          OBContext.getOBContext().getLanguage().getLanguage()) + " " + filterName + ".";
     }
 
     return filterName;
@@ -234,6 +233,23 @@
     final List<Field> sortedFields = new ArrayList<Field>(tab.getADFieldList());
     Collections.sort(sortedFields, new GridFieldComparator());
 
+    // Processing dynamic expressions (display logic)
+    for (Field f : sortedFields) {
+      if (f.getDisplayLogic() == null || f.getDisplayLogic().equals("") || !f.isActive()
+          || !f.isDisplayed()) {
+        continue;
+      }
+
+      final DynamicExpressionParser parser = new DynamicExpressionParser(f.getDisplayLogic(), tab);
+      displayLogicMap.put(f, parser.getJSExpression());
+
+      for (Field fieldExpression : parser.getFields()) {
+        if (!fieldsInDynamicExpression.contains(fieldExpression)) {
+          fieldsInDynamicExpression.add(fieldExpression);
+        }
+      }
+    }
+
     // first add the grid fields
     for (Field fld : sortedFields) {
       if (fld.isActive() && fld.isShowInGridView()) {
@@ -256,23 +272,6 @@
       }
     }
 
-    // Processing dynamic expressions (display logic)
-    for (Field f : sortedFields) {
-      if (f.getDisplayLogic() == null || f.getDisplayLogic().equals("") || !f.isActive()
-          || !f.isDisplayed()) {
-        continue;
-      }
-
-      final DynamicExpressionParser parser = new DynamicExpressionParser(f.getDisplayLogic(), tab);
-      displayLogicMap.put(f, parser.getJSExpression());
-
-      for (Field fieldExpression : parser.getFields()) {
-        if (!fieldsInDynamicExpression.contains(fieldExpression)) {
-          fieldsInDynamicExpression.add(fieldExpression);
-        }
-      }
-    }
-
     // Processing dynamic expression (read-only logic)
     for (Field f : sortedFields) {
       if (f.getColumn().getReadOnlyLogic() == null || f.getColumn().getReadOnlyLogic().equals("")
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js	Wed Jun 15 04:53:52 2011 +0000
@@ -336,7 +336,7 @@
       if ((EH.ctrlKeyDown() && !EH.altKeyDown() && !EH.shiftKeyDown()) || (!EH.ctrlKeyDown() && !EH.altKeyDown() && EH.shiftKeyDown())) {
         // move to multi-select mode, let the standard do it for us
         this.singleRecordSelection = false;
-      } else {
+      } else if (!(!EH.ctrlKeyDown() && EH.altKeyDown() && EH.shiftKeyDown())) {  // 'if' statement to avoid do an action when the KS to move to a child tab is fired
         this.doSelectSingleRecord(record);
       }
     } else if (this.getCheckboxFieldPosition() === fieldNum) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js	Wed Jun 15 04:53:52 2011 +0000
@@ -495,7 +495,7 @@
                 },
                 click: function() {
                   this.topElement.cancelClick();
-                  OB.Utilities.logout();
+                  OB.Utilities.logout(true);
                 }});
     	  
     	isc.confirm(OB.I18N.getLabel('OBUIAPP_UpgradeDesc'), {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk.js	Wed Jun 15 04:53:52 2011 +0000
@@ -28,9 +28,17 @@
     
   // set the identifier field also, that's what gets displayed in the grid
   changed: function (form, item, value) {
-    var display = this.mapValueToDisplay(value);
-    form.setValue(this.name + '.' + OB.Constants.IDENTIFIER, display);
-    return this.Super('changed', [arguments]);
+    if (!this._pickedValue && value) {
+      return;
+    }
+
+    var display = this.mapValueToDisplay(value), identifierFieldName = this.name + '.' + OB.Constants.IDENTIFIER;
+    form.setValue(identifierFieldName, display);
+    // make sure that the grid does not display the old identifier
+    if (form.grid) {
+      form.grid.setEditValue(form.grid.getEditRow(), identifierFieldName, display);
+    }
+    return this.Super('changed', arguments);
   }
 });
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js	Wed Jun 15 04:53:52 2011 +0000
@@ -23,5 +23,17 @@
 
 isc.OBListFilterItem.addProperties({
   moveFocusOnPickValue: false,
-  operator: 'equals'
+  operator: 'equals',
+  validateOnExit: false,
+  validateOnChange: false,
+  
+  // note: can't override changed as it is used by the filter editor 
+  // itself, see the RecordEditor source code and the changed event
+  change: function(form, item, value, oldValue) {
+    if (this._pickedValue || !value) {
+      // filter with a delay to let the value be set
+      isc.Page.setEvent(isc.EH.IDLE, this.form.grid, isc.Page.FIRE_ONCE, 'performAction');
+    }
+    this.Super('change', arguments);
+  }
 });
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js	Wed Jun 15 04:53:52 2011 +0000
@@ -26,8 +26,8 @@
   hasPickList: true,
   showPickListOnKeypress: true,  
   cachePickListResults: false,
-  validateOnExit: true,  
   completeOnTab: true,
+  validateOnExit: true,
   
   // without this in chrome the content is sorted according to the id/value
   // not the displayfield
@@ -70,7 +70,7 @@
   },
 
   // prevent ids from showing up
-  mapValueToDisplay : function (value) {
+  mapValueToDisplay: function (value) {
     var ret = this.Super('mapValueToDisplay', arguments);
     if (ret === value && this.isDisabled()) {
       return '';
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js	Wed Jun 15 04:53:52 2011 +0000
@@ -34,7 +34,7 @@
       targetFld.valueMap = {};
     }
     
-    targetFld.setValue(value);
+    targetFld.storeValue(value);
     if (!targetFld.valueMap) {
       targetFld.valueMap = {};
     }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js	Wed Jun 15 04:53:52 2011 +0000
@@ -89,6 +89,9 @@
       }
       this.view.switchFormGridVisibility();
       this.view.messageBar.hide();
+      if (this.view.viewForm.isNew) {
+        this.view.refreshChildViews();
+      }
     } else if (this.buttonType === 'maximizeRestore') {
       theButtonBar = this.view.statusBar.buttonBar;
       if (theButtonBar.members) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Wed Jun 15 04:53:52 2011 +0000
@@ -103,7 +103,10 @@
         break;
       }
     }
-    
+    if (!this.firstFocusedField) {
+      this.firstFocusedField = this.getItem(0).name;
+    }
+
     delete this._preventFocusChanges;
   },
 
@@ -376,10 +379,15 @@
   computeFocusItem: function(changeState) {
     var items = this.getItems(), length = items.length, item, i;
     
-    var errorFld = this.getFirstErrorItem();
-    if (errorFld) {
-      this.setFocusItem(errorFld);
-      return;
+    if (!changeState) {
+      var errorFld = this.getFirstErrorItem();
+      if (errorFld) {
+        // get rid of this one, to not set the focus back to this field
+        delete this.forceFocusedField;
+        
+        this.setFocusItem(errorFld);
+        return;
+      }
     }
     
     if (this.forceFocusedField) {
@@ -527,6 +535,18 @@
     });
   },
   
+  rememberValues: function() {
+    var i, flds = this.getFields();
+    this.Super('rememberValues', arguments);
+    
+    // also remember the valuemaps
+    for (i = 0; i < flds.length; i++) {
+      if (flds[i].valueMap) {
+        flds[i]._rememberedValueMap = flds[i].valueMap;
+      }
+    }
+  },
+  
   // used in grid editing, when an edit is discarded then the canFocus needs to be
   // reset
   resetCanFocus: function() {
@@ -537,7 +557,7 @@
   },
   
   processFICReturn: function(response, data, request, editValues, editRow){
-    var modeIsNew = request.params.MODE === 'NEW';
+    var modeIsNew = request.params.MODE === 'NEW', noErrors, errorSolved;
 
     // needs to be recomputed as for grid editing the fields
     // are reset for every edit session
@@ -633,12 +653,25 @@
 
     if (this.validateAfterFicReturn) {
       delete this.validateAfterFicReturn;
-      // only validate the fields which have errors
+      // only validate the fields which have errors or which have changed
+      noErrors = true;
       for (i = 0; i < this.getFields().length; i++) {
-        if (this.hasFieldErrors(this.getFields()[i].name)) {
-          this.getFields()[i].validate();
+        if (this.getFields()[i]._changedByFic || this.hasFieldErrors(this.getFields()[i].name)) {
+          errorSolved = this.getFields()[i].validate();
+          noErrors = noErrors && errorSolved;
+          if (errorSolved && this.grid) {
+            this.grid.clearFieldError(this.grid.getEditRow(), this.getFields()[i].name);
+          }
         }
       }
+      if (this.grid && noErrors) {
+        this.grid.clearRowErrors(this.grid.getEditRow());
+        this.grid.refreshRow(this.grid.getEditRow());
+      }
+    }
+
+    for (i = 0; i < this.getFields().length; i++) {
+      delete this.getFields()[i]._changedByFic;
     }
 
     this.markForRedraw();
@@ -707,7 +740,7 @@
   },
   
   processColumnValue: function(columnName, columnValue, editValues){
-    var isDate, i, valueMap = {}, field = this.getFieldFromColumnName(columnName), entries = columnValue.entries;
+    var isDate, i, valueMap = {}, oldValue, field = this.getFieldFromColumnName(columnName), entries = columnValue.entries;
     // not a field on the form, probably a datasource field
     var prop = this.view.getPropertyFromDBColumnName(columnName);
     var id, identifier;
@@ -730,6 +763,7 @@
     // don't set the entries    
     if (field.form && entries) {
       var required = field.required;
+      // keep the current entries in the valuemap
       for (i = 0; i < entries.length; i++) {
         id = entries[i][OB.Constants.ID] || '';
         identifier = entries[i][OB.Constants.IDENTIFIER] || '';
@@ -744,6 +778,8 @@
       editValues[prop + '._valueMap'] = field.valueMap;
     }
     
+    oldValue = this.getValue(field.name);
+    
     if (columnValue.value && (columnValue.value === 'null' || columnValue.value === '')) {
       // handle the case that the FIC returns a null value as a string
       // should be repaired in the FIC
@@ -789,6 +825,13 @@
       // note: do not use clearvalue as this removes the value from the form
       // which results it to not be sent to the server anymore
       this.setValue(field.name, null);
+      if (this.getValue(field.name + '.' + OB.Constants.IDENTIFIER)) {
+        this.setValue(field.name + '.' + OB.Constants.IDENTIFIER, null);
+      }
+    }
+    
+    if (field.compareValues && !field.compareValues(oldValue, this.getValue(field.name))) {
+      field._changedByFic = true;
     }
     
     // store the textualvalue so that it is correctly send back to the server
@@ -984,6 +1027,15 @@
   },
   
   undo: function(){
+    var i, flds = this.getFields();
+    
+    // also restore the valuemaps
+    for (i = 0; i < flds.length; i++) {
+      if (flds[i]._rememberedValueMap) {
+        flds[i].valueMap = flds[i]._rememberedValueMap;
+      }
+    }
+    
     this.view.messageBar.hide();
     this.resetValues();
     this.setHasChanged(false);
@@ -1014,7 +1066,7 @@
   // there the save call is done through the grid saveEditedValues
   // function
   saveRow: function(){
-    var savingNewRecord = this.isNew;
+    var savingNewRecord = this.isNew, saveFocusItem = this.getFocusItem();
     // store the value of the current focus item
     if (this.getFocusItem() && this.saveFocusItemChanged !== this.getFocusItem()) {
       this.getFocusItem().updateValue();
@@ -1037,7 +1089,7 @@
     this.view.messageBar.hide();
     
     var callback = function(resp, data, req){
-      var index1, index2, errorCode, view = form.view, localRecord;
+      var index1, index2, view = form.view, localRecord;
       var status = resp.status;
 
       // if no recordIndex then select explicitly
@@ -1130,6 +1182,10 @@
 
       form.isSaving = false;
       view.toolBar.updateButtonState(true);
+      if (form.isVisible() && saveFocusItem) {
+        this.setFocusItem(saveFocusItem);
+        saveFocusItem.focusInItem();
+      }
       return false;
     };
     
@@ -1335,7 +1391,17 @@
       return;
     }
     return this.Super('updateFocusItemValue', arguments);
-  } 
+  },
+
+  keyDown: function() {
+    if (isc.EventHandler.getKey() === 'Enter' &&
+      (isc.EventHandler.ctrlKeyDown() && isc.EventHandler.altKeyDown() && !isc.EventHandler.shiftKeyDown()) &&
+      this.getFocusItem && this.getFocusItem().titleClick) {
+      this.getFocusItem().titleClick(this, this.getFocusItem());
+      return false;
+    }
+    return this.Super('keyDown', arguments);
+  }
 
 };
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Wed Jun 15 04:53:52 2011 +0000
@@ -46,13 +46,13 @@
     }
 
     if (event.keyName === 'A' && 
-      (isc.EventHandler.ctrlKeyDown() && !isc.EventHandler.altKeyDown() && !isc.EventHandler.shiftKeyDown())) {
+      (!isc.EventHandler.ctrlKeyDown() && isc.EventHandler.altKeyDown() && isc.EventHandler.shiftKeyDown())) {
       this.selectAllRecords();
       return false;
     }
 
-    if (event.keyName === 'Escape' && 
-      (!isc.EventHandler.ctrlKeyDown() && !isc.EventHandler.altKeyDown() && !isc.EventHandler.shiftKeyDown())) {
+    if (event.keyName === 'N' && 
+      (!isc.EventHandler.ctrlKeyDown() && isc.EventHandler.altKeyDown() && isc.EventHandler.shiftKeyDown())) {
       if (this.getSelectedRecords().length > 1) {
         this.deselectAllRecords();
       }
@@ -62,11 +62,18 @@
   },
 
   focusInFirstFilterEditor: function() {
-    var i;
-    for (i=0; i<this.fields.length; i++) {
-      if (this.fields[i].name !== '_checkboxField' && this.fields[i].name !== '_editLink') {
-        this.focusInFilterEditor(this.fields[i].name);
-        return true;
+    if (this.getFilterEditor()) { // there is a filter editor
+      var object = this.getFilterEditor().getEditForm(),
+        items, item, i;
+
+      // compute a focusable item
+      items = object.getItems();
+      for (i = 0; i < items.length; i++) {
+        item = items[i];
+        if (item.getCanFocus() && !item.isDisabled()) {
+          this.focusInFilterEditor(item);
+          return true;
+        }
       }
     }
     return false;
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Wed Jun 15 04:53:52 2011 +0000
@@ -302,7 +302,7 @@
   },
   
   draw: function() {
-    var drawnBefore = this.isDrawn(), form;
+    var drawnBefore = this.isDrawn(), form, item;
     this.Super('draw', arguments);
     // set the focus in the filter editor
     if (this.view && this.view.isActiveView() && !drawnBefore && this.isVisible() &&
@@ -1285,7 +1285,7 @@
       if ((EH.ctrlKeyDown() && !EH.altKeyDown() && !EH.shiftKeyDown()) || (!EH.ctrlKeyDown() && !EH.altKeyDown() && EH.shiftKeyDown())) {
         // move to multi-select mode, let the standard do it for us
         this.singleRecordSelection = false;
-      } else {
+      } else if (!(!EH.ctrlKeyDown() && EH.altKeyDown() && EH.shiftKeyDown())) {  // 'if' statement to avoid do an action when the KS to move to a child tab is fired
         this.doSelectSingleRecord(record);
       }
     } else if (this.getCheckboxFieldPosition() === fieldNum) {
@@ -1649,7 +1649,7 @@
     }
   },
   
-  saveEdits: function(editCompletionEvent, callback, rowNum, colNum, validateOnly){
+  saveEdits: function(editCompletionEvent, callback, rowNum, colNum, validateOnly, skipValidation){
     var ret = this.Super('saveEdits', arguments);
     // save was not done, because there were no changes probably
     if (!ret) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Wed Jun 15 04:53:52 2011 +0000
@@ -265,6 +265,7 @@
   // handles different ways by which an error can be passed from the 
   // system, translates this to an object with a type, title and message
   setErrorMessageFromResponse: function(resp, data, req){
+    var errorCode;
     // only handle it once
     if (resp._errorMessageHandled) {
       return true;
@@ -326,7 +327,7 @@
       }
     } else if (isLabel) {
       if (gridEditing) {
-        this.setLabelInRow(req.clientContext.editRow, errorCode, params);
+        this.setLabelInRow(req.clientContext.editRow, msg, params);
       } else {
         this.messageBar.setLabel(type, title, msg, params);
       }
@@ -583,29 +584,16 @@
       object = this.lastFocusedItem;
       functionName = 'focusInItem';
     } else if (this.viewGrid && !this.isShowingForm && this.viewGrid.getFilterEditor() && this.viewGrid.getFilterEditor().getEditForm()) {
-      // there is a filter editor
-      object = this.viewGrid.getFilterEditor().getEditForm();
-      
-      // compute a focus item
-      if (!object.getFocusItem()) {
-        items = object.getItems();
-
-        for (i = 0; i < items.length; i++) {
-          item = items[i];
-          if (item.getCanFocus() && !item.isDisabled()) {
-            object.setFocusItem(item);
-            break;
-          }
-        }
-      }
-      
+      this.viewGrid.focusInFirstFilterEditor();
       functionName = 'focus';
     } else if (this.viewGrid) {
       object = this.viewGrid;
       functionName = 'focus';
     }
     
-    isc.Page.setEvent(isc.EH.IDLE, object, isc.Page.FIRE_ONCE, functionName);
+    if (object && functionName) {
+      isc.Page.setEvent(isc.EH.IDLE, object, isc.Page.FIRE_ONCE, functionName);
+    }
   },
   
   setTabButtonState: function(active){
@@ -632,7 +620,11 @@
   },
   
   isActiveView: function() {
-    return this.standardWindow.activeView === this;
+    if (this.standardWindow && this.standardWindow.activeView) {
+      return this.standardWindow.activeView === this;
+    } else {
+      return false;
+    }
   },
     
   setAsActiveView: function(autoSaveDone){
@@ -834,7 +826,11 @@
       this.viewGrid.markForRedraw('showing');
       this.viewGrid.show();
       if (this.isActiveView()) {
-        this.viewGrid.focusInFirstFilterEditor();
+        if (this.viewGrid.getSelectedRecords() && this.viewGrid.getSelectedRecords().length === 1) {
+          this.viewGrid.focus();
+        } else {
+          this.viewGrid.focusInFirstFilterEditor();
+        }
       }
       
       this.viewGrid.setHeight('100%');
@@ -1342,8 +1338,8 @@
       }
     
       var callback = function(ok){
-        var i, data, deleteData, error, recordInfos = [], removeCallBack = function(resp, data, req){
-          var localData = resp.dataObject || resp.data || data, i;
+        var i, doUpdateTotalRows, data, deleteData, error, recordInfos = [], removeCallBack = function(resp, data, req){
+          var localData = resp.dataObject || resp.data || data, i, updateTotalRows;
           if (!localData) {
             // bail out, an error occured which should be displayed to the user now
             return;
@@ -1361,11 +1357,19 @@
             }
             view.messageBar.setMessage(isc.OBMessageBar.TYPE_SUCCESS, null, OB.I18N.getLabel('OBUIAPP_DeleteResult', [deleteCount]));
             if (deleteData) {
+              // note totalrows is used when inserting a new row, to determine after which
+              // record to add a new row
+              updateTotalRows = (view.viewGrid.data.getLength() === view.viewGrid.data.totalRows);
               // deleteData is computed below
               for (i = 0 ; i < deleteData.ids.length; i++) {
                 recordInfos.push({id: deleteData.ids[i]});
               }
               view.viewGrid.data.handleUpdate('remove', recordInfos);
+              if (updateTotalRows) {
+                view.viewGrid.data.totalRows = view.viewGrid.data.getLength();
+              }
+            } else if (doUpdateTotalRows) {
+              view.viewGrid.data.totalRows = view.viewGrid.data.getLength();
             }
             view.viewGrid.updateRowCountDisplay();
             view.refreshChildViews();
@@ -1403,6 +1407,9 @@
               refreshGrid: true
             });
           } else {
+            // note totalrows is used when inserting a new row, to determine after which
+            // record to add a new row
+            doUpdateTotalRows = (view.viewGrid.data.getLength() === view.viewGrid.data.totalRows);
             view.viewGrid.removeData(selection[0], removeCallBack, {});
           }
         }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js	Wed Jun 15 04:53:52 2011 +0000
@@ -32,19 +32,31 @@
   },
 
   runProcess : function() {
-    var theView = this.view;
+    var theView = this.view,
+      record, rowNum;
+
+    if (!theView.isShowingForm && theView.viewGrid.getSelectedRecords().length === 1){
+      // Keep current selection that might be lost in autosave
+      record = theView.viewGrid.getSelectedRecord();
+      rowNum = theView.viewGrid.getRecordIndex(record);
+    }
     
     var actionObject = {
         target: this,
         method: this.doAction,
-        parameters: null
+        parameters: [ rowNum ]
       };
     theView.standardWindow.doActionAfterAutoSave(actionObject);
   },
   
-  doAction: function(){
+  doAction: function(rowNum){
     var theView = this.contextView, param;
 
+    if (rowNum && !theView.viewGrid.getSelectedRecord()) {
+      // Current selection was lost, restore it
+      theView.viewGrid.selectRecord(rowNum);
+    }
+
     var allProperties = theView.getContextInfo(false, true, false, true);
     var sessionProperties = theView.getContextInfo(true, true, false, true);
     var me = this, callbackFunction;
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Wed Jun 15 04:53:52 2011 +0000
@@ -960,14 +960,15 @@
   // Refreshes all the custom buttons in the toolbar based on current record selection
   //
   refreshCustomButtons: function(noSetSession){
-    var selectedRecords, isNewRecord = false;
+    var selectedRecords, multipleSelectedRowIds, allProperties, i;
     function doRefresh(buttons, currentValues, hideAllButtons, me) {
       var i;
+      for (i = 0; i < me.rightMembers.length; i++) { // To disable any button previous defined keyboard shortcut
+        me.rightMembers[i].disableShortcut();
+      }
       for (i = 0; i < buttons.length; i++) {
         if (buttons[i].updateState) {
-          me.defineRightMembersShortcuts();
           buttons[i].updateState(currentValues, hideAllButtons);
-          me.rightMembers[i].enableShortcut();
         }
       }
       for (i = 0; i < me.leftMembers.length; i++) {
@@ -975,6 +976,12 @@
             me.leftMembers[i].updateState();
         }
       }
+      if (me.view.isActiveView()) {
+        me.defineRightMembersShortcuts(); // To re-calculate the target key for keyboard shortcuts
+        for (i = 0; i < me.rightMembers.length; i++) {
+          me.rightMembers[i].enableShortcut(); // To enable each button keyboard shortcut
+        }
+      }
     }
 
     var buttons = this.getRightMembers(), buttonContexts = [], currentContext, buttonsByContext = [];
@@ -1012,32 +1019,25 @@
       };
     };
 
-    var currentTabCalled = false;
+    var currentTabCalled = false, me = this;
     for (iButtonContext = 0; iButtonContext < buttonContexts.length; iButtonContext++) {
       currentContext = buttonContexts[iButtonContext];
 
       selectedRecords = currentContext.viewGrid.getSelectedRecords() || [];
-      for (i = 0; i < selectedRecords.length; i++) {
-        if (selectedRecords[i]._new) {
-          isNewRecord = true;
-          break;
-        }
-      }
       var numOfSelRecords = 0, 
           isNew = currentContext.viewForm.isNew, 
-          hideAllButtons = isNew || selectedRecords.size() === 0 || isNewRecord,
+          hideAllButtons = selectedRecords.size() === 0 && !currentContext.isShowingForm,
           currentValues = currentContext.getCurrentValues();
 
-      var noneOrMultipleRecordsSelected = currentContext.viewGrid.getSelectedRecords().length !== 1;
+      var noneOrMultipleRecordsSelected = currentContext.viewGrid.getSelectedRecords().length !== 1 && !isNew;
       if (currentContext.viewGrid.getSelectedRecords()) {
         numOfSelRecords = currentContext.viewGrid.getSelectedRecords().length;
       }
 
       if (currentValues && !noSetSession && !currentContext.isShowingForm && !isNew && !hideAllButtons) {
-      	if(this.view.tabId===currentContext.tabId){
-      	  currentTabCalled = true;	
-      	}
-        var me = this;
+        if(this.view.tabId===currentContext.tabId){
+          currentTabCalled = true;	
+        }
         // Call FIC to obtain possible session attributes and set them in form
         requestParams = {
           MODE: 'SETSESSION',
@@ -1045,14 +1045,14 @@
           TAB_ID: currentContext.tabId,
           ROW_ID: currentValues.id
         };
-        var multipleSelectedRowIds = [];
+        multipleSelectedRowIds = [];
         if(selectedRecords.size() > 1){
           for (i = 0; i < selectedRecords.size(); i++) {
             multipleSelectedRowIds[i] = selectedRecords[i].id;
           }
           requestParams.MULTIPLE_ROW_IDS = multipleSelectedRowIds;
         }
-        var allProperties = currentContext.getContextInfo(false, true, false, true);
+        allProperties = currentContext.getContextInfo(false, true, false, true);
         OB.RemoteCallManager.call('org.openbravo.client.application.window.FormInitializationComponent', allProperties, requestParams, callbackHandler(currentContext, me));
       } else {
         doRefresh(buttonsByContext[currentContext], currentValues || {}, hideAllButtons || noneOrMultipleRecordsSelected, this);
@@ -1060,15 +1060,15 @@
     }
 
     if(!currentTabCalled && !noSetSession && !this.view.isShowingForm && !this.view.viewForm.isNew && this.view.viewGrid.getSelectedRecords().size() !== 0){
-      var selectedRecords = this.view.viewGrid.getSelectedRecords();
+      selectedRecords = this.view.viewGrid.getSelectedRecords();
       //The call to the FIC for the current tab was not done (probably because it doesn't have buttons, or the buttons do not depend on session vars/aux ins.
       //However, a call still needs to be done, to set the attachments information
       requestParams = {
         MODE: 'SETSESSION',
         PARENT_ID: this.view.getParentId(),
-        TAB_ID: this.view.tabId,
+        TAB_ID: this.view.tabId
       };
-      var multipleSelectedRowIds = [];
+      multipleSelectedRowIds = [];
       if(selectedRecords.size() >= 1){
         for (i = 0; i < selectedRecords.size(); i++) {
           if(i === 0){
@@ -1080,14 +1080,13 @@
           requestParams.MULTIPLE_ROW_IDS = multipleSelectedRowIds;
         }
       }
-      var allProperties = this.view.getContextInfo(false, true, false, true);
-      var me = this;
+      allProperties = this.view.getContextInfo(false, true, false, true);
       OB.RemoteCallManager.call('org.openbravo.client.application.window.FormInitializationComponent', allProperties, requestParams, function(response, data, request){
-    	  var attachmentExists = data.attachmentExists;
-    	  me.view.attachmentExists = attachmentExists;
-    	  //Call to refresh the buttons. As its called with noSetSession=true, it will not cause an infinite recursive loop
-    	  me.updateButtonState(true);
-        }  
+        var attachmentExists = data.attachmentExists;
+        me.view.attachmentExists = attachmentExists;
+        //Call to refresh the buttons. As its called with noSetSession=true, it will not cause an infinite recursive loop
+        me.updateButtonState(true);
+      }  
       );
     }
   },
@@ -1109,17 +1108,23 @@
   rightMembersShortcuts: [],
 
   defineRightMembersShortcuts: function(){
-    var i, j, k, l, id, character, position;
+    var i, j, k, id, character, position;
     function isAssignedCharacter(character, me){
+      var n;
+      if (character === ' ') {
+        return true;
+      }
       character = character.toString();
       character = character.toUpperCase();
-      for (k = 0; k < me.rightMembersShortcuts.length; k++) {
-        if (me.rightMembersShortcuts[k][0] === character) {
+      for (n = 0; n < me.rightMembersShortcuts.length; n++) {
+        if (me.rightMembersShortcuts[n][0] === character) {
           return true;
         }
       }
       return false;
     }
+
+    this.rightMembersShortcuts = [];
     for (i = 0; i < this.rightMembers.length; i++) {
       var title = this.rightMembers[i].realTitle, haveToContinue = true;
       this.rightMembersShortcuts[i] = [];
@@ -1136,9 +1141,9 @@
       }
       if (haveToContinue) { // Check if free number and assign
         haveToContinue = true;
-        for (l = 1; l < 10; l++) {
-          if (!isAssignedCharacter(l, this)) {
-            this.rightMembersShortcuts[i][0] = l;
+        for (k = 1; k < 10; k++) {
+          if (!isAssignedCharacter(k, this)) {
+            this.rightMembersShortcuts[i][0] = k;
             this.rightMembersShortcuts[i][1] = 'end';
             haveToContinue = false;
             break;
@@ -1292,6 +1297,7 @@
         if (!me.disabled && me.visible) {
           me.action();
         }
+        return false; //To avoid keyboard shortcut propagation
       };
       if (this.keyboardShortcutPosition === 'end') {
         newTitle = newTitle + ' (<u>' + this.keyboardShortcutCharacter + '</u>)';
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-keyboard-manager.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-keyboard-manager.js	Wed Jun 15 04:53:52 2011 +0000
@@ -110,6 +110,7 @@
           this.list[position].funcParam = funcParam;
         }
         if (typeof keyComb !== 'undefined' && keyComb !== null) {
+          this.list[position].keyComb.text = '';
           if (typeof keyComb.ctrl === 'undefined') {
             this.list[position].keyComb.ctrl = false;
           } else {
@@ -204,6 +205,9 @@
       getProperty: function(property, element, searchPattern) {
         var i, position = null;
         for (i = 0; i < this.list.length; i++) {
+          if (typeof this.list[i] === 'undefined') {
+            break;
+          }
           if (searchPattern === 'id' && this.list[i].id === element) {
             position = i;
           } else if (searchPattern === 'keyComb' &&
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/sectionItem-bg_Focused_Over_closed_end.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/sectionItem-bg_Focused_Over_closed_start.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/sectionItem-bg_Focused_Over_closed_stretch.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/sectionItem-bg_Focused_Over_opened_end.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/sectionItem-bg_Focused_Over_opened_start.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/sectionItem-bg_Focused_Over_opened_stretch.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/sectionItem-bg_Focused_closed_end.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/sectionItem-bg_Focused_closed_start.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/sectionItem-bg_Focused_closed_stretch.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/sectionItem-bg_Focused_opened_end.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/sectionItem-bg_Focused_opened_start.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/sectionItem-bg_Focused_opened_stretch.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/sectionItem-ico_Focused_closed.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/form/sectionItem-ico_Focused_opened.png has changed
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.css	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.css	Wed Jun 15 04:53:52 2011 +0000
@@ -49,6 +49,11 @@
   color: #333333;
 }
 
+.normal:focus {
+  outline: none;
+  -moz-outline-style: none;
+}
+
 /*============================================================
  Active view
  ============================================================*/
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.js	Wed Jun 15 04:53:52 2011 +0000
@@ -481,6 +481,20 @@
   titleStyle: 'OBSectionItemButton_Title_',
   backgroundColor: 'transparent'
 });
+isc.OBSectionItemButton.addProperties({
+  focusChanged: function() { // "ImgSectionHeader" is not a StatefulCanvas so -Focused- status should be done programmatically
+    if (this.background) {
+      if (this.containsFocus()) {
+        this.background.setSrc(this.background.src.replace(/(\.)(png)$/, '_Focused.png'));
+        this.background.setIcon(this.background.icon.replace(/(\.)(png)$/, '_Focused.png'));
+      } else {
+        this.background.setSrc(this.background.src.replace(/(_Focused)(\.)(png)$/, '.png'));
+        this.background.setIcon(this.background.icon.replace(/(_Focused)(\.)(png)$/, '.png'));
+      }
+    }
+    this.Super("focusChanged", arguments);
+  }
+});
 
 isc.ClassFactory.defineClass('OBSectionItemControlLink', isc.Label);
 isc.OBSectionItemControlLink.addProperties({
@@ -492,6 +506,5 @@
   height: 20,
   wrap: false,
   width: '*'
-
 });
 
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <NAME><![CDATA[HTML Widget]]></NAME>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.12729]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.12774]]></VERSION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL>
@@ -21,7 +21,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--D393BE6F22BB44B7B728259B34FC795A--></AD_MODULE>
 
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <NAME><![CDATA[User Interface Client Kernel]]></NAME>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.12729]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.12774]]></VERSION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL>
@@ -22,7 +22,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <UPDATEINFO><![CDATA[Bug fix for issue 15289]]></UPDATEINFO>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--4B828F4D03264080AA1D2057B13F613C--></AD_MODULE>
 
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.12729]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.12774]]></STARTVERSION>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.12729]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.12774]]></STARTVERSION>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java	Wed Jun 15 04:53:52 2011 +0000
@@ -62,8 +62,8 @@
         value.put("value", "N");
         value.put("classicValue", "N");
       }
-      return getValueInComboReference(field, getValueFromSession, value.has("classicValue") ? value
-          .getString("classicValue") : "");
+      return getValueInComboReference(field, getValueFromSession,
+          value.has("classicValue") ? value.getString("classicValue") : "");
     } catch (JSONException e) {
       throw new OBException("Error while computing combo data", e);
     }
@@ -88,7 +88,7 @@
 
   @Override
   public String getFilterEditorProperties(Field field) {
-    return ", filterOnKeypress: true" + super.getFilterEditorProperties(field);
+    return ", filterOnKeypress: false" + super.getFilterEditorProperties(field);
   }
 
 }
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Wed Jun 15 04:53:52 2011 +0000
@@ -171,9 +171,9 @@
         if (defaultS.equalsIgnoreCase("@#Date@")) {
           return setNOWDefault();
         } else if (!defaultS.startsWith("@SQL=")) {
-          columnValue = Utility.getDefault(new DalConnectionProvider(false), rq
-              .getVariablesSecureApp(), field.getColumn().getDBColumnName(), defaultS, field
-              .getTab().getWindow().getId(), "");
+          columnValue = Utility.getDefault(new DalConnectionProvider(false),
+              rq.getVariablesSecureApp(), field.getColumn().getDBColumnName(), defaultS, field
+                  .getTab().getWindow().getId(), "");
         } else {
           ArrayList<String> params = new ArrayList<String>();
           String sql = parseSQL(defaultS, params);
@@ -317,9 +317,9 @@
    */
   public String getFilterEditorProperties(Field field) {
     if (getFilterEditorType() == null) {
-      return ",canFilter: false, required: false";
+      return ",canFilter: false";
     }
-    return ", canFilter:true, required: false, filterEditorType: '" + getFilterEditorType() + "'"
+    return ", canFilter:true, filterEditorType: '" + getFilterEditorType() + "'"
         + getFilterEditorPropertiesProperty(field);
   }
 
@@ -419,15 +419,15 @@
           "#User_Client", field.getTab().getWindow().getId());
       if (field.getColumn().getDBColumnName().equalsIgnoreCase("AD_CLIENT_ID")) {
         clientList = Utility.getContext(new DalConnectionProvider(false), vars, "#User_Client",
-            field.getTab().getWindow().getId(), Integer.parseInt(field.getTab().getTable()
-                .getDataAccessLevel()));
+            field.getTab().getWindow().getId(),
+            Integer.parseInt(field.getTab().getTable().getDataAccessLevel()));
         clientList = vars.getSessionValue("#User_Client");
         orgList = null;
       }
       if (field.getColumn().getDBColumnName().equalsIgnoreCase("AD_ORG_ID")) {
         orgList = Utility.getContext(new DalConnectionProvider(false), vars, "#User_Org", field
-            .getTab().getWindow().getId(), Integer.parseInt(field.getTab().getTable()
-            .getDataAccessLevel()));
+            .getTab().getWindow().getId(),
+            Integer.parseInt(field.getTab().getTable().getDataAccessLevel()));
       }
       ApplicationDictionaryCachedStructures cachedStructures = WeldUtils
           .getInstanceFromStaticBeanManager(ApplicationDictionaryCachedStructures.class);
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <NAME><![CDATA[Workspace & Widgets]]></NAME>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.12729]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.12774]]></VERSION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <DESCRIPTION><![CDATA[Workspace & Widgets]]></DESCRIPTION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HELP><![CDATA[Provides the infrastructure of workspace tab (formerly My Openbravo)]]></HELP>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <URL><![CDATA[http://forge.openbravo.com/projects/myopenbravo]]></URL>
@@ -22,7 +22,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2758CD25B2704AF6BBAD10365FC82C06--></AD_MODULE>
 
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js	Wed Jun 15 04:53:52 2011 +0000
@@ -246,19 +246,19 @@
       height: '100%',
       sendEvents: false,
 
-      // the PortalColumn is an autochild of the PortalLayout with the
-      // child name of 'portalColumn', the properties of the PortalColumn
+      // the Column is an autochild of the PortalLayout with the
+      // child name of 'column', the properties of the Column
       // can be set like this using the AutoChild concept of SC
-      portalColumnProperties: {
+      columnProperties: {
         membersMargin: 12,
         canAcceptDrop: true,
         dropTypes: ["Portlet"],
 
         // is used to prevent dropping on the left or right 
         // of a widget
-        // the PortalRow is an autochild of PortalColumn, the 
-        // rowProperties are used to set properties of PortalRow
-        portalRowProperties: {
+        // the Row is an autochild of Column, the 
+        // rowProperties are used to set properties of Row
+        rowProperties: {
           isHDrop: function(){
             return false;
           }
@@ -275,7 +275,7 @@
           this.addPortlet(component, position);
         },
 
-        // copied from PortalColumn to set fixed row heights based
+        // copied from Column (portal) to set fixed row heights based
         // on the portlets height, see the NOTE line below
         addPortlet: function(portlet, position){
           var eventType = '';
@@ -308,10 +308,11 @@
           if (userHeight !== null) {
             dynamicProperties.height = userHeight;
           }
-          var portalRow = this.createAutoChild('portalRow', dynamicProperties);
+          var portalRow = this.createAutoChild('row', dynamicProperties);
 
           this.addMember(portalRow, position);
           portalRow.addMember(portlet);
+          portlet.portalRow = portalRow;
           
           if (this.portalLayout.sendEvents && OB.MyOB && !OB.MyOB.isReloading) {
             eventType = portlet.dbInstanceId ? 'WIDGET_MOVED' : 'WIDGET_ADDED';
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <NAME><![CDATA[Query/List Widget]]></NAME>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.12729]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.12774]]></VERSION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <DESCRIPTION><![CDATA[Provides the Query/List superclass widget that allows to create widget classes that prints a grid of data based on a query.]]></DESCRIPTION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HELP><![CDATA[With this module you can define your own widget classes that just with simple Application Dictionary shows a grid of data based on a HQL Query.]]></HELP>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <URL><![CDATA[http://forge.openbravo.com/projects/querylistwidget]]></URL>
@@ -21,7 +21,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC--></AD_MODULE>
 
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D844F3CC0003E-->  <NAME><![CDATA[Widgets Collection]]></NAME>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.12729]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.12774]]></VERSION>
 <!--FF8080812D842086012D844F3CC0003E-->  <DESCRIPTION><![CDATA[Collection of Workspace Widgets]]></DESCRIPTION>
 <!--FF8080812D842086012D844F3CC0003E-->  <HELP><![CDATA[Collection of Workspace Widgets]]></HELP>
 <!--FF8080812D842086012D844F3CC0003E-->  <URL><![CDATA[http://forge.openbravo.com/projects/widgetscollection]]></URL>
@@ -22,7 +22,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080812D842086012D844F3CC0003E-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--FF8080812D842086012D844F3CC0003E-->  <UPDATEINFO><![CDATA[Added Currency Converter. Added Google Docs]]></UPDATEINFO>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080812D842086012D844F3CC0003E--></AD_MODULE>
 
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--FF8080812D842086012D845002070046-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D845002070046-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
 <!--FF8080812D842086012D845002070046-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <NAME><![CDATA[Payment Report]]></NAME>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.12729]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.12774]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
@@ -22,7 +22,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2A5EE903D7974AC298C0504FBC4501A7--></AD_MODULE>
 
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java	Wed Jun 15 04:53:52 2011 +0000
@@ -409,13 +409,17 @@
 
       for (int i = 0; i < data.length; i++) {
         if (FIN_PaymentScheduleDetail[i].getPaymentDetails() != null) {
-          // bp_group -- bp_category
-          FieldProviderFactory.setField(data[i], "BP_GROUP", FIN_PaymentScheduleDetail[i]
-              .getPaymentDetails().getFinPayment().getBusinessPartner()
-              .getBusinessPartnerCategory().getName());
-          // bpartner
-          FieldProviderFactory.setField(data[i], "BPARTNER", FIN_PaymentScheduleDetail[i]
-              .getPaymentDetails().getFinPayment().getBusinessPartner().getName());
+          BusinessPartner bp = getDocumentBusinessPartner(FIN_PaymentScheduleDetail[i]);
+          if (bp == null) {
+            FieldProviderFactory.setField(data[i], "BP_GROUP", "");
+            FieldProviderFactory.setField(data[i], "BPARTNER", "");
+          } else {
+            // bp_group -- bp_category
+            FieldProviderFactory.setField(data[i], "BP_GROUP", bp.getBusinessPartnerCategory()
+                .getName());
+            // bpartner
+            FieldProviderFactory.setField(data[i], "BPARTNER", bp.getName());
+          }
 
           // transCurrency
           transCurrency = FIN_PaymentScheduleDetail[i].getPaymentDetails().getFinPayment()
@@ -821,4 +825,18 @@
       return objectListData;
     }
   }
+
+  private BusinessPartner getDocumentBusinessPartner(FIN_PaymentScheduleDetail psd) {
+    BusinessPartner bp = null;
+    if (psd.getInvoicePaymentSchedule() != null) { // Invoice
+      bp = psd.getInvoicePaymentSchedule().getInvoice().getBusinessPartner();
+    }
+    if (psd.getOrderPaymentSchedule() != null) { // Order
+      bp = psd.getOrderPaymentSchedule().getOrder().getBusinessPartner();
+    }
+    if (bp == null) {
+      bp = psd.getPaymentDetails().getFinPayment().getBusinessPartner();
+    }
+    return bp;
+  }
 }
\ No newline at end of file
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <NAME><![CDATA[Orders Awaiting Delivery]]></NAME>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.12729]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.12774]]></VERSION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <DESCRIPTION><![CDATA[Report displaying sales orders not shipped.]]></DESCRIPTION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <URL><![CDATA[http://forge.openbravo.com/projects/ordersawaitingdlivery]]></URL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <TYPE><![CDATA[M]]></TYPE>
@@ -19,7 +19,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--3A3A943684D64DEF9EC39F588A656848--></AD_MODULE>
 
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <NAME><![CDATA[JSON Datasource]]></NAME>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.12729]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.12774]]></VERSION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <DESCRIPTION><![CDATA[Provides data source CRUD functionality using JSON as the data format]]></DESCRIPTION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HELP><![CDATA[This module implements the datasource concept. Datasources play a central role in Smartclient applications. The datasource module automatically creates a datasource for each Openbravo entity. In addition custom data source implementations can be defined.]]></HELP>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <URL><![CDATA[http://forge.openbravo.com/projects/datasourceservice]]></URL>
@@ -22,7 +22,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4--></AD_MODULE>
 
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.12729]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.12774]]></STARTVERSION>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.12729]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.12774]]></STARTVERSION>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.12729]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.12774]]></STARTVERSION>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <NAME><![CDATA[JSON REST Webservice]]></NAME>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.12729]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.12774]]></VERSION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <DESCRIPTION><![CDATA[Provides a JSON REST webservice for CRUD service requests]]></DESCRIPTION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HELP><![CDATA[Provides a JSON REST webservice for CRUD service requests. Both the servlet implementation (receiving HTTP REST requests in JSON) as the backend processing are provided.]]></HELP>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravojsonrest]]></URL>
@@ -22,7 +22,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1--></AD_MODULE>
 
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_MODULE_ID>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <NAME><![CDATA[User Interface Selector]]></NAME>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.12729]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.12774]]></VERSION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <DESCRIPTION><![CDATA[Provides a selector with a suggestion box and popup grid window]]></DESCRIPTION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HELP><![CDATA[The Openbravo selector provides new selector functionality which is used inside of existing Openbravo forms. The selector is mainly used for supporting foreign key references in the user interface. The selector combines both suggestion box behavior with a popup grid.]]></HELP>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <URL><![CDATA[http://forge.openbravo.com/projects/selector]]></URL>
@@ -22,7 +22,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5--></AD_MODULE>
 
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.12729]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.12774]]></STARTVERSION>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.12729]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.12774]]></STARTVERSION>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js	Wed Jun 15 04:53:52 2011 +0000
@@ -293,6 +293,9 @@
   showPickerIcon: true,
   validateOnChange: true,
   completeOnTab: true,
+  // note validateonexit does not work when completeOnTab is true
+  // setting it anyway, the this.validate() is called in the blur
+  validateOnExit: true,
   
   pickListProperties: {
     fetchDelay: 400,
@@ -319,22 +322,15 @@
     }
     this.Super('updateValue', arguments);
   },
-  
-  // at setvalue set the display value in a valuemap to prevent datasource requests to
-  // get the display value
-  // https://issues.openbravo.com/view.php?id=16611
-  setValue: function(newValue) {
-    if (!this.valueMap) {
-      this.valueMap = {};
+
+  // changed handles the case that the user removes the value using the keyboard
+  // this should do the same things as setting the value through the pickvalue
+  changed: function(form, item, newValue) {
+    // only do the identifier actions when clearing
+    // in all other cases pickValue is called
+    if (!newValue) {
+      this.setValueFromRecord(null);
     }
-    if (this.form && this.form.getValues() && this.form.getValues()[this.name] === newValue &&
-        this.form.getValues()[this.name + '._identifier']) {
-      this.form.setValue(this.name + '._identifier', this.valueMap[newValue]);
-    }
-    if (newValue === '') {
-      this.valueMap[newValue] = '';
-    }
-    this.Super('setValue', arguments);
   },
   
   setPickListWidth: function(){
@@ -393,24 +389,34 @@
   },
   
   setValueFromRecord: function(record, fromPopup){
-    var currentValue = this.getValue();
+    var currentValue = this.getValue(), identifierFieldName = this.name + '.' + OB.Constants.IDENTIFIER;
     if (!record) {
-      this.setValue(null);
+      this.storeValue(null);
       this.form.setValue(this.name + '.' + this.displayField, null);
+      this.form.setValue(identifierFieldName, null);
+      
+      // make sure that the grid does not display the old identifier
+      if (this.form.grid && this.form.grid.getEditForm()) {
+        this.form.grid.setEditValue(this.form.grid.getEditRow(), this.name, null);
+        this.form.grid.setEditValue(this.form.grid.getEditRow(), identifierFieldName, '');
+        this.form.grid.setEditValue(this.form.grid.getEditRow(), this.name + '.' + this.displayField, '');
+      }
     } else {
       this.handleOutFields(record);
       this.storeValue(record[this.valueField]);
       this.form.setValue(this.name + '.' + this.displayField, record[this.displayField]);
+      this.form.setValue(identifierFieldName, record[OB.Constants.IDENTIFIER]);
       if (!this.valueMap) {
         this.valueMap = {};
       }
       this.valueMap[record[this.valueField]] = record[this.displayField];
       this.updateValueMap();
-      
-      if (this.form.focusInNextItem) {
-        this.form.focusInNextItem(this.name);
-      }
     }
+    
+    if (this.form.focusInNextItem) {
+      this.form.focusInNextItem(this.name);
+    }
+
     if (this.form && this.form.handleItemChange) {
       this._hasChanged = true;
       this.form.handleItemChange(this);
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></NAME>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.12729]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.12774]]></VERSION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <DESCRIPTION><![CDATA[Skin module to proper visualization of classic windows inside the MDI interface]]></DESCRIPTION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HELP><![CDATA[With this skin module the classic windows styles will display in a way more coherent with the new 3.00 styles]]></HELP>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <URL><![CDATA[www.openbravo.com]]></URL>
@@ -23,7 +23,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--96998CBC42744B3DBEE28AC8095C9335--></AD_MODULE>
 
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_MODULE_ID>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <NAME><![CDATA[Smartclient]]></NAME>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.12729]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.12774]]></VERSION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <DESCRIPTION><![CDATA[Smartclient libraries for use within Openbravo]]></DESCRIPTION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HELP><![CDATA[This module contains the Smartclient libraries for usage by other modules. It also contains some simple test pages to validate that Smartclient is working correctly. Also contains generic Openbravo Smartclient components]]></HELP>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <URL><![CDATA[http://forge.openbravo.com/projects/obsmartclient]]></URL>
@@ -23,7 +23,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0
 Update to new smartclient 8.0]]></UPDATEINFO>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9--></AD_MODULE>
 
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--DC5D4EF450244482BD2B458DAA496333-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.12729]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.12774]]></STARTVERSION>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js	Wed Jun 15 04:53:52 2011 +0000
@@ -1,6 +1,6 @@
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-06-02 (2011-06-02)
+ * Version SC_SNAPSHOT-2011-06-06 (2011-06-06)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -12,7 +12,7 @@
 var isc = window.isc ? window.isc : {};if(window.isc&&!window.isc.module_Core){isc.module_Core=1;isc._moduleStart=isc._Core_start=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc._moduleEnd&&(!isc.Log||(isc.Log && isc.Log.logIsDebugEnabled('loadTime')))){isc._pTM={ message:'Core load/parse time: ' + (isc._moduleStart-isc._moduleEnd) + 'ms', category:'loadTime'};
 if(isc.Log && isc.Log.logDebug)isc.Log.logDebug(isc._pTM.message,'loadTime')
 else if(isc._preLog)isc._preLog[isc._preLog.length]=isc._pTM
-else isc._preLog=[isc._pTM]}isc.definingFramework=true;var isc=window.isc?window.isc:{};isc.$d=new Date().getTime();isc.version="SC_SNAPSHOT-2011-06-02/LGPL Deployment";isc.versionNumber="SC_SNAPSHOT-2011-06-02";isc.buildDate="2011-06-02";isc.expirationDate="";isc.licenseType="LGPL";isc.licenseCompany="Isomorphic Software";isc.licenseSerialNumber="ISC_LGPL_NIGHTLY";isc.licensingPage="http://smartclient.com/product/";isc.$41r={SCServer:{present:"false",name:"SmartClient Server",serverOnly:true,isPro:true},Drawing:{present:"false",name:"Drawing Module"},PluginBridges:{present:"true",name:"PluginBridges Module"},RichTextEditor:{present:"true",name:"RichTextEditor Module"},Calendar:{present:"true",name:"Calendar Module"},Analytics:{present:"false",name:"Analytics Module"},Tools:{present:"${includeTools}",name:"Portal and Tools Module"},NetworkPerformance:{present:"false",name:"Network Performance Module"},FileLoader:{present:"false",name:"Network Performance Module"},RealtimeMessaging:{present:"false",name:"RealtimeMessaging Module"},serverCriteria:{present:"false",name:"Server Advanced Filtering",serverOnly:true,isFeature:true},customSQL:{present:"false",name:"SQL Templating",serverOnly:true,isFeature:true},chaining:{present:"false",name:"Transaction Chaining",serverOnly:true,isFeature:true},batchDSGenerator:{present:"false",name:"Batch DS-Generator",serverOnly:true,isFeature:true},batchUploader:{present:"false",name:"Batch Uploader",serverOnly:true,isFeature:true},transactions:{present:"false",name:"Automatic Transaction Management",serverOnly:true,isFeature:true}};isc.canonicalizeModules=function(_1){if(!_1)return null;if(isc.isA.String(_1)){if(_1.indexOf(",")!=-1){_1=_1.split(",");var _2=/^\s+/,_3=/\s+$/;for(var i=0;i<_1.length;i++){_1[i]=_1[i].replace(_2,"").replace(_3,"")}}else _1=[_1]}
+else isc._preLog=[isc._pTM]}isc.definingFramework=true;var isc=window.isc?window.isc:{};isc.$d=new Date().getTime();isc.version="SC_SNAPSHOT-2011-06-06/LGPL Deployment";isc.versionNumber="SC_SNAPSHOT-2011-06-06";isc.buildDate="2011-06-06";isc.expirationDate="";isc.licenseType="LGPL";isc.licenseCompany="Isomorphic Software";isc.licenseSerialNumber="ISC_LGPL_NIGHTLY";isc.licensingPage="http://smartclient.com/product/";isc.$41r={SCServer:{present:"false",name:"SmartClient Server",serverOnly:true,isPro:true},Drawing:{present:"false",name:"Drawing Module"},PluginBridges:{present:"true",name:"PluginBridges Module"},RichTextEditor:{present:"true",name:"RichTextEditor Module"},Calendar:{present:"true",name:"Calendar Module"},Analytics:{present:"false",name:"Analytics Module"},Tools:{present:"${includeTools}",name:"Portal and Tools Module"},NetworkPerformance:{present:"false",name:"Network Performance Module"},FileLoader:{present:"false",name:"Network Performance Module"},RealtimeMessaging:{present:"false",name:"RealtimeMessaging Module"},serverCriteria:{present:"false",name:"Server Advanced Filtering",serverOnly:true,isFeature:true},customSQL:{present:"false",name:"SQL Templating",serverOnly:true,isFeature:true},chaining:{present:"false",name:"Transaction Chaining",serverOnly:true,isFeature:true},batchDSGenerator:{present:"false",name:"Batch DS-Generator",serverOnly:true,isFeature:true},batchUploader:{present:"false",name:"Batch Uploader",serverOnly:true,isFeature:true},transactions:{present:"false",name:"Automatic Transaction Management",serverOnly:true,isFeature:true}};isc.canonicalizeModules=function(_1){if(!_1)return null;if(isc.isA.String(_1)){if(_1.indexOf(",")!=-1){_1=_1.split(",");var _2=/^\s+/,_3=/\s+$/;for(var i=0;i<_1.length;i++){_1[i]=_1[i].replace(_2,"").replace(_3,"")}}else _1=[_1]}
 return _1};isc.hasOptionalModules=function(_1){if(!_1)return true;_1=isc.canonicalizeModules(_1);for(var i=0;i<_1.length;i++)if(!isc.hasOptionalModule(_1[i]))return false;return true};isc.getMissingModules=function(_1){var _2=[];_1=isc.canonicalizeModules(_1);for(var i=0;i<_1.length;i++){var _4=_1[i];if(!isc.hasOptionalModule(_4))_2.add(isc.$41r[_4])}
 return _2};isc.hasOptionalModule=function(_1){var v=isc.$41r[_1];if(!v){if(isc.Log)isc.Log.logWarn("isc.hasOptionalModule - unknown module: "+_1);return false}
 return v.present=="true"||v.present.charAt(0)=="$"};isc.getOptionalModule=function(_1){return isc.$41r[_1]};isc.$a=window.isc_useSimpleNames;if(isc.$a==null)isc.$a=true;if(window.OpenAjax){isc.$b=isc.versionNumber.replace(/[a-zA-Z_]+/,".0");OpenAjax.registerLibrary("SmartClient","http://smartclient.com/SmartClient",isc.$b,{namespacedMode:!isc.$a,iscVersion:isc.version,buildDate:isc.buildDate,licenseType:isc.licenseType,licenseCompany:isc.licenseCompany,licenseSerialNumber:isc.licenseSerialNumber});OpenAjax.registerGlobals("SmartClient",["isc"])}
@@ -2088,10 +2088,10 @@
 this.setDrawnState(isc.Canvas.HANDLE_DRAWN)}
 ,isc.A.$q2=function isc_Canvas__createAbsoluteElement(_1){return this.ns.Element.createAbsoluteElement(_1)}
 ,isc.A.$q1=function isc_Canvas__insertAdjacentHTML(_1,_2,_3,_4){return this.ns.Element.insertAdjacentHTML(_1,_2,_3,_4)}
-,isc.A.$qa=function isc_Canvas__completeHTMLInit(){this.modifyContent();if(isc.Browser.isMoz&&isc.Browser.isStrict&&this.containsIFrame())this.$pw();if(isc.screenReader)this.addContentRoles();if(this.manageChildOverflow&&this.children!=null){this.$qx(this.children)}
+,isc.A.$qa=function isc_Canvas__completeHTMLInit(){this.modifyContent();if(isc.Browser.isMoz&&isc.Browser.isStrict&&this.containsIFrame())this.$pw();if(this.manageChildOverflow&&this.children!=null){this.$qx(this.children)}
 this.setUpEvents();if(this.$q4){this.$q5(this.left,this.top,this.width,this.$o8);var _1=this.$q6;if(isc.isAn.Array(_1))this.setClip(_1)}
 this.setDrawnState(isc.Canvas.COMPLETE);this.$q7=false;if(this.parentElement==null)isc.Canvas.$q8(this);if(this.parentElement!=null&&this.parentElement.$qv){this.$qz=true}else{this.adjustOverflow(this.$ny)}
-if(isc.screenReader)this.addPrimaryRole();this.drawPeers()}
+this.drawPeers()}
 ,isc.A.setHtmlElement=function isc_Canvas_setHtmlElement(_1){if(this.htmlElement==_1)return;this.htmlElement=_1;if(!this.htmlPosition)this.htmlPosition="afterBegin";var _2=_1?{position:this.htmlPosition,element:this.htmlElement}:null;this.setDrawContext(_2)}
 ,isc.A.setHtmlPosition=function isc_Canvas_setHtmlPosition(_1){if(_1==null)_1="afterBegin";if(this.htmlPosition==_1)return;this.htmlPosition=_1;if(this.htmlElement==null)return;var _2={position:this.htmlPosition,element:this.htmlElement};this.setDrawContext(_2)}
 ,isc.A.isDirty=function isc_Canvas_isDirty(){return this.$q7==true}
@@ -2109,7 +2109,7 @@
 {this.$q5(null,null,this.width,this.$o8)}
 if(_4){if(_5)this.$p9();this.redrawChildren()}else{this.$rd()}
 if(this.$qe&&!_4){delete this.$re;this.enforceScrollSize(this.$qe[0],this.$qe[1])}
-this.modifyContent();if(isc.screenReader)this.addContentRoles();this.setUpEvents();this.$q7=false;this.adjustOverflow(this.$n0,null,true);this.redrawPeers();if(_1){this.logDebug("Redraw() - Total time to redraw in DOM:"+(isc.timeStamp()-_3),"drawing")}
+this.modifyContent();this.setUpEvents();this.$q7=false;this.adjustOverflow(this.$n0,null,true);this.redrawPeers();if(_1){this.logDebug("Redraw() - Total time to redraw in DOM:"+(isc.timeStamp()-_3),"drawing")}
 return this}
 ,isc.A.$p9=function isc_Canvas__updateParentHTML(){var _1=this.$px(),_2=this.getHandle();while(_2.hasChildNodes()){var _3=_2.firstChild.getAttribute?_2.firstChild.getAttribute(this.$of):null;if(_3&&isc.isA.Canvas(window[_3]))break;_2.removeChild(_2.firstChild)}
 isc.Element.insertAdjacentHTML(_2,this.$n7,_1)}
@@ -2173,20 +2173,20 @@
 var _8=isc.Browser.isMoz;var _9=this.opacity;if(!isc.Browser.isIE){if(_9!=null)_9=_9/ 100}
 if(isc.Browser.isMoz){if(this.smoothFade&&(_9==1||_9==null))_9=0.9999}
 if(this.useClipDiv){var _10=this.getCurrentCursor(),_11,_12=this._useNativeTabIndex;if(_12&&this.$kk()){_11=isc.SB.concat(_2.$ry,this.$qn(),_2.$rz,this.$qo(),!this.isDisabled()?_2.$r0+this.getTabIndex():null,(!this.$qc()&&this.accessKey!=null)?_2.$r1+this.accessKey:null)}
-var _13=isc.StringBuffer.concat("<div id='",this.$rv(),"' eventProxy=",_4,(this.className?" class='"+this.className+"'":""),_11," style='","POSITION:",this.position,";LEFT:",this.left,"px;TOP:",this.top,"px;WIDTH:",_6,"px;HEIGHT:",_7,"px;Z-INDEX:",this.zIndex,(this.visibility==_2.INHERIT?"":";VISIBILITY:"+this.visibility),(this.backgroundColor==null?"":";BACKGROUND-COLOR:"+this.backgroundColor),(this.backgroundImage==null?"":";BACKGROUND-IMAGE:url("+this.getImgURL(this.backgroundImage)+")"+";BACKGROUND-REPEAT:"+this.backgroundRepeat+(this.backgroundPosition?";BACKGROUND-POSITION:"+this.backgroundPosition:"")),(this.border?";BORDER:"+this.border:""),(this.padding!=null||this.$415?";PADDING:0px":""),this.$r2(),(_9!=null?(this.$65q?";-moz-opacity:":";opacity:")+_9:""),(_8?";-moz-box-sizing:border-box":null),(_8&&_12&&this.mozOutlineOffset!=null?";-moz-outline-offset:"+this.mozOutlineOffset:null),(_8&&_12&&this.mozOutlineColor!=null?";-moz-outline-color:"+this.mozOutlineColor:null),(_8&&_12&&!this.showFocusOutline?";-moz-outline-style:none":null),this.getTransformCSS(),(isc.Browser.isTouch?(!this.canSelectText?";-webkit-user-select:none":";-webkit-user-select:text"):null),";OVERFLOW:",_3,";' ONSCROLL='return "+_4+".$lh()'>","<div id='",this.getCanvasName(),"' eventProxy='",_4,(this.textDirection!=null?"' dir='"+this.textDirection:""),"' style='POSITION:relative;VISIBILITY:inherit",";Z-INDEX:",this.zIndex,(_10==_2.AUTO?"":";CURSOR:"+_10),(this.padding!=null?";PADDING:"+this.padding+"px":""),(this.topPadding!=null?";padding-top:"+this.topPadding+"px":""),(this.bottomPadding!=null?";padding-bottom:"+this.bottomPadding+"px":""),(this.leftPadding!=null?";padding-left:"+this.leftPadding+"px":""),(this.rightPadding!=null?";padding-right:"+this.rightPadding+"px":""),";'>")}else{if(!_2.$r4){_2.$r5=" style='POSITION:absolute;LEFT:";_2.$r6=" style='POSITION:relative;LEFT:";_2.$bd=" class='";_2.$416="'";_2.$r7=";VISIBILITY:";_2.$r8=";CURSOR:";var _14=_2.$r4=[];_14[0]="<div id=";_14[2]=" eventProxy=";_14[15]="px;TOP:";_14[22]="px;WIDTH:";_14[28]="px;HEIGHT:";_14[34]="px;Z-INDEX:";_14[44]=";OVERFLOW:";_14[59]="' ONSCROLL='return ";_14[61]=".$lh()' "}
-var _14=_2.$r4;_14[1]=this.getCanvasName();_14[3]=_4;if(this.className!=null){_14[4]=_2.$bd;_14[5]=this.className;_14[6]=_2.$416}else{_14[4]=_14[5]=_14[6]=null}
-_14[7]=(this.textDirection!=null?" dir="+this.textDirection:null);_14[8]=(this.position==_2.RELATIVE?_2.$r6:_2.$r5);isc.$bk(_14,this.left,9,6);isc.$bk(_14,this.top,16,6);isc.$bk(_14,_6,23,5);isc.$bk(_14,_7,29,5);if(this.zIndex!=_2.AUTO)isc.$bk(_14,this.zIndex,35,9);else{_14[35]=this.zIndex;_14[36]=_14[37]=_14[38]=_14[39]=_14[40]=_14[41]=_14[42]=_14[43]=null}
-_14[45]=_3;if(this.visibility!=_2.INHERIT){_14[46]=_2.$r7;_14[47]=this.visibility}else{_14[46]=_14[47]=null}
-_14[48]=(this.backgroundColor==null?null:";BACKGROUND-COLOR:"+this.backgroundColor);_14[49]=(this.backgroundImage==null?null:";BACKGROUND-IMAGE:url("+this.getImgURL(this.backgroundImage)+");BACKGROUND-REPEAT:"+this.backgroundRepeat+(this.backgroundPosition?";BACKGROUND-POSITION:"+this.backgroundPosition:""));_14[50]=(_8?";-moz-box-sizing:border-box":null);var _10=this.getCurrentCursor();if(_10==_2.AUTO){_14[51]=_14[52]=null}else{_14[51]=_2.$r8;_14[52]=_10}
-_14[53]=this.$r2();_14[54]=(this.padding!=null?";PADDING:"+this.padding+isc.px:null);if(this.topPadding!=null)
-_14[54]=(_14[54]||"")+";padding-top:"+this.topPadding+"px";if(this.bottomPadding!=null)
-_14[54]=(_14[54]||"")+";padding-bottom:"+this.bottomPadding+"px";if(this.leftPadding!=null)
-_14[54]=(_14[54]||"")+";padding-left:"+this.leftPadding+"px";if(this.rightPadding!=null)
-_14[54]=(_14[54]||"")+";padding-right:"+this.rightPadding+"px";_14[55]=(this.border?";BORDER:"+this.border:null);if(isc.Browser.isIE){if(!isc.Canvas.neverUseFilters||this.useOpacityFilter){_14[56]=(_9==null?null:";filter:progid:DXImageTransform.Microsoft.Alpha(opacity="+_9+")")}else{_14[56]=null}
-if(!isc.Canvas.neverUseFilters){if(this.$r9){_14[57]=";filter:progid:DXImageTransform.Microsoft.iris(irisStyle=circle)"}else{_14[57]=null}}else{_14[57]=null}}else{if(_9!=null){_14[56]=(this.$65q?";-moz-opacity:":";opacity:")+_9}else{_14[56]=null}}
-_14[58]=this.getTransformCSS();_14[60]=_4;var _15=64;if(this.$kk()&&this._useNativeTabIndex){_14[64]=_2.$ry;_14[65]=this.$qn();_14[66]=_2.$rz;_14[67]=this.$qo();if(!this.isDisabled()){_14[68]=_2.$r0;isc.$bk(_14,this.getTabIndex(),69,5);if(this.accessKey!=null){_14[74]=_2.$r1;_14[75]=this.accessKey;_15=76}else _15=74;if(!this.showFocusOutline){if(!_2.$sa)_2.$sa=" hideFocus=true";_14[_15]=_2.$sa;_15+=1}}else _15=68}
-_14.length=_15;_14[_15]=this.$oa;if(_1)return _14;return _14.join(isc.emptyString)}
-return _13}
+var _13=isc.Browser.isMoz&&isc.Browser.geckoVersion>=20080529;var _14=isc.StringBuffer.concat("<div id='",this.$rv(),"' eventProxy=",_4,(_13&&this.ariaRole?" role='"+this.ariaRole+"'":""),(_13&&this.ariaState?this.getAriaStateAttributes():""),(this.className?" class='"+this.className+"'":""),_11," style='","POSITION:",this.position,";LEFT:",this.left,"px;TOP:",this.top,"px;WIDTH:",_6,"px;HEIGHT:",_7,"px;Z-INDEX:",this.zIndex,(this.visibility==_2.INHERIT?"":";VISIBILITY:"+this.visibility),(this.backgroundColor==null?"":";BACKGROUND-COLOR:"+this.backgroundColor),(this.backgroundImage==null?"":";BACKGROUND-IMAGE:url("+this.getImgURL(this.backgroundImage)+")"+";BACKGROUND-REPEAT:"+this.backgroundRepeat+(this.backgroundPosition?";BACKGROUND-POSITION:"+this.backgroundPosition:"")),(this.border?";BORDER:"+this.border:""),(this.padding!=null||this.$415?";PADDING:0px":""),this.$r2(),(_9!=null?(this.$65q?";-moz-opacity:":";opacity:")+_9:""),(_8?";-moz-box-sizing:border-box":null),(_8&&_12&&this.mozOutlineOffset!=null?";-moz-outline-offset:"+this.mozOutlineOffset:null),(_8&&_12&&this.mozOutlineColor!=null?";-moz-outline-color:"+this.mozOutlineColor:null),(_8&&_12&&!this.showFocusOutline?";-moz-outline-style:none":null),this.getTransformCSS(),(isc.Browser.isTouch?(!this.canSelectText?";-webkit-user-select:none":";-webkit-user-select:text"):null),";OVERFLOW:",_3,";' ONSCROLL='return "+_4+".$lh()'>","<div id='",this.getCanvasName(),"' eventProxy='",_4,(this.textDirection!=null?"' dir='"+this.textDirection:""),"' style='POSITION:relative;VISIBILITY:inherit",";Z-INDEX:",this.zIndex,(_10==_2.AUTO?"":";CURSOR:"+_10),(this.padding!=null?";PADDING:"+this.padding+"px":""),(this.topPadding!=null?";padding-top:"+this.topPadding+"px":""),(this.bottomPadding!=null?";padding-bottom:"+this.bottomPadding+"px":""),(this.leftPadding!=null?";padding-left:"+this.leftPadding+"px":""),(this.rightPadding!=null?";padding-right:"+this.rightPadding+"px":""),";'>")}else{if(!_2.$r4){_2.$r5=" style='POSITION:absolute;LEFT:";_2.$r6=" style='POSITION:relative;LEFT:";_2.$bd=" class='";_2.$416="'";_2.$r7=";VISIBILITY:";_2.$r8=";CURSOR:";var _15=_2.$r4=[];_15[0]="<div id=";_15[2]=" eventProxy=";_15[15]="px;TOP:";_15[22]="px;WIDTH:";_15[28]="px;HEIGHT:";_15[34]="px;Z-INDEX:";_15[44]=";OVERFLOW:";_15[59]="' ONSCROLL='return ";_15[61]=".$lh()' "}
+var _15=_2.$r4;_15[1]=this.getCanvasName();_15[3]=_4;if(this.className!=null){_15[4]=_2.$bd;_15[5]=this.className;_15[6]=_2.$416}else{_15[4]=_15[5]=_15[6]=null}
+_15[7]=(this.textDirection!=null?" dir="+this.textDirection:null);_15[8]=(this.position==_2.RELATIVE?_2.$r6:_2.$r5);isc.$bk(_15,this.left,9,6);isc.$bk(_15,this.top,16,6);isc.$bk(_15,_6,23,5);isc.$bk(_15,_7,29,5);if(this.zIndex!=_2.AUTO)isc.$bk(_15,this.zIndex,35,9);else{_15[35]=this.zIndex;_15[36]=_15[37]=_15[38]=_15[39]=_15[40]=_15[41]=_15[42]=_15[43]=null}
+_15[45]=_3;if(this.visibility!=_2.INHERIT){_15[46]=_2.$r7;_15[47]=this.visibility}else{_15[46]=_15[47]=null}
+_15[48]=(this.backgroundColor==null?null:";BACKGROUND-COLOR:"+this.backgroundColor);_15[49]=(this.backgroundImage==null?null:";BACKGROUND-IMAGE:url("+this.getImgURL(this.backgroundImage)+");BACKGROUND-REPEAT:"+this.backgroundRepeat+(this.backgroundPosition?";BACKGROUND-POSITION:"+this.backgroundPosition:""));_15[50]=(_8?";-moz-box-sizing:border-box":null);var _10=this.getCurrentCursor();if(_10==_2.AUTO){_15[51]=_15[52]=null}else{_15[51]=_2.$r8;_15[52]=_10}
+_15[53]=this.$r2();_15[54]=(this.padding!=null?";PADDING:"+this.padding+isc.px:null);if(this.topPadding!=null)
+_15[54]=(_15[54]||"")+";padding-top:"+this.topPadding+"px";if(this.bottomPadding!=null)
+_15[54]=(_15[54]||"")+";padding-bottom:"+this.bottomPadding+"px";if(this.leftPadding!=null)
+_15[54]=(_15[54]||"")+";padding-left:"+this.leftPadding+"px";if(this.rightPadding!=null)
+_15[54]=(_15[54]||"")+";padding-right:"+this.rightPadding+"px";_15[55]=(this.border?";BORDER:"+this.border:null);if(isc.Browser.isIE){if(!isc.Canvas.neverUseFilters||this.useOpacityFilter){_15[56]=(_9==null?null:";filter:progid:DXImageTransform.Microsoft.Alpha(opacity="+_9+")")}else{_15[56]=null}
+if(!isc.Canvas.neverUseFilters){if(this.$r9){_15[57]=";filter:progid:DXImageTransform.Microsoft.iris(irisStyle=circle)"}else{_15[57]=null}}else{_15[57]=null}}else{if(_9!=null){_15[56]=(this.$65q?";-moz-opacity:":";opacity:")+_9}else{_15[56]=null}}
+_15[58]=this.getTransformCSS();_15[60]=_4;var _16=64;if(this.$kk()&&this._useNativeTabIndex){_15[64]=_2.$ry;_15[65]=this.$qn();_15[66]=_2.$rz;_15[67]=this.$qo();if(!this.isDisabled()){_15[68]=_2.$r0;isc.$bk(_15,this.getTabIndex(),69,5);if(this.accessKey!=null){_15[74]=_2.$r1;_15[75]=this.accessKey;_16=76}else _16=74;if(!this.showFocusOutline){if(!_2.$sa)_2.$sa=" hideFocus=true";_15[_16]=_2.$sa;_16+=1}}else _16=68}
+_15.length=_16;_15[_16]=this.$oa;if(_1)return _15;return _15.join(isc.emptyString)}
+return _14}
 ,isc.A.$r2=function isc_Canvas__getMarginHTML(){if(!this.$sb()&&this.$sc==null){if(this.margin==null)return null;return isc.SB.concat(isc.semi,this.$om,this.margin,isc.px)}
 var _1=this.$sd(),_2=isc.SB.concat(isc.semi,this.$oi,_1.left,isc.px,isc.semi,this.$oj,_1.right,isc.px,isc.semi,this.$ok,_1.top,isc.px,isc.semi,this.$ol,_1.bottom,isc.px);return _2}
 ,isc.A.getTagEnd=function isc_Canvas_getTagEnd(){if(this.useClipDiv)return this.$oo;return this.$on}
@@ -2938,7 +2938,7 @@
 return true}
 ,isc.A.getFocusHandle=function isc_Canvas_getFocusHandle(){if(this._useNativeTabIndex){return this.getClipHandle()}else if(this.$kn&&this.$qj){return this.$sl()}
 return null}
-,isc.A.setFocus=function isc_Canvas_setFocus(_1,_2){if(!this.$vl(_1))return;var _3=this.getFocusHandle();if(_1&&this.$kk()){if(_3!=null){this.logInfo("about to call native focus()"+(this.logIsDebugEnabled("traceFocus")?this.getStackTrace():""),"nativeFocus");isc.EH.$lg=this;_3.focus();isc.EH.$vm=this}else{this.ns.EH.focusInCanvas(this)}}else if(this.hasFocus){if(_3){this.logInfo("about to call native blur()"+(this.logIsDebugEnabled("traceBlur")?this.getStackTrace():""),"nativeFocus");isc.EH.$ld=this;_3.blur()}else{this.ns.EH.blurFocusCanvas(this)}}}
+,isc.A.setFocus=function isc_Canvas_setFocus(_1,_2){if(!this.$vl(_1))return;var _3=this.getFocusHandle(_1);if(_1&&this.$kk()){if(_3!=null){this.logInfo("about to call native focus()"+(this.logIsDebugEnabled("traceFocus")?this.getStackTrace():""),"nativeFocus");isc.EH.$lg=this;_3.focus();isc.EH.$vm=this}else{this.ns.EH.focusInCanvas(this)}}else if(this.hasFocus){if(_3){this.logInfo("about to call native blur()"+(this.logIsDebugEnabled("traceBlur")?this.getStackTrace():""),"nativeFocus");isc.EH.$ld=this;_3.blur()}else{this.ns.EH.blurFocusCanvas(this)}}}
 ,isc.A.$vn=function isc_Canvas__restoreFocus(){var _1=isc.EH.$ke;if(_1!=null&&_1!=this){this.logDebug("not restoring focus; focus moved to: "+_1,"nativeFocus");return}
 var _2=isc.EH.$lg;if(_2!=null&&_2!=this){this.logDebug("not restoring focus; focus about to move to:"+_2,"nativeFocus");return}
 this.logDebug("restoring focus from zIndex change","nativeFocus");this.$vo(true)}
@@ -3220,7 +3220,7 @@
 _3[7]=_1||this.$w0;_3[9]=_2||this.$w0;return _3.join(isc.$ad)}
 ,isc.A.spacerHTML=function isc_c_Canvas_spacerHTML(_1,_2,_3){if(_1==0&&_2==0)return isc.$ad;if(isc.Browser.isMoz||isc.Browser.isSafari||isc.Browser.isOpera||isc.Browser.isStrict||(_2<3&&isc.Browser.isIE&&(isc.Browser.minorVersion==5.5||isc.Browser.isMac)))
 {var _4;if(isc.Browser.isSafari){_4=32000}else if(isc.Browser.isFirefox&&isc.Browser.geckoVersion>=20090219){_4=17895580}else if(isc.Browser.isIE&&isc.Browser.isStrict){_4=16000}
-if(_4!=null&&(_1>_4||_2>_4)){var _5=isc.SB.create(),_6=_4,_7=Math.floor(_2/ _6),_8=Math.floor(_1/ _6);_5.append("<TABLE CELLPADDING=0 CELLSPACING=0 BORDER=0 MARGIN=0>");for(var i=0;i<=_7;i++){_5.append("<TR>");for(var j=0;j<=_8;j++){_5.append("<TD>");var _11=((i==j)||(i>_8&&j==0)||(j>_7&&i==0));if(_11){var _12=(i<_7?_6:_2-(i*_6)),_13=(j<_8?_6:_1-(j*_6));_5.append(this.blankImgHTML(_13,_12))}
+if(_4!=null&&(_1>_4||_2>_4)){var _5=isc.SB.create(),_6=_4,_7=Math.floor(_2/ _6),_8=Math.floor(_1/ _6);_5.append("<TABLE role='presentation' CELLPADDING=0 CELLSPACING=0 BORDER=0 MARGIN=0>");for(var i=0;i<=_7;i++){_5.append("<TR>");for(var j=0;j<=_8;j++){_5.append("<TD>");var _11=((i==j)||(i>_8&&j==0)||(j>_7&&i==0));if(_11){var _12=(i<_7?_6:_2-(i*_6)),_13=(j<_8?_6:_1-(j*_6));_5.append(this.blankImgHTML(_13,_12))}
 _5.append("</TD>")}
 _5.append("</TR>")}
 _5.append("</TABLE>");return _5.toString()}
@@ -3487,7 +3487,7 @@
 ,isc.A.$wp=function isc_Canvas__performDSOperation(_1,_2,_3,_4){if(isc.$cv)arguments.$cw=this;if(_4==null&&isc.isAn.Object(_3)&&_3.methodName==null)
 {_4=_3;_3=null}
 if(this.saveLocally||this.getDataSource()==null){if(_1=="update"){var _5=this.getDataSource();if(!_5){isc.logWarn("Update by primary key cannot be performed without a DataSource."+"Modify the record directly instead");return}
-var _6=this.data.get(_5.findByKeys(_2,this.data));isc.addProperties(_6,_2);return this.data.dataChanged()}else if(_1=="add"){if(this.originalData){this.originalData.add(_2);this.dataChanged("add",null,null,_2)}else{this.data.add(_2)}
+var _6=this.data.get(_5.findByKeys(_2,this.data));isc.addProperties(_6,_2);return this.data.dataChanged()}else if(_1=="add"){if(this.originalData){this.originalData.add(_2);this.dataChanged("add",null,null,_2)}else{if(isc.isA.Tree(this.data)){var _7=this.data.getParent(_2)||this.data.getRoot();this.data.add(_2,_7)}else{this.data.add(_2)}}
 return}}
 _4=this.buildRequest(_4,_1);return this.getDataSource().performDSOperation(_1,_2,_3,_4)}
 ,isc.A.removeSelectedData=function isc_Canvas_removeSelectedData(_1,_2){if(_2==null&&isc.isAn.Object(_1)&&_1.methodName==null)
@@ -3562,7 +3562,7 @@
 ,isc.A.applyHiliteHTML=function isc_Canvas_applyHiliteHTML(_1,_2){if(!this.hilites)return _2;var _3,_4,_5;if(!isc.isAn.Array(_1)){this.$579[0]=_1;_1=this.$579}
 for(var i=0;i<_1.length;i++){_5=_1[i];_3=this.getHilite(_5);if(_3!=null){if(_3.htmlValue!=null)_2=_3.htmlValue;if(!_3.disabled){_4=_3.htmlBefore;if(_4!=null&&_4.length>0){_2=_4+_2}
 _4=_3.htmlAfter;if(_4!=null&&_4.length>0){_2=_2+_4}
-var _7=_3.htmlOpposite,_8=_3.styleOpposite||this.styleOpposite;if(_7){if(!isc.Browser.isIE){_2="<nobr><div class='"+_8+"' style='float:left'>&nbsp;"+_7+"&nbsp;</div>"+_2+"</nobr>"}else{_2="<nobr><table align=left><tr><td class='"+_8+"'>"+_7+"</td></tr></table>"+_2+"</nobr>"}}}}}
+var _7=_3.htmlOpposite,_8=_3.styleOpposite||this.styleOpposite;if(_7){if(!isc.Browser.isIE){_2="<nobr><div class='"+_8+"' style='float:left'>&nbsp;"+_7+"&nbsp;</div>"+_2+"</nobr>"}else{_2="<nobr><table role='presentation' align=left><tr><td class='"+_8+"'>"+_7+"</td></tr></table>"+_2+"</nobr>"}}}}}
 return _2}
 ,isc.A.enableHilite=function isc_Canvas_enableHilite(_1,_2){if(_2==null)_2=true;var _3=this.getHilite(_1);if(_3==null)return;_3.disabled=!_2;this.redrawHilites()}
 ,isc.A.disableHilite=function isc_Canvas_disableHilite(_1){this.enableHilite(_1,false)}
@@ -3594,10 +3594,10 @@
 ,isc.A.$61d=function isc_Canvas__addIfNotDuplicate(_1,_2,_3,_4,_5,_6){var _7=this.getDataSource(),_8,_9=this,_10={};if(this.addOperation){isc.addProperties(_10,{operationId:this.addOperation})}
 if(_7)_8=_7.getPrimaryKeyFields();if(_7){var _11;if(_8&&isc.firstKey(_8)!=null){for(var _12 in _8){if(_8[_12].type=="sequence"){_11=true;break}}}
 if(_11){var _13;for(var _12 in _8){_1[_12]=_13}
-if(!_3.$67v)_3.$67v=0;_3.$67v++;_7.addData(_1,function(_15,_16,_17){_3.$67w(_15,_16,_17)},_10);return true}}
-if(!this.preventDuplicates){if(_7){if(!_3.$67v)_3.$67v=0;_3.$67v++;_7.addData(_1,function(_15,_16,_17){_3.$67w(_15,_16,_17)},_10)}else{if(isc.Tree&&isc.isA.Tree(this.data)){this.data.add(_1,_6,_5)}else{if(_5!=null)this.data.addAt(_1,_5);else this.data.add(_1)}}
-return true}
-if(this.$61e(_1,_2,_4)){if(this.duplicateDragMessage!=null)isc.warn(this.duplicateDragMessage);isc.Log.logDebug("Found client-side duplicate, adding '"+_1[isc.firstKey(_1)]+"' to exception list","dragDrop");this.$67n.add(this.getCleanRecordData(_1));return false}else{if(!_7){if(isc.Tree&&isc.isA.Tree(this.data)){this.data.add(_1,_6,_5);return true}else{if(_5!=null)this.data.addAt(_1,_5);else this.data.add(_1);return true}}else{if(!isc.ResultSet||!isc.isA.ResultSet(this.data)){if(!_3.$67v)_3.$67v=0;_3.$67v++;_7.addData(_1,function(_15,_16,_17){_3.$67w(_15,_16,_17)},_10);return true}else{if(this.data.allRowsCached()||(_4&&isc.firstKey(_4)&&this.data.allMatchingRowsCached())){if(!_3.$67v)_3.$67v=0;_3.$67v++;_7.addData(_1,function(_15,_16,_17){_3.$67w(_15,_16,_17)},_10);return true}
+if(!_3.$67v)_3.$67v=0;_3.$67v++;this.addData(_1,function(_15,_16,_17){_3.$67w(_15,_16,_17)});return true}}
+if(!this.preventDuplicates){if(_7){if(!_3.$67v)_3.$67v=0;_3.$67v++;this.addData(_1,function(_15,_16,_17){_3.$67w(_15,_16,_17)},_10)}else{if(isc.Tree&&isc.isA.Tree(this.data)){this.data.add(_1,_6,_5)}else{if(_5!=null)this.data.addAt(_1,_5);else this.data.add(_1)}}
+return true}
+if(this.$61e(_1,_2,_4)){if(this.duplicateDragMessage!=null)isc.warn(this.duplicateDragMessage);isc.Log.logDebug("Found client-side duplicate, adding '"+_1[isc.firstKey(_1)]+"' to exception list","dragDrop");this.$67n.add(this.getCleanRecordData(_1));return false}else{if(!_7){if(isc.Tree&&isc.isA.Tree(this.data)){this.data.add(_1,_6,_5);return true}else{if(_5!=null)this.data.addAt(_1,_5);else this.data.add(_1);return true}}else{if(!isc.ResultSet||!isc.isA.ResultSet(this.data)){if(!_3.$67v)_3.$67v=0;_3.$67v++;this.addData(_1,function(_15,_16,_17){_3.$67w(_15,_16,_17)},_10);return true}else{if(this.data.allRowsCached()||(_4&&isc.firstKey(_4)&&this.data.allMatchingRowsCached())){if(!_3.$67v)_3.$67v=0;_3.$67v++;this.addData(_1,function(_15,_16,_17){_3.$67w(_15,_16,_17)},_10);return true}
 if(_7&&_2==_7){if(_8&&isc.firstKey(_8)!=null){var _14=isc.applyMask(_1,_8)}else{_14=this.getCleanRecordData(_1)}}else if(_4&&isc.firstKey(_4)){_14=isc.addProperties({},this.data.getCriteria());isc.addProperties(_14,_4)}else if(_7&&_8&&isc.firstKey(_8)!=null){_14=isc.applyMask(_1,_8)}else{_14=this.getCleanRecordData(_1)}
 isc.Log.logDebug("Incrementing dup query count: was "+_9.$67l,"dragDrop");this.$67l++;_7.fetchData(_14,function(_15,_16,_17){if(_16&&_16.length>0){if(_9.duplicateDragMessage!=null)isc.warn(_9.duplicateDragMessage);isc.Log.logDebug("Found server-side duplicate, adding '"+_1[isc.firstKey(_1)]+"' to exception list","dragDrop");_9.$67n.add(_9.getCleanRecordData(_1))}else{if(!_3.$67v)_3.$67v=0;_3.$67v++;_7.addData(_1,function(_15,_16,_17){_3.$67w(_15,_16,_17)},_10)}
 isc.Log.logDebug("Decrementing dup query count: was "+_9.$67l,"dragDrop");if(--_9.$67l==0&&!_9.$67m){if(_3.dragDataAction==isc.Canvas.MOVE){isc.Log.logDebug("Invoking transferDragData from inside callback","dragDrop");_3.transferDragData(_9.$67n,_9);delete _9.$67n;if(!_9.$67o)isc.rpc.sendQueue()}}},{sendNoQueue:true})}}}}
@@ -3790,9 +3790,9 @@
 if(this.isObserving(this.selectionComponent,"cellSelectionChanged")){this.ignore(this.selectionComponent,"cellSelectionChanged")}}
 this.selectionComponent=_1;if(!this.selectionComponent.useCellRecords){this.observe(this.selectionComponent,"selectionChanged","observer.selectionComponentSelectionChanged(observed, record,state)")}else{this.observe(this.selectionComponent,"cellSelectionChanged","observer.selectionComponentCellSelectionChanged(observed, cellList)")}
 var _4=this.selectionComponent.getSelection}}
-,isc.A.selectionComponentSelectionChanged=function isc_Canvas_selectionComponentSelectionChanged(_1,_2,_3){if(!_3){if(this.dataArity=="single"){_2=null}else{return}}
+);isc.evalBoundary;isc.B.push(isc.A.selectionComponentSelectionChanged=function isc_Canvas_selectionComponentSelectionChanged(_1,_2,_3){if(!_3){if(this.dataArity=="single"){_2=null}else{return}}
 if(this.dataArity=="single"){this.setData(_2)}else{var _4=this.dataPath.split("/");this.setData(_2[_4[_4.length-1]]);if(this.dataArity=="multiple"&&isc.isA.Function(this.deselectAllRecords)){this.deselectAllRecords()}}}
-);isc.evalBoundary;isc.B.push(isc.A.selectionComponentCellSelectionChanged=function isc_Canvas_selectionComponentCellSelectionChanged(_1,_2){for(var i=0;i<_2.length;i++){var _4=_2[i],_5=this.selectionComponent.getCellRecord(_4[0],_4[1]);if(_1.cellIsSelected(_5))break;_5=null}
+,isc.A.selectionComponentCellSelectionChanged=function isc_Canvas_selectionComponentCellSelectionChanged(_1,_2){for(var i=0;i<_2.length;i++){var _4=_2[i],_5=this.selectionComponent.getCellRecord(_4[0],_4[1]);if(_1.cellIsSelected(_5))break;_5=null}
 if(_5){this.$71d=_1.getPrimaryKeys(_5);this.editRecord(_5)}}
 );isc.B._maxIndex=isc.C+179;isc.ClassFactory.defineClass("MathFunction","Class");isc.A=isc.MathFunction;isc.A.$65z={};isc.A=isc.MathFunction;isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.registerFunction=function isc_c_MathFunction_registerFunction(_1){if(!this.$65z[_1.name]){this.$65z[_1.name]=_1}}
 ,isc.A.getRegisteredFunctionNames=function isc_c_MathFunction_getRegisteredFunctionNames(){return isc.getKeys(this.$65z)}
@@ -4128,7 +4128,7 @@
 isc._moduleEnd=isc._Core_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('Core module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'Core'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-06-02 (2011-06-02)
+ * Version SC_SNAPSHOT-2011-06-06 (2011-06-06)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -4139,7 +4139,7 @@
 
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-06-02 (2011-06-02)
+ * Version SC_SNAPSHOT-2011-06-06 (2011-06-06)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -4355,7 +4355,7 @@
 ,isc.A.getCustomState=function isc_StatefulCanvas_getCustomState(){return this.customState}
 ,isc.A.getPrintStyleName=function isc_StatefulCanvas_getPrintStyleName(){return this.printStyleName||this.getStateName()}
 ,isc.A.makeLabel=function isc_StatefulCanvas_makeLabel(){var _1=this.getAutoChildClass(this.$11,null,isc.Label);var _2=this.label=_1.createRaw();_2.align=this.align;_2.valign=this.valign;_2.$jo=false;_2.$jp=false;_2._redrawWithParent=false;_2.containedPeer=true;_2.icon=this.icon;_2.iconWidth=this.iconWidth;_2.iconHeight=this.iconHeight;_2.iconSize=this.iconSize;_2.iconOrientation=this.iconOrientation;_2.iconAlign=this.iconAlign;_2.iconSpacing=this.iconSpacing;_2.showDownIcon=this.showDownIcon;_2.showSelectedIcon=this.showSelectedIcon;_2.showRollOverIcon=this.showRollOverIcon;_2.showFocusedIcon=this.showFocusedIcon;_2.showDisabledIcon=this.showDisabledIcon;if(this.showIconState!=null)_2.showIconState=this.showIconState;_2.getFocusedState=function(){var _3=this.masterElement;if(_3&&_3.getFocusedState)return _3.getFocusedState()}
-_2.skinImgDir=this.labelSkinImgDir||this.skinImgDir;_2.waiRole=this.waiRole;_2.baseStyle=this.titleStyle||this.baseStyle;_2.state=this.getState();_2.customState=this.getCustomState();_2.getPrintStyleName=function(){return this.masterElement.getPrintStyleName()}
+_2.skinImgDir=this.labelSkinImgDir||this.skinImgDir;_2.baseStyle=this.titleStyle||this.baseStyle;_2.state=this.getState();_2.customState=this.getCustomState();_2.getPrintStyleName=function(){return this.masterElement.getPrintStyleName()}
 _2.overflow=this.overflow;_2.width=this.$15();_2.height=this.$16();_2.left=this.$17();_2.top=this.$18();_2.wrap=this.wrap!=null?this.wrap:this.vertical;_2.eventProxy=this;_2.isMouseTransparent=true;_2.zIndex=this.getZIndex(true)+1;_2.tabIndex=-1;this.$d3(this.$11,_2);this.label.setSelected(this.isSelected());this.addPeer(this.label,null,null,true)}
 ,isc.A.setLabelSkinImgDir=function isc_StatefulCanvas_setLabelSkinImgDir(_1){this.labelSkinImgDir=_1;if(this.label!=null)this.label.setSkinImgDir(_1)}
 ,isc.A.setSkinImgDir=function isc_StatefulCanvas_setSkinImgDir(_1){this.Super("setSkinImgDir",arguments);if(this.labelSkinImgDir==null&&this.label!=null)this.label.setSkinImgDir(_1)}
@@ -4400,6 +4400,7 @@
 this.invokeSuper(isc.StatefulCanvas,"setOverflow",_1,_2,_3,_4,_5);if(isc.isA.Canvas(this.label))this.label.setOverflow(_1,_2,_3,_4,_5)}
 ,isc.A.$5y=function isc_StatefulCanvas__resized(_1,_2,_3,_4,_5){this.invokeSuper(isc.StatefulCanvas,this.$64x,_1,_2,_3,_4,_5);if(this.label)this.label.resizeTo(this.$15(),this.$16())}
 ,isc.A.draw=function isc_StatefulCanvas_draw(_1,_2,_3){if(isc.$cv)arguments.$cw=this;var _4=isc.Canvas.$b4.draw.call(this,_1,_2,_3);if(this.position!=isc.Canvas.ABSOLUTE&&isc.isA.Canvas(this.label)){if(isc.Page.isLoaded())this.$42f();else isc.Page.setEvent("load",this.getID()+".$42f()")}
+if(this.label!=null&&isc.Canvas.ariaEnabled()){this.setAriaState("label",this.title)}
 return _4}
 ,isc.A.$42f=function isc_StatefulCanvas__positionLabel(){if(!this.isDrawn())return;this.label.moveTo(this.$17(),this.$18())}
 ,isc.A.setAlign=function isc_StatefulCanvas_setAlign(_1){this.align=_1;if(this.isDrawn())this.markForRedraw();if(this.label)this.label.setAlign(_1)}
@@ -5237,7 +5238,8 @@
 return _4},count:function(_1,_2){return _1.length}};isc.B.push(isc.A.getType=function isc_c_SimpleType_getType(_1,_2){if(_2)return _2.getType(_1);var _3=isc.builtinTypes[_1];return _3}
 ,isc.A.getBaseType=function isc_c_SimpleType_getBaseType(_1,_2){if(isc.isA.String(_1))_1=this.getType(_1,_2);if(_1==null)return null;while(_1.inheritsFrom){var _3=this.getType(_1.inheritsFrom,_2);if(_3==null)return null;_1=_3}
 return _1.name}
-,isc.A.inheritsFrom=function isc_c_SimpleType_inheritsFrom(_1,_2,_3){if(isc.isA.String(_1))_1=this.getType(_1,_3);if(_1==null)return false;if(_1.name==_2)return true;while(_1.inheritsFrom){var _4=this.getType(_1.inheritsFrom,_3);if(_4==null)return null;if(_4.name==_2)return true;_1=_4}
+,isc.A.inheritsFrom=function isc_c_SimpleType_inheritsFrom(_1,_2,_3){if(_2==null){this.logWarn("inheritsFrom passed null type");return false}
+if(isc.isA.String(_1))_1=this.getType(_1,_3);if(_1==null)return false;if(_1.name==_2)return true;while(_1.inheritsFrom){var _4=this.getType(_1.inheritsFrom,_3);if(_4==null)return null;if(_4.name==_2)return true;_1=_4}
 return false}
 ,isc.A.validateValue=function isc_c_SimpleType_validateValue(_1,_2,_3){var _4={name:"$42j",type:_1};isc.SimpleType.addTypeDefaults(_4);var _3=_3||isc.DS.get("Object");return _3.validateFieldValue(_4,_2)}
 ,isc.A.addTypeDefaults=function isc_c_SimpleType_addTypeDefaults(_1,_2){if(_1==null||_1.$61)return;_1.$61=true;var _3=this.getType(_1.type,_2);if(_3==null)return;_1.$62=_3;if(_1.valueMap==null){var _4=this.getInheritedProperty(_3,"valueMap",_2);if(_4!=null)_3.valueMap=_1.valueMap=_4}
@@ -5350,7 +5352,7 @@
 );isc.B._maxIndex=isc.C+34;isc.SplitPane.registerStringMethods({paneChanged:"pane"});isc._moduleEnd=isc._Foundation_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('Foundation module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'Foundation'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-06-02 (2011-06-02)
+ * Version SC_SNAPSHOT-2011-06-06 (2011-06-06)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -5361,7 +5363,7 @@
 
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-06-02 (2011-06-02)
+ * Version SC_SNAPSHOT-2011-06-06 (2011-06-06)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -5388,9 +5390,9 @@
 ,isc.A.setButtons=function isc_TabBar_setButtons(_1){this.Super("setButtons",arguments);if(isc.Browser.isSGWT){var _2=this.getMembers();for(var i=0;i<_2.length;i++){_2[i].__ref=null}}
 if(this.showMoreTab&&this.buttons.length-1>this.moreTabCount){for(var i=this.moreTabCount-1;i<this.buttons.length;i++){this.getMember(i).hide()}
 this.getMember(this.$79t).show()}else if(this.showMoreTab&&this.moreTab){this.getMember(this.$79t).hide()}}
-,isc.A.makeButton=function isc_TabBar_makeButton(_1,_2,_3,_4,_5){var _6=this.parentElement.canCloseTab(_1);isc.addProperties(_1,this.getCloseIconProperties(_1));_1.locatorParent=this.parentElement;return this.invokeSuper("TabBar","makeButton",_1,_2,_3,_4,_5)}
-,isc.A.getCloseIconProperties=function isc_TabBar_getCloseIconProperties(_1){var _2={};if(!_1.canClose){_2.icon=(_1.icon);_2.iconSize=(_1.iconSize);_2.iconOrientation=_1.iconOrientation;_2.iconAlign=_1.iconAlign}else{_2.icon=(_1.closeIcon||this.parentElement.closeTabIcon);_2.iconSize=(_1.closeIconSize||this.parentElement.closeTabIconSize);_2.iconOrientation=isc.Page.isRTL()?"left":"right";_2.iconAlign=_2.iconOrientation}
-return _2}
+,isc.A.makeButton=function isc_TabBar_makeButton(_1,_2,_3,_4,_5){var _6=this.parentElement.canCloseTab(_1);isc.addProperties(_1,this.getCloseIconProperties(_1,_6));_1.locatorParent=this.parentElement;return this.invokeSuper("TabBar","makeButton",_1,_2,_3,_4,_5)}
+,isc.A.getCloseIconProperties=function isc_TabBar_getCloseIconProperties(_1,_2){var _3={};if(_1.canClose==true||(_1.canClose==null&&_2)){_3.icon=(_1.closeIcon||this.parentElement.closeTabIcon);_3.iconSize=(_1.closeIconSize||this.parentElement.closeTabIconSize);_3.iconOrientation=isc.Page.isRTL()?"left":"right";_3.iconAlign=_3.iconOrientation}else{_3.icon=(_1.icon);_3.iconSize=(_1.iconSize);_3.iconOrientation=_1.iconOrientation;_3.iconAlign=_1.iconAlign}
+return _3}
 ,isc.A.addTabs=function isc_TabBar_addTabs(_1,_2){if(!_2&&this.tabBarPosition==isc.Canvas.LEFT)_2=0;this.addButtons(_1,_2);if(isc.Browser.isSGWT){var _3=this.getMembers();for(var i=0;i<_3.length;i++){_3[i].__ref=null}}
 if(this.showMoreTab&&this.moreTab){var _5=this.getMembers();if(_5.length-1>this.moreTabCount){for(var i=this.moreTabCount-1;i<_5.length;i++){_5[i].hide()}
 this.$79t=_5.length-1;_5[this.$79t].show()}}
@@ -5598,31 +5600,31 @@
 ,isc.A.removePortlet=function isc_PortalRow_removePortlet(_1){this.removePortlets(_1)}
 ,isc.A.getPortlets=function isc_PortalRow_getPortlets(){return this.getMembers().map(function(_1){if(_1.$858){return _1.$858}else{return _1}})}
 );isc.B._maxIndex=isc.C+12;isc.defineClass("PortalColumnBody","Layout");isc.A=isc.PortalColumnBody.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.vertical=true;isc.A.layoutMargin=3;isc.A.defaultResizeBars="marked";isc.A.canAcceptDrop=true;isc.A.dropTypes=["Portlet"];isc.A.canDrag=false;isc.A.dropLineThickness=2;isc.A.dropLineProperties={backgroundColor:"blue"};isc.B.push(isc.A.getDropComponent=function isc_PortalColumnBody_getDropComponent(_1,_2){var _3=this.creator.portalLayout.getDropPortlet(_1,this.creator.portalLayout.getPortalColumnNumber(this.creator),_2,null);if(_3)this.creator.addPortlet(_3,_2)}
-);isc.B._maxIndex=isc.C+1;isc.defineClass("PortalColumn","Layout");isc.A=isc.PortalColumn.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.vertical=true;isc.A.layoutMargin=3;isc.A.dragAppearance="outline";isc.A.canAcceptDrop=false;isc.A.canDrop=true;isc.A.dragType="PortalColumn";isc.A.showColumnHeader=true;isc.A.columnHeaderConstructor="PortalColumnHeader";isc.A.columnHeaderDefaults={title:"Column"};isc.A.bodyConstructor="PortalColumnBody";isc.A.bodyDefaults={height:"100%"};isc.A.portalRowConstructor="PortalRow";isc.B.push(isc.A.initWidget=function isc_PortalColumn_initWidget(){this.Super("initWidget",arguments);this.addAutoChild("columnHeader");this.addAutoChild("body");if(this.portalRows)this.addPortalRows(this.portalRows);this.portalRows=null}
+);isc.B._maxIndex=isc.C+1;isc.defineClass("PortalColumn","Layout");isc.A=isc.PortalColumn.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.vertical=true;isc.A.layoutMargin=3;isc.A.dragAppearance="outline";isc.A.canAcceptDrop=false;isc.A.canDrop=true;isc.A.dragType="PortalColumn";isc.A.showColumnHeader=true;isc.A.columnHeaderConstructor="PortalColumnHeader";isc.A.columnHeaderDefaults={title:"Column"};isc.A.rowLayoutConstructor="PortalColumnBody";isc.A.rowLayoutDefaults={height:"100%"};isc.A.rowConstructor="PortalRow";isc.B.push(isc.A.initWidget=function isc_PortalColumn_initWidget(){this.Super("initWidget",arguments);this.addAutoChild("columnHeader");this.addAutoChild("rowLayout");if(this.portalRows)this.addPortalRows(this.portalRows);this.portalRows=null}
 ,isc.A.addNewColumn=function isc_PortalColumn_addNewColumn(){this.portalLayout.addColumnAfter(this)}
-,isc.A.makePortalRow=function isc_PortalColumn_makePortalRow(_1){if(_1==null)_1={};var _2={showResizeBar:this.canResizeRows,portalLayout:this.portalLayout,portalColumn:this};var _3;if(isc.isA.PortalRow(_1)){_1.setProperties(_2);_3=_1}else{isc.addProperties(_1,_2);_3=this.createAutoChild("portalRow",_1)}
+,isc.A.makePortalRow=function isc_PortalColumn_makePortalRow(_1){if(_1==null)_1={};var _2={showResizeBar:this.canResizeRows,portalLayout:this.portalLayout,portalColumn:this};var _3;if(isc.isA.PortalRow(_1)){_1.setProperties(_2);_3=_1}else{isc.addProperties(_1,_2);_3=this.createAutoChild("row",_1)}
 return _3}
 ,isc.A.setCanResizeRows=function isc_PortalColumn_setCanResizeRows(_1){this.canResizeRows=_1;this.getPortalRows().map(function(_2){_2.setShowResizeBar(_1)})}
-,isc.A.addPortalRows=function isc_PortalColumn_addPortalRows(_1,_2){if(!isc.isAn.Array(_1))_1=[_1];var _3=this;_1=_1.map(function(_4){return _3.makePortalRow(_4)});this.body.addMembers(_1,_2)}
+,isc.A.addPortalRows=function isc_PortalColumn_addPortalRows(_1,_2){if(!isc.isAn.Array(_1))_1=[_1];var _3=this;_1=_1.map(function(_4){return _3.makePortalRow(_4)});this.rowLayout.addMembers(_1,_2)}
 ,isc.A.addPortalRow=function isc_PortalColumn_addPortalRow(_1,_2){this.addPortalRows(_1,_2)}
-,isc.A.removePortalRows=function isc_PortalColumn_removePortalRows(_1){this.body.removeMembers(_1)}
+,isc.A.removePortalRows=function isc_PortalColumn_removePortalRows(_1){this.rowLayout.removeMembers(_1)}
 ,isc.A.removePortalRow=function isc_PortalColumn_removePortalRow(_1){this.removePortalRows(_1)}
-,isc.A.getPortalRows=function isc_PortalColumn_getPortalRows(){return this.body.getMembers()}
-,isc.A.getPortalRowNumber=function isc_PortalColumn_getPortalRowNumber(_1){return this.body.getMemberNumber(_1)}
+,isc.A.getPortalRows=function isc_PortalColumn_getPortalRows(){return this.rowLayout.getMembers()}
+,isc.A.getPortalRowNumber=function isc_PortalColumn_getPortalRowNumber(_1){return this.rowLayout.getMemberNumber(_1)}
 ,isc.A.getPortlets=function isc_PortalColumn_getPortlets(){var _1=[];this.getPortalRows().map(function(_2){_1.addList(_2.getPortlets())});return _1}
 ,isc.A.getPortletArray=function isc_PortalColumn_getPortletArray(){return this.getPortalRows().map(function(_1){return _1.getPortlets()})}
 ,isc.A.addPortlets=function isc_PortalColumn_addPortlets(_1,_2){if(!isc.isAn.Array(_1))_1=[_1];var _3=this;var _4=_1.map(function(_5){return _3.makePortalRow({portlets:_5})});this.addPortalRows(_4,_2)}
 ,isc.A.addPortlet=function isc_PortalColumn_addPortlet(_1,_2){this.addPortlets(_1,_2)}
-,isc.A.addPortletToExistingRow=function isc_PortalColumn_addPortletToExistingRow(_1,_2,_3){var _4=this.body.getMembers();if(_4==null||_4.length<=_2){this.addPortlet(_1)}else{var _5=this.body.getMember(_2);_5.addPortlets(_1,_3)}}
-);isc.B._maxIndex=isc.C+15;isc.defineClass("PortalLayout","Layout");isc.A=isc.PortalLayout.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.vertical=false;isc.A.numColumns=2;isc.A.showColumnMenus=true;isc.A.columnBorder="1px solid gray";isc.A.canResizeColumns=false;isc.A.canResizeRows=false;isc.A.canAcceptDrop=true;isc.A.dropTypes=["PortalColumn"];isc.A.dropLineThickness=2;isc.A.dropLineProperties={backgroundColor:"blue"};isc.A.portalColumnConstructor="PortalColumn";isc.B.push(isc.A.getNumColumns=function isc_PortalLayout_getNumColumns(){return this.getMembers().length}
+,isc.A.addPortletToExistingRow=function isc_PortalColumn_addPortletToExistingRow(_1,_2,_3){var _4=this.rowLayout.getMembers();if(_4==null||_4.length<=_2){this.addPortlet(_1)}else{var _5=this.rowLayout.getMember(_2);_5.addPortlets(_1,_3)}}
+);isc.B._maxIndex=isc.C+15;isc.defineClass("PortalLayout","Layout");isc.A=isc.PortalLayout.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.vertical=false;isc.A.numColumns=2;isc.A.showColumnMenus=true;isc.A.columnBorder="1px solid gray";isc.A.canResizeColumns=false;isc.A.canResizeRows=false;isc.A.canAcceptDrop=true;isc.A.dropTypes=["PortalColumn"];isc.A.dropLineThickness=2;isc.A.dropLineProperties={backgroundColor:"blue"};isc.A.rowConstructor=isc.PortalColumn.getInstanceProperty("rowConstructor");isc.A.rowLayoutConstructor=isc.PortalColumn.getInstanceProperty("rowLayoutConstructor");isc.A.rowLayoutDefaults=isc.PortalColumn.getInstanceProperty("rowLayoutDefaults");isc.A.columnConstructor="PortalColumn";isc.B.push(isc.A.getNumColumns=function isc_PortalLayout_getNumColumns(){return this.getMembers().length}
 ,isc.A.setColumnBorder=function isc_PortalLayout_setColumnBorder(_1){this.columnBorder=_1;var _2=this.members||[];for(var i=0;i<_2.length;i++){_2[i].setBorder(_1)}}
 ,isc.A.setCanResizeColumns=function isc_PortalLayout_setCanResizeColumns(_1){this.canResizeColumns=_1;this.getPortalColumns().map(function(_2){_2.setShowResizeBar(_1)})}
 ,isc.A.setCanResizeRows=function isc_PortalLayout_setCanResizeRows(_1){this.canResizeRows=_1;this.getPortalColumns().map(function(_2){_2.setCanResizeRows(_1)})}
 ,isc.A.initWidget=function isc_PortalLayout_initWidget(){this.Super("initWidget",arguments);if(this.portalColumns){this.addPortalColumns(this.portalColumns);this.portalColumns=null}else{if(this.numColumns){for(var x=0;x<this.numColumns;x++){this.addPortalColumns(this.makePortalColumn())}}}}
 ,isc.A.getDropPortlet=function isc_PortalLayout_getDropPortlet(_1,_2,_3,_4){return _1}
 ,isc.A.getPortalColumns=function isc_PortalLayout_getPortalColumns(){return this.getMembers()}
-,isc.A.makePortalColumn=function isc_PortalLayout_makePortalColumn(_1){if(_1==null)_1={};var _2={portalLayout:this,showColumnHeader:this.showColumnMenus,border:this.columnBorder,showResizeBar:this.canResizeColumns,canResizeRows:this.canResizeRows}
-var _3;if(isc.isA.PortalColumn(_1)){_1.setProperties(_2);_3=_1}else{isc.addProperties(_1,_2);_3=this.createAutoChild("portalColumn",_1)}
+,isc.A.makePortalColumn=function isc_PortalLayout_makePortalColumn(_1){if(_1==null)_1={};var _2={portalLayout:this,showColumnHeader:this.showColumnMenus,border:this.columnBorder,showResizeBar:this.canResizeColumns,canResizeRows:this.canResizeRows,rowConstructor:this.rowConstructor,rowDefaults:this.rowDefaults,rowProperties:this.rowProperties,rowLayoutConstructor:this.rowLayoutConstructor,rowLayoutDefaults:this.rowLayoutDefaults,rowLayoutProperties:this.rowLayoutProperties}
+var _3;if(isc.isA.PortalColumn(_1)){_1.setProperties(_2);_3=_1}else{isc.addProperties(_1,_2);_3=this.createAutoChild("column",_1)}
 return _3}
 ,isc.A.addPortalColumns=function isc_PortalLayout_addPortalColumns(_1,_2){if(!isc.isAn.Array(_1))_1=[_1];var _3=this;_1=_1.map(function(_4){return _3.makePortalColumn(_4)});this.addMembers(_1,_2)}
 ,isc.A.addPortalColumn=function isc_PortalLayout_addPortalColumn(_1,_2){this.addPortalColumns(_1,_2)}
@@ -5641,9 +5643,9 @@
 ,isc.A.removePortlet=function isc_PortalLayout_removePortlet(_1){if(_1.portalRow)_1.portalRow.removePortlets(_1)}
 );isc.B._maxIndex=isc.C+23;isc.defineClass("EditModePortalRow","PortalRow");isc.ClassFactory.mixInInterface("EditModePortalRow","EditContext");isc.A=isc.EditModePortalRow.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.getDropComponent=function isc_EditModePortalRow_getDropComponent(_1,_2){var _3=this.portalLayout.getDropPortlet(_1,this.portalLayout.getPortalColumnNumber(this.portalColumn),this.portalColumn.getPortalRowNumber(this),_2);if(isc.isA.Palette(_3)){var _4=_3.transferDragData(),_5=(isc.isAn.Array(_4)?_4[0]:_4);_3=isc.Portlet.create({autoDraw:false,title:_5.title,items:[_5.liveObject],confirmedClosePortlet:function(_6){this.Super("confirmedClosePortlet",arguments);if(_6)this.destroy()}})}
 if(_3)this.addPortlet(_3,_2);return null}
-);isc.B._maxIndex=isc.C+1;isc.defineClass("EditModePortalColumn","PortalColumn");isc.ClassFactory.mixInInterface("EditModePortalColumn","EditContext");isc.A=isc.EditModePortalColumn.getPrototype();isc.A.portalRowConstructor="EditModePortalRow";isc.A.bodyConstructor="EditModePortalColumnBody";isc.defineClass("EditModePortalColumnBody","PortalColumnBody","EditContext");isc.A=isc.EditModePortalColumnBody.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.getDropComponent=function isc_EditModePortalColumnBody_getDropComponent(_1,_2){var _3=this.creator.portalLayout.getDropPortlet(_1,this.creator.portalLayout.getPortalColumnNumber(this.creator),_2,null);if(isc.isA.Palette(_3)){var _4=_3.transferDragData(),_5=(isc.isAn.Array(_4)?_4[0]:_4);_3=isc.Portlet.create({autoDraw:false,title:_5.title,items:[_5.liveObject],confirmedClosePortlet:function(_6){this.Super("confirmedClosePortlet",arguments);if(_6)this.destroy()}})}
+);isc.B._maxIndex=isc.C+1;isc.defineClass("EditModePortalColumn","PortalColumn");isc.ClassFactory.mixInInterface("EditModePortalColumn","EditContext");isc.A=isc.EditModePortalColumn.getPrototype();isc.A.rowLayoutConstructor="EditModePortalColumnBody";isc.A.rowConstructor="EditModePortalRow";isc.defineClass("EditModePortalColumnBody","PortalColumnBody","EditContext");isc.A=isc.EditModePortalColumnBody.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.getDropComponent=function isc_EditModePortalColumnBody_getDropComponent(_1,_2){var _3=this.creator.portalLayout.getDropPortlet(_1,this.creator.portalLayout.getPortalColumnNumber(this.creator),_2,null);if(isc.isA.Palette(_3)){var _4=_3.transferDragData(),_5=(isc.isAn.Array(_4)?_4[0]:_4);_3=isc.Portlet.create({autoDraw:false,title:_5.title,items:[_5.liveObject],confirmedClosePortlet:function(_6){this.Super("confirmedClosePortlet",arguments);if(_6)this.destroy()}})}
 if(_3)this.creator.addPortlet(_3,_2)}
-);isc.B._maxIndex=isc.C+1;isc.A=isc.PortalLayout.getPrototype();isc.A.portalColumnConstructor="EditModePortalColumn";isc.ClassFactory.defineClass("Dialog","Window");isc.A=isc.Dialog;isc.A.$76=[];isc.A.OK_BUTTON_TITLE="OK";isc.A.APPLY_BUTTON_TITLE="Apply";isc.A.YES_BUTTON_TITLE="Yes";isc.A.NO_BUTTON_TITLE="No";isc.A.CANCEL_BUTTON_TITLE="Cancel";isc.A.DONE_BUTTON_TITLE="Done";isc.A.CONFIRM_TITLE="Confirm";isc.A.SAY_TITLE="Note";isc.A.WARN_TITLE="Warning";isc.A.ASK_TITLE="Question";isc.A.ASK_FOR_VALUE_TITLE="Please enter a value";isc.A.LOGIN_TITLE="Please log in";isc.A.USERNAME_TITLE="Username";isc.A.PASSWORD_TITLE="Password";isc.A.LOGIN_BUTTON_TITLE="Log in";isc.A.LOGIN_ERROR_MESSAGE="Invalid username or password";isc.A.OK={getTitle:function(){return isc.Dialog.OK_BUTTON_TITLE},width:75,click:function(){this.topElement.okClick()}};isc.A.APPLY={getTitle:function(){return isc.Dialog.APPLY_BUTTON_TITLE},width:75,click:function(){this.topElement.applyClick()}};isc.A.YES={getTitle:function(){return isc.Dialog.YES_BUTTON_TITLE},width:75,click:function(){this.topElement.yesClick()}};isc.A.NO={getTitle:function(){return isc.Dialog.NO_BUTTON_TITLE},width:75,click:function(){this.topElement.noClick()}};isc.A.CANCEL={getTitle:function(){return isc.Dialog.CANCEL_BUTTON_TITLE},width:75,click:function(){this.topElement.cancelClick()}};isc.A.DONE={getTitle:function(){return isc.Dialog.DONE_BUTTON_TITLE},width:75,click:function(){this.topElement.doneClick()}};isc.A=isc.Dialog.getPrototype();isc.A.styleName="dialogBackground";isc.A.skinImgDir="images/Dialog/";isc.A.canDragReposition=false;isc.A.canDragResize=false;isc.A.autoCenter=true;isc.A.bodyStyle="dialogBody";isc.A.bodyColor="#DDDDDD";isc.A.hiliteBodyColor="#FFFFFF";isc.A.messageStyle="normal";isc.A.headerStyle="dialogHeader";isc.A.hiliteHeaderStyle="dialogHeaderHilite";isc.A.headerLabelDefaults=isc.addProperties({},isc.Window.getInstanceProperty("headerLabelDefaults"),{styleName:"dialogHeaderText"});isc.A.showHeaderIcon=false;isc.A.showMinimizeButton=false;isc.A.showMaximizeButton=false;isc.A.showFooter=false;isc.A.showToolbar=true;isc.A.askIcon="[SKIN]ask.png";isc.A.sayIcon="[SKIN]say.png";isc.A.warnIcon="[SKIN]warn.png";isc.A.confirmIcon="[SKIN]confirm.png";isc.A.notifyIcon="[SKIN]notify.png";isc.A.errorIcon="[SKIN]error.png";isc.A.stopIcon="[SKIN]stop.png";isc.A=isc.Dialog.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.namedLocatorChildren=["okButton","applyButton","yesButton","noButton","cancelButton","doneButton"];isc.B.push(isc.A.saveData=function isc_Dialog_saveData(){}
+);isc.B._maxIndex=isc.C+1;isc.A=isc.PortalLayout.getPrototype();isc.A.rowConstructor=isc.EditModePortalColumn.getInstanceProperty("rowConstructor");isc.A.rowLayoutConstructor=isc.EditModePortalColumn.getInstanceProperty("rowLayoutConstructor");isc.A.columnConstructor="EditModePortalColumn";isc.ClassFactory.defineClass("Dialog","Window");isc.A=isc.Dialog;isc.A.$76=[];isc.A.OK_BUTTON_TITLE="OK";isc.A.APPLY_BUTTON_TITLE="Apply";isc.A.YES_BUTTON_TITLE="Yes";isc.A.NO_BUTTON_TITLE="No";isc.A.CANCEL_BUTTON_TITLE="Cancel";isc.A.DONE_BUTTON_TITLE="Done";isc.A.CONFIRM_TITLE="Confirm";isc.A.SAY_TITLE="Note";isc.A.WARN_TITLE="Warning";isc.A.ASK_TITLE="Question";isc.A.ASK_FOR_VALUE_TITLE="Please enter a value";isc.A.LOGIN_TITLE="Please log in";isc.A.USERNAME_TITLE="Username";isc.A.PASSWORD_TITLE="Password";isc.A.LOGIN_BUTTON_TITLE="Log in";isc.A.LOGIN_ERROR_MESSAGE="Invalid username or password";isc.A.OK={getTitle:function(){return isc.Dialog.OK_BUTTON_TITLE},width:75,click:function(){this.topElement.okClick()}};isc.A.APPLY={getTitle:function(){return isc.Dialog.APPLY_BUTTON_TITLE},width:75,click:function(){this.topElement.applyClick()}};isc.A.YES={getTitle:function(){return isc.Dialog.YES_BUTTON_TITLE},width:75,click:function(){this.topElement.yesClick()}};isc.A.NO={getTitle:function(){return isc.Dialog.NO_BUTTON_TITLE},width:75,click:function(){this.topElement.noClick()}};isc.A.CANCEL={getTitle:function(){return isc.Dialog.CANCEL_BUTTON_TITLE},width:75,click:function(){this.topElement.cancelClick()}};isc.A.DONE={getTitle:function(){return isc.Dialog.DONE_BUTTON_TITLE},width:75,click:function(){this.topElement.doneClick()}};isc.A=isc.Dialog.getPrototype();isc.A.styleName="dialogBackground";isc.A.skinImgDir="images/Dialog/";isc.A.canDragReposition=false;isc.A.canDragResize=false;isc.A.autoCenter=true;isc.A.bodyStyle="dialogBody";isc.A.bodyColor="#DDDDDD";isc.A.hiliteBodyColor="#FFFFFF";isc.A.messageStyle="normal";isc.A.headerStyle="dialogHeader";isc.A.hiliteHeaderStyle="dialogHeaderHilite";isc.A.headerLabelDefaults=isc.addProperties({},isc.Window.getInstanceProperty("headerLabelDefaults"),{styleName:"dialogHeaderText"});isc.A.showHeaderIcon=false;isc.A.showMinimizeButton=false;isc.A.showMaximizeButton=false;isc.A.showFooter=false;isc.A.showToolbar=true;isc.A.askIcon="[SKIN]ask.png";isc.A.sayIcon="[SKIN]say.png";isc.A.warnIcon="[SKIN]warn.png";isc.A.confirmIcon="[SKIN]confirm.png";isc.A.notifyIcon="[SKIN]notify.png";isc.A.errorIcon="[SKIN]error.png";isc.A.stopIcon="[SKIN]stop.png";isc.A=isc.Dialog.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.namedLocatorChildren=["okButton","applyButton","yesButton","noButton","cancelButton","doneButton"];isc.B.push(isc.A.saveData=function isc_Dialog_saveData(){}
 ,isc.A.cancelClick=function isc_Dialog_cancelClick(){return this.closeClick()}
 ,isc.A.$7e=function isc_Dialog__closeButtonClick(){return this.cancelClick()}
 ,isc.A.okClick=function isc_Dialog_okClick(){this.saveData();this.clear();this.returnValue(true)}
@@ -5719,9 +5721,9 @@
 this.fireCallback(this.callback,["sortLevels"],[null]);this.hide();this.markForDestroy()}
 ,isc.A.apply=function isc_MultiSortDialog_apply(){if(this.optionsGrid.getEditRow()!=null)this.optionsGrid.endEditing();if(!this.validate())return;if(this.callback){var _1=isc.shallowClone(this.getSort());this.fireCallback(this.callback,["sortLevels"],[_1])}
 this.hide();this.markForDestroy()}
-);isc.B._maxIndex=isc.C+10;isc.ClassFactory.defineClass("TabSet","Canvas");isc.A=isc.TabSet.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.overflow="hidden";isc.A.tabProperties={};isc.A.simpleTabBaseStyle="tabButton";isc.A.tabBarPosition=isc.Canvas.TOP;isc.A.tabBarThickness=21;isc.A.selectedTab=0;isc.A.closeTabIcon="[SKIN]/TabSet/close.png";isc.A.closeTabIconSize=16;isc.A.moreTabCount=5;isc.A.moreTabTitle="More";isc.A.moreTabImage="[SKINIMG]/iOS/more.png";isc.A.moreTabProperties={};isc.A.moreTabPaneProperties={};isc.A.moreTabPaneDefaults={_constructor:"VLayout",width:"100%",height:"100%",setData:function(_1){this.creator.moreTabPaneTable.setData(_1)}};isc.A.moreTabPaneNavBarDefaults={_constructor:"NavigationBar",controls:["titleLabel"],autoParent:"moreTabPane"};isc.A.moreTabPaneTableDefaults={_constructor:"TableView",width:"100%",height:"100%",recordNavigationClick:function(_1){this.creator.$8c(_1.button)},autoParent:"moreTabPane"};isc.A.tabBarControls=["tabScroller","tabPicker"];isc.A.showTabScroller=true;isc.A.showTabPicker=true;isc.A.tabBarControlLayoutConstructor="Layout";isc.A.tabBarControlLayoutDefaults={};isc.A.animateTabScrolling=true;isc.A.scrollerButtonSize=16;isc.A.pickerButtonSize=16;isc.A.skinImgDir="images/TabSet/";isc.A.symmetricScroller=true;isc.A.scrollerSrc="[SKIN]/scroll.gif";isc.A.scrollerHSrc="[SKIN]hscroll.gif";isc.A.scrollerVSrc="[SKIN]vscroll.gif";isc.A.symmetricPickerButton=true;isc.A.pickerButtonSrc="[SKIN]/picker.gif";isc.A.pickerButtonHSrc="[SKIN]hpicker.gif";isc.A.pickerButtonVSrc="[SKIN]vpicker.gif";isc.A.paneContainerConstructor="PaneContainer";isc.A.paneContainerClassName="tabSetContainer";isc.A.paneContainerOverflow=isc.Canvas.AUTO;isc.A.symmetricEdges=true;isc.A.titleEditorDefaults={name:"title",type:"text",showTitle:false};isc.B.push(isc.A.setPaneContainerOverflow=function isc_TabSet_setPaneContainerOverflow(_1){this.paneContainerOverflow=_1;if(this.paneContainer)this.paneContainer.setOverflow(_1)}
+);isc.B._maxIndex=isc.C+10;isc.ClassFactory.defineClass("TabSet","Canvas");isc.A=isc.TabSet.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.overflow="hidden";isc.A.tabProperties={};isc.A.simpleTabBaseStyle="tabButton";isc.A.tabBarPosition=isc.Canvas.TOP;isc.A.tabBarThickness=21;isc.A.selectedTab=0;isc.A.closeTabIcon="[SKIN]/TabSet/close.png";isc.A.closeTabIconSize=16;isc.A.moreTabCount=5;isc.A.moreTabTitle="More";isc.A.moreTabImage="[SKINIMG]/iOS/more.png";isc.A.moreTabDefaults={ariaRole:"tab"};isc.A.moreTabProperties={};isc.A.moreTabPaneProperties={};isc.A.moreTabPaneDefaults={_constructor:"VLayout",width:"100%",height:"100%",setData:function(_1){this.creator.moreTabPaneTable.setData(_1)}};isc.A.moreTabPaneNavBarDefaults={_constructor:"NavigationBar",controls:["titleLabel"],autoParent:"moreTabPane"};isc.A.moreTabPaneTableDefaults={_constructor:"TableView",width:"100%",height:"100%",recordNavigationClick:function(_1){this.creator.$8c(_1.button)},autoParent:"moreTabPane"};isc.A.tabBarControls=["tabScroller","tabPicker"];isc.A.showTabScroller=true;isc.A.showTabPicker=true;isc.A.tabBarControlLayoutConstructor="Layout";isc.A.tabBarControlLayoutDefaults={};isc.A.animateTabScrolling=true;isc.A.scrollerButtonSize=16;isc.A.pickerButtonSize=16;isc.A.skinImgDir="images/TabSet/";isc.A.symmetricScroller=true;isc.A.scrollerSrc="[SKIN]/scroll.gif";isc.A.scrollerHSrc="[SKIN]hscroll.gif";isc.A.scrollerVSrc="[SKIN]vscroll.gif";isc.A.symmetricPickerButton=true;isc.A.pickerButtonSrc="[SKIN]/picker.gif";isc.A.pickerButtonHSrc="[SKIN]hpicker.gif";isc.A.pickerButtonVSrc="[SKIN]vpicker.gif";isc.A.paneContainerConstructor="PaneContainer";isc.A.paneContainerClassName="tabSetContainer";isc.A.paneContainerOverflow=isc.Canvas.AUTO;isc.A.symmetricEdges=true;isc.A.titleEditorDefaults={name:"title",type:"text",showTitle:false};isc.B.push(isc.A.setPaneContainerOverflow=function isc_TabSet_setPaneContainerOverflow(_1){this.paneContainerOverflow=_1;if(this.paneContainer)this.paneContainer.setOverflow(_1)}
 );isc.B._maxIndex=isc.C+1;isc.A=isc.TabSet.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.simpleTabButtonConstructor=isc.Button;isc.A.tabBarConstructor=isc.TabBar;isc.A.disablePaneWithTab=true;isc.A.$537={top:"topEdgeSizes",bottom:"bottomEdgeSizes",left:"leftEdgeSizes",right:"rightEdgeSizes"};isc.A.$538={top:"topEdgeOffsets",bottom:"bottomEdgeOffsets",left:"leftEdgeOffsets",right:"rightEdgeOffsets"};isc.A.namedLocatorChildren=["tabBarControlLayout"];isc.B.push(isc.A.initWidget=function isc_TabSet_initWidget(){this.showEdges=false;this.Super("initWidget",arguments);if(this.tabs==null)this.tabs=[];if(this.tabBarDefaults==null)this.tabBarDefaults={};this.tabProperties=this.tabProperties||this.tabInstanceDefaults||{};var _1=this.tabBarPosition;if(this.tabBarAlign==null){this.tabBarAlign=((_1=="left"||_1=="right")?"top":"left")}
-if(this.useSimpleTabs){this.tabBarDefaults.buttonConstructor=this.simpleTabButtonConstructor;this.tabProperties.baseStyle=this.simpleTabBaseStyle+_1.substring(0,1).toUpperCase()+_1.substring(1)}
+if(this.useSimpleTabs){this.tabBarDefaults.buttonConstructor=this.simpleTabButtonConstructor;this.tabProperties.baseStyle=this.simpleTabBaseStyle+_1.substring(0,1).toUpperCase()+_1.substring(1);this.tabProperties.ariaRole="tab"}
 this.makeTabBar();this.makePaneContainer();this.createPanes()}
 ,isc.A.makeTabBar=function isc_TabSet_makeTabBar(){if(this.tabs==null)return;var _1=(this.tabBarPosition==isc.Canvas.LEFT||this.tabBarPosition==isc.Canvas.RIGHT),_2=this.tabBarAlign;var _3=this.tabs.duplicate(),_4;for(var i=0;i<_3.length;i++){for(var j in this.tabProperties){if(_3[i][j]===_4)_3[i][j]=this.tabProperties[j]}}
 var _7=isc.addProperties({selectTabOnContextClick:this.selectTabOnContextClick,ID:this.getID()+"_tabBar",width:(_1?this.tabBarThickness:"100%"),height:(_1?"100%":this.tabBarThickness),accessKey:this.accessKey,tabIndex:this.tabIndex,tabs:_3,align:this.tabBarAlign,vertical:_1?true:false,selectedTab:this.selectedTab,showMoreTab:this.showMoreTab,moreTabCount:this.moreTabCount,moreTab:this.createMoreTab(),allowButtonReselect:this.showMoreTab?true:false,buttonSelected:function(_11){this.Super("buttonSelected",arguments);if(this.parentElement!=null){this.parentElement.$8c(_11)}},childResized:function(){this.Super("childResized",arguments);if(this.parentElement!=null){this.parentElement.$54m()}},showContextMenu:function(){var _8=isc.EH.getTarget();if(this.getButtons().contains(_8)){var _9=this.parentElement,_10=_9.getTabObject(_8);if(_9.showTabContextMenu(_9,_10)==false)return false}
@@ -5871,7 +5873,7 @@
 );isc.B._maxIndex=isc.C+1;isc.TabSet.registerDupProperties("tabs",["pane"]);isc._moduleEnd=isc._Containers_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('Containers module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'Containers'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-06-02 (2011-06-02)
+ * Version SC_SNAPSHOT-2011-06-06 (2011-06-06)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -5882,7 +5884,7 @@
 
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-06-02 (2011-06-02)
+ * Version SC_SNAPSHOT-2011-06-06 (2011-06-06)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -6239,7 +6241,7 @@
 return _2}
 );isc.B._maxIndex=isc.C+45;isc.DetailViewer.registerStringMethods({getCellValue:"record,field",getCellStyle:"value,field,record,viewer",getCellCSSText:"value,field,record,viewer",formatCellValue:"value,record,field,viewer",fieldStateChanged:""});isc.ClassFactory.defineClass("GridRenderer","Canvas");isc.A=isc.GridRenderer;isc.A.SELECTED="Selected";isc.A.DISABLED="Disabled";isc.A.OVER="Over";isc.A.standardStyleSuffixes=["","Over","Selected","SelectedOver","Disabled","DisabledOver","DisabledSelected","DisabledSelectedOver","Dark","OverDark","SelectedDark","SelectedOverDark","DisabledDark"];isc.A=isc.GridRenderer.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.totalRows=0;isc.A.drawAllMaxCells=250;isc.A.recordCanSelectProperty="canSelect";isc.A.isSeparatorProperty="isSeparator";isc.A.singleCellValueProperty="singleCellValue";isc.A.instantScrollTrackRedraw=true;isc.A.scrollRedrawDelay=75;isc.A.drawAheadRatio=1.3;isc.A.quickDrawAheadRatio=1.0;isc.A.cellHeight=20;isc.A.fixedRowHeights=true;isc.A.fixedColumnWidths=true;isc.A.cellSpacing=0;isc.A.cellPadding=2;isc.A.canSelectOnRightMouse=true;isc.A.hoverByCell=true;isc.A.backgroundColor="white";isc.A.tableStyle="listTable";isc.A.baseStyle="cell";isc.A.alternateRowFrequency=1;isc.A.emptyCellValue="&nbsp;";isc.A.fastCellUpdates=true;isc.A.overflow="auto";isc.A.$r9=true;isc.A.canFocus=true;isc.A.animateRowsMaxTime=1000;isc.A.snapToCells=false;isc.A.snapInsideBorder=false;isc.A.snapHDirection=isc.Canvas.BEFORE;isc.A.snapVDirection=isc.Canvas.BEFORE;isc.B.push(isc.A.setFastCellUpdates=function isc_GridRenderer_setFastCellUpdates(_1){if(_1&&!isc.Browser.isIE){this.fastCellUpdates=false;return}
 if(_1==this.fastCellUpdates)return;this.fastCellUpdates=_1;this.markForRedraw()}
-);isc.B._maxIndex=isc.C+1;isc.A=isc.GridRenderer.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$57k=["<DIV style='position:"+(isc.Page.isRTL()?"inline":"relative")+";z-index:",,";'>",,"</DIV>"];isc.A.$623="<table style='position:absolute;top:0px;font-size:1px;height:100%;width:100%;z-index:1;overflow:hidden;visibility:hidden;'><tr><td>&nbsp;</td></tr></table>";isc.A.maxAnimateSlideInRows=100;isc.A.$27r="none";isc.A.$77c={};isc.A.$27s="<DIV cellClipDiv=true style='overflow:hidden;";isc.A.$80q="<div>";isc.A.$80r="</div>";isc.A.$57l="within";isc.A.$57m="expand";isc.A.$14k="cell";isc.A.alignSnapToMap={left:{top:"TL",center:"L",bottom:"BL"},right:{top:"TR",center:"R",bottom:"BR"},center:{top:"T",center:"C",bottom:"B"}};isc.A.recordCustomStyleProperty="customStyle";isc.A.showSelectedStyle=true;isc.A.$27t="NOBR";isc.A.$27u="cellClipDiv";isc.A.$o5="height";isc.A.$27v="minHeight";isc.A.$39=";";isc.A.$721="padding-top:0px;padding-bottom:0px;";isc.A.$722="overflow:hidden;";isc.A.avgRowHeight=60;isc.B.push(isc.A.initWidget=function isc_GridRenderer_initWidget(){if(!this.$26a)this.setColumnWidths([]);if(this.selection)this.setSelection(this.selection);if(this.overflow==isc.Canvas.VISIBLE){this.showAllRows=true}
+);isc.B._maxIndex=isc.C+1;isc.A=isc.GridRenderer.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$57k=["<DIV style='position:"+(isc.Page.isRTL()?"inline":"relative")+";z-index:",,";'>",,"</DIV>"];isc.A.$623="<table style='position:absolute;top:0px;font-size:1px;height:100%;width:100%;z-index:1;overflow:hidden;visibility:hidden;'><tr><td>&nbsp;</td></tr></table>";isc.A.maxAnimateSlideInRows=100;isc.A.$27r="none";isc.A.$77c={};isc.A.$27s="<DIV role='presentation' cellClipDiv=true style='overflow:hidden;";isc.A.$80q="<div>";isc.A.$80r="</div>";isc.A.$57l="within";isc.A.$57m="expand";isc.A.$14k="cell";isc.A.alignSnapToMap={left:{top:"TL",center:"L",bottom:"BL"},right:{top:"TR",center:"R",bottom:"BR"},center:{top:"T",center:"C",bottom:"B"}};isc.A.recordCustomStyleProperty="customStyle";isc.A.showSelectedStyle=true;isc.A.$27t="NOBR";isc.A.$27u="cellClipDiv";isc.A.$o5="height";isc.A.$27v="minHeight";isc.A.$39=";";isc.A.$721="padding-top:0px;padding-bottom:0px;";isc.A.$722="overflow:hidden;";isc.A.avgRowHeight=60;isc.B.push(isc.A.initWidget=function isc_GridRenderer_initWidget(){if(!this.$26a)this.setColumnWidths([]);if(this.selection)this.setSelection(this.selection);if(this.overflow==isc.Canvas.VISIBLE){this.showAllRows=true}
 if(!this.fixedRowHeights&&this.virtualScrolling==null)this.virtualScrolling=true;if(!this.fixedRowHeights&&!this.showAllRows){if(this.showCustomScrollbars==false){this.logInfo("Variable height records cannot be used with native scrollbars;"+" setting showCustomScrollbars:true on this GridRenderer and using"+" the special 'NativeScrollbar' class as a scrollbarConstructor.");this.showCustomScrollbars=true;this.scrollbarConstructor="NativeScrollbar"}}
 this.setFastCellUpdates(this.fastCellUpdates)}
 ,isc.A.shouldShowAllColumns=function isc_GridRenderer_shouldShowAllColumns(){if(this.showAllColumns)return true;if(!this.fixedRowHeights&&!this.showAllRows)return true;if(this.overflow==isc.Canvas.VISIBLE){return true}
@@ -6247,9 +6249,9 @@
 ,isc.A.isEmpty=function isc_GridRenderer_isEmpty(){return false}
 ,isc.A.$27w=function isc_GridRenderer__showEmptyMessage(_1,_2){return this.getEmptyMessageHTML(_1,_2,this.grid.isOffline())}
 ,isc.A.getEmptyMessageHTML=function isc_GridRenderer_getEmptyMessageHTML(_1,_2,_3){if(!_3){if(!this.showEmptyMessage)return"&nbsp;"}else{if(!this.showOfflineMessage)return"&nbsp;"}
-if(this.isPrinting){if(_1==null)_1=0;if(_2==null)_2=this.fields?this.fields.getLength()-1:0;return"<TABLE cellspacing=0 style='width:100%' class='"+this.emptyMessageTableStyle+"'>"+this.grid.getPrintHeaders(_1,_2)+"<TR><TD  ALIGN=CENTER VALIGN=TOP class='"+(_3?this.offlineMessageStyle:this.emptyMessageStyle)+"' colspan='"+((_2-_1)+1)+"'>"+(_3?this.getOfflineMessage():this.getEmptyMessage())+"</TD></TR></TABLE>"}
+if(this.isPrinting){if(_1==null)_1=0;if(_2==null)_2=this.fields?this.fields.getLength()-1:0;return"<TABLE role='presentation' cellspacing=0 style='width:100%' class='"+this.emptyMessageTableStyle+"'>"+this.grid.getPrintHeaders(_1,_2)+"<TR><TD  ALIGN=CENTER VALIGN=TOP class='"+(_3?this.offlineMessageStyle:this.emptyMessageStyle)+"' colspan='"+((_2-_1)+1)+"'>"+(_3?this.getOfflineMessage():this.getEmptyMessage())+"</TD></TR></TABLE>"}
 var _4=this.getInnerWidth(),_5=0;if(this.expandEmptyMessageToMatchFields&&this.$26a){_5=this.$26a.sum()-_4;if(_5<0)_5=0}
-var _6=_5&&this.overflow!=isc.Canvas.VISIBLE;var _7=isc.StringBuffer.create();_7.append("<TABLE BORDER=0 MARGIN=0 CELLSPACING=0 CLASS='",this.emptyMessageTableStyle,"' style='width:",(_4+_5),"px;",(isc.Browser.isSafari?"height"+this.getInnerHeight()+":px;'":"' HEIGHT=100%"),"><TR><TD ALIGN=CENTER VALIGN=TOP CLASS='",(_3?this.offlineMessageStyle:this.emptyMessageStyle),"' style='padding-left:0px;padding-right:0px;'>",(_3?this.getOfflineMessage():this.getEmptyMessage()),(_5&&_6?"<br>"+isc.Canvas.spacerHTML(_4,1):null),"</TD>");if(_5&&_6){_7.append("<TD style='padding-left:0px;padding-right:0px;'>",isc.Canvas.spacerHTML(_5,1),"</TD>")}
+var _6=_5&&this.overflow!=isc.Canvas.VISIBLE;var _7=isc.StringBuffer.create();_7.append("<TABLE role='presentation' BORDER=0 MARGIN=0 CELLSPACING=0 CLASS='",this.emptyMessageTableStyle,"' style='width:",(_4+_5),"px;",(isc.Browser.isSafari?"height"+this.getInnerHeight()+":px;'":"' HEIGHT=100%"),"><TR><TD ALIGN=CENTER VALIGN=TOP CLASS='",(_3?this.offlineMessageStyle:this.emptyMessageStyle),"' style='padding-left:0px;padding-right:0px;'>",(_3?this.getOfflineMessage():this.getEmptyMessage()),(_5&&_6?"<br>"+isc.Canvas.spacerHTML(_4,1):null),"</TD>");if(_5&&_6){_7.append("<TD style='padding-left:0px;padding-right:0px;'>",isc.Canvas.spacerHTML(_5,1),"</TD>")}
 _7.append("</TR></TABLE>");return _7.release()}
 ,isc.A.getEmptyMessage=function isc_GridRenderer_getEmptyMessage(){return this.emptyMessage}
 ,isc.A.getOfflineMessage=function isc_GridRenderer_getOfflineMessage(){return this.grid.offlineMessage}
@@ -6348,45 +6350,47 @@
 if(!this.cacheDOM&&!this.isPrinting){_31.append("<DIV style='width:1px;");if(_43){_31.append("height:",_41,"px;overflow:hidden;")}
 if(_41==0)_31.append("display:none;");_31.append("' ");if(_13||this.isPrinting){_31.append(">")}else{_31.append(" ID="+this.getID()+"$28s>")}
 _31.append(isc.Canvas.spacerHTML(1,_41),"</DIV>")}
-if(!this.$568||_2==0){_31.append("<TABLE BORDER=0",_39,((!_13&&!this.isPrinting)?" ID="+this.getTableElementId():null),(this.tableStyle&&isc.Browser.isDOM?" CLASS='"+this.tableStyle+this.$ob:isc.$ad)," CELLSPACING=",this.cellSpacing," CELLPADDING=",this.cellPadding," STYLE='",(isc.Browser.isDOM&&!_38&&this.fixedColumnWidths?"table-layout:fixed;overflow:hidden;wrap:false;":""),(!_30?_37+(this.isRTL()?"-right: ":"-left:")+_34+"px;"+_37+(this.isRTL()?"-left:":"-right:")+_35+"px;":""),(this.cacheDOM&&this.$514>0?"margin-top:"+this.$514+"px;":""),(this.$27y!=null&&!(isc.Browser.isIE&&this.$r9)?"visibility:hidden;":""),"'>",(isc.Browser.isMoz?"<TBODY>":""));var _45=0,_46=0,_47=this.$54p();if(isc.Browser.isStrict&&(isc.Browser.isSafari||isc.Browser.isIE)){if((isc.Browser.isIE&&!isc.Browser.isIE8)||(isc.Browser.isSafari&&isc.Browser.safariVersion<530))
+if(!this.$568||_2==0){_31.append("<TABLE role='presentation' BORDER=0",_39,((!_13&&!this.isPrinting)?" ID="+this.getTableElementId():null),(this.tableStyle&&isc.Browser.isDOM?" CLASS='"+this.tableStyle+this.$ob:isc.$ad)," CELLSPACING=",this.cellSpacing," CELLPADDING=",this.cellPadding," STYLE='",(isc.Browser.isDOM&&!_38&&this.fixedColumnWidths?"table-layout:fixed;overflow:hidden;wrap:false;":""),(!_30?_37+(this.isRTL()?"-right: ":"-left:")+_34+"px;"+_37+(this.isRTL()?"-left:":"-right:")+_35+"px;":""),(this.cacheDOM&&this.$514>0?"margin-top:"+this.$514+"px;":""),(this.$27y!=null&&!(isc.Browser.isIE&&this.$r9)?"visibility:hidden;":""),"'>",(isc.Browser.isMoz?"<TBODY>":""));var _45=0,_46=0,_47=this.$54p();if(isc.Browser.isStrict&&(isc.Browser.isSafari||isc.Browser.isIE)){if((isc.Browser.isIE&&!isc.Browser.isIE8)||(isc.Browser.isSafari&&isc.Browser.safariVersion<530))
 {_46=this.$54q()}
 _45=(this.fixedRowHeights?0:this.cellPadding*2);_45+=(this.fixedRowHeights?isc.Element.$ym(_47):isc.Element.$yo(_47))}
 this.$28t=_45;this.$28u=_46;if(!_38&&isc.Browser.isDOM){for(var i=0;i<_28.length;i++){_31.append("<COL WIDTH=",(_33[_28[i]]-_46),">")}}
 _31.append("<TBODY>")}
-var _48=this.cellHeight,_49=(this.wrapCells?"":"<NOBR>"),_50=(this.wrapCells?"":"</NOBR>");var _51=0;if(isc.Browser.isDOM){var _52=this.$28v(_48);var _53=[];_53[0]="<TD";_53[3]=" ALIGN=";_53[17]=this.fastCellUpdates?"' ":"' CLASS=";if(!_13&&!this.isPrinting&&this.getCellElementId)_53[19]=" ID=";_53[23]=">"+_49;_53[30]=_50+(_52?"</DIV></TD>":"</TD>");var _54=1,_55=2,_56=4,_57=5,_58=6,_59=7,_60=10,_61=11,_62=18,_63=20,_64=21,_65=24;var _66="<TR",_67="</TR>",_68=">",_69=" HEIGHT=",_70=" VALIGN=";if(isc.Browser.isMobileWebkit)_66+=" onmousedown=\"return true;\"";if(isc.screenReader)_66+=" tabIndex=-1";var _71=[],_72=0,_73=[];this.$50d(_28,_38,_46,_52);if(this.isPrinting&&(!this.$568||_2==0)){_31.append(this.grid.getPrintHeaders(_26,_27))}
-for(var _74=_2;_74<_3;_74++){var _75=(!_13&&this.$28c==_74);var _76=this.getCellRecord(_74);var _77=_75||this.$282(_74,_76);_31.append(_66);if(!_13&&!this.isPrinting&&this.getRowElementId){_31.append(" ID=",this.getRowElementId(_74,_74-_2))}
-_31.append(_68);var _78=_75?this.$28f:(this.getRowHeight!=null?this.getRowHeight(_76,_74):_48);var _79;if(_75){_79=true}else{_79=this.fixedRowHeights;if(_79&&this.shouldFixRowHeight!=null){_79=(this.shouldFixRowHeight(_76,_74)!=false)}}
-if(_79){_53[_54]=_69;_53[_55]=_78-_45;_53[_60]=null}else{_53[_54]=null;_53[_55]=null;if(!_77&&_78==this.cellHeight&&!this.fixedRowHeights)
-{_53[_60]=null}else{_53[_60]=this.$281(_76,_74)}}
-if(_52){_53[_64]=">"+this.$27s+this.$283(_78,_76,_74,_75)}
-var _80=_77?this.$67p(_76,_74,_26,_27):null;for(var i=0;i<_28.length;i++){_1=_28[i];var _81=_32[_1],_82=_76;if(_82==null)_82=this.getCellRecord(_74,_1);if(_71[_1]>0){_81.$28w[_74]=_73[_1];_71[_1]--;if(_71[_1]==0){_72--;_73[_1]=null}
+var _48=this.cellHeight,_49=(this.wrapCells?"":"<NOBR>"),_50=(this.wrapCells?"":"</NOBR>");var _51=0;if(isc.Browser.isDOM){var _52=this.$28v(_48);var _53=[];_53[0]="<TD";_53[3]=" ALIGN=";_53[17]=this.fastCellUpdates?"' ":"' CLASS=";if(!_13&&!this.isPrinting&&this.getCellElementId)_53[19]=" ID=";_53[23]=">"+_49;_53[30]=_50+(_52?"</DIV></TD>":"</TD>");var _54=1,_55=2,_56=4,_57=5,_58=6,_59=7,_60=9,_61=10,_62=11,_63=18,_64=20,_65=21,_66=24;var _67="<TR",_68="</TR>",_69=">",_70=" HEIGHT=",_71=" VALIGN=";if(isc.Browser.isMobileWebkit)_67+=" onmousedown=\"return true;\"";if(isc.screenReader)_67+=" tabIndex=-1";var _72=isc.Canvas.ariaEnabled();var _73=[],_74=0,_75=[];this.$50d(_28,_38,_46,_52);if(this.isPrinting&&(!this.$568||_2==0)){_31.append(this.grid.getPrintHeaders(_26,_27))}
+for(var _76=_2;_76<_3;_76++){var _77=(!_13&&this.$28c==_76);var _78=this.getCellRecord(_76);var _79=_77||this.$282(_76,_78);_31.append(_67);if(!_13&&!this.isPrinting&&this.getRowElementId){_31.append(" ID=",this.getRowElementId(_76,_76-_2))}
+if(_72&&this.getRowRole!=null){var _80=this.getRowRole(_76,_78);if(_80!=null)_31.append(" role='",_80,"'");var _81=this.getRowAriaState(_76,_78);if(_81)_31.append(isc.Canvas.getAriaStateAttributes(_81))}
+_31.append(_69);var _82=_77?this.$28f:(this.getRowHeight!=null?this.getRowHeight(_78,_76):_48);var _83;if(_77){_83=true}else{_83=this.fixedRowHeights;if(_83&&this.shouldFixRowHeight!=null){_83=(this.shouldFixRowHeight(_78,_76)!=false)}}
+if(_83){_53[_54]=_70;_53[_55]=_82-_45;_53[_61]=null}else{_53[_54]=null;_53[_55]=null;if(!_79&&_82==this.cellHeight&&!this.fixedRowHeights)
+{_53[_61]=null}else{_53[_61]=this.$281(_78,_76)}}
+if(_52){_53[_65]=">"+this.$27s+this.$283(_82,_78,_76,_77)}
+var _84=_79?this.$67p(_78,_76,_26,_27):null;for(var i=0;i<_28.length;i++){_1=_28[i];var _85=_32[_1],_86=_78;if(_86==null)_86=this.getCellRecord(_76,_1);if(_73[_1]>0){_85.$28w[_76]=_75[_1];_73[_1]--;if(_73[_1]==0){_74--;_75[_1]=null}
 continue}
-_53[_56]=this.getCellAlign(_76,_81,_74,_1);var _83=this.getCellVAlign(_76,_81,_74,_1);if(_83!=null){_53[_57]=_70
-_53[_58]=_83}
-if(_80!=null&&(_1==_80[0])){_51++;_53[_59]=this.$67q(_80[1]-_80[0]);if(_52){_53[_64+1]=this.$ob}}else{_53[_59]=_81.$28x;if(this.getRowSpan){var _84=this.getRowSpan(_76,_74,_1);if(_84>1){var _85=" ROWSPAN="+_84;if(_53[_56]!=null)
-_53[_56]+=_85;else
-_53[_56]=_85;_71[_1]=_84-1;_72++;_73[_1]=_74;if(_81.$28w==null)_81.$28w={};_81.$28w[_74]=_74}}
-if(_52){_53[_64+1]=_81.$28y}else{_53[_64+1]=null}}
-var _86=this.getCellStyle(_76,_74,_1),_87=(this.getCellCSSText?this.getCellCSSText(_76,_74,_1):null);if(_75){var _88="padding:0px;border:0px;";if(_87)_87+=";"+_88
-else _87=_88}
-if(!this.fastCellUpdates){_53[_61]=_87
-_53[_62]=_86}else{var _89=this.$77d(_86);_53[_61]=_89;_53[_61+1]=_87}
-if(_75){this.$28q=true;var _90=this.getTableHTML(null,this.$28c,this.$28e);delete this.$28q;if(!_52){_53[_65]=isc.SB.concat(this.$27s,this.$283(_78,_76,_74,_75),this.$ob,this.$oa,_90,"</DIV>")}else{_53[_65]=_90}}else
-_53[_65]=this.$22k(_76,_74,_1);if(!_13&&this.getCellElementId){_53[_63]=this.getCellElementId(_74,_74-_2,_1,_1-_26)}
-_31.append(_53);if(!_13&&_82!=null&&_82.$29a!=null){if(_82.$29a[0]&&_82.$29a[0].rowNum==null)
-{this.updateEmbeddedComponentCoords(_82.$29a,_82,_74,_1)}}
-if(_77&&(_1==_80[0])){i+=_80[1]-_80[0]}}
-_31.append(_67);if(this.isPrinting&&_76.$29a!=null){var _91=_76.$29a;for(var _92=0;_92<_91.length;_92++){var _93=_91[_92];if(_93.$57n==null&&_93.$80t!=null){_31.append(_66,_68,'<td colspan="',_29,'">',_93.$80t,"</td>",_67);delete _93.$80t}}}
-if(_75){_74=this.$28e-1}}}
-if(!this.$568||_3==this.getTotalRows())_31.append("</TABLE>");var _94=_15-_3,_95=(!_13&&this.$60s);var _96=this.cacheDOM?0:(this.endSpace||0);this.$515=0;if(!this.showAllRows&&(_94!=0||_95)){var _97=_94*this.getAvgRowHeight();if(_95&&_94==0){var _98=this.getViewportHeight();if(_97<_98){_97=_98}}
-this.$515=_97;_96+=this.$515}
-if(!this.cacheDOM&&!this.isPrinting){_31.append("<DIV style='width:1px;");if(_43){_31.append("height:",_96,"px;overflow:hidden;")}
-if(_96==0)_31.append("display:none;");_31.append("' ");if(_13||this.isPrinting){_31.append(">")}else{_31.append(" ID="+this.getID()+"$284>")}
-_31.append(isc.Canvas.spacerHTML(1,_96),"</DIV>")}
-if(this.logIsDebugEnabled("gridHTML")){var _99=(isc.timeStamp()-_7),_100=(_29*(_3-_2)),_101=(_99/ _100),_102=(1000/_101);if(_101.toFixed!=null)_101=_101.toFixed(2);if(_102.toFixed!=null)_102=_102.toFixed(2);this.logDebug("getTableHTML: columns "+(_4?_28:_26+"->"+(_27-1))+", rows "+_2+"->"+(_3-1)+", time: "+_99+"ms ("+_100+" cells at "+_101+"ms per cell, "+_102+" cells per second), "+"spacerHeights: ["+[_41,_96]+"], "+"left/right pad: ["+[_34,_35]+"], "+_51+" single cell rows","gridHTML")}
-var _103=_31.release();if(_6){if(_5!=null){this.fireCallback(_5,"HTML,callback",[_103,_5])}
-return null}
-return _103}
+_53[_56]=this.getCellAlign(_78,_85,_76,_1);var _87=this.getCellVAlign(_78,_85,_76,_1);if(_87!=null){_53[_57]=_71
+_53[_58]=_87}
+if(_84!=null&&(_1==_84[0])){_51++;_53[_59]=this.$67q(_84[1]-_84[0]);if(_52){_53[_65+1]=this.$ob}}else{_53[_59]=_85.$28x;if(this.getRowSpan){var _88=this.getRowSpan(_78,_76,_1);if(_88>1){var _89=" ROWSPAN="+_88;if(_53[_56]!=null)
+_53[_56]+=_89;else
+_53[_56]=_89;_73[_1]=_88-1;_74++;_75[_1]=_76;if(_85.$28w==null)_85.$28w={};_85.$28w[_76]=_76}}
+if(_72&&this.getCellRole!=null){var _90=this.getCellRole(_76,_1,_78);if(_90!=null){var _91=this.getCellAriaState(_76,_1,_78);_53[_60]=" role='"+_90+(_91?isc.Canvas.getAriaStateAttributes(_91):"")}else{_53[_60]=null}}
+if(_52){_53[_65+1]=_85.$28y}else{_53[_65+1]=null}}
+var _92=this.getCellStyle(_78,_76,_1),_93=(this.getCellCSSText?this.getCellCSSText(_78,_76,_1):null);if(_77){var _94="padding:0px;border:0px;";if(_93)_93+=";"+_94
+else _93=_94}
+if(!this.fastCellUpdates){_53[_62]=_93
+_53[_63]=_92}else{var _95=this.$77d(_92);_53[_62]=_95;_53[_62+1]=_93}
+if(_77){this.$28q=true;var _96=this.getTableHTML(null,this.$28c,this.$28e);delete this.$28q;if(!_52){_53[_66]=isc.SB.concat(this.$27s,this.$283(_82,_78,_76,_77),this.$ob,this.$oa,_96,"</DIV>")}else{_53[_66]=_96}}else
+_53[_66]=this.$22k(_78,_76,_1);if(!_13&&this.getCellElementId){_53[_64]=this.getCellElementId(_76,_76-_2,_1,_1-_26)}
+_31.append(_53);if(!_13&&_86!=null&&_86.$29a!=null){if(_86.$29a[0]&&_86.$29a[0].rowNum==null)
+{this.updateEmbeddedComponentCoords(_86.$29a,_86,_76,_1)}}
+if(_79&&(_1==_84[0])){i+=_84[1]-_84[0]}}
+_31.append(_68);if(this.isPrinting&&_78.$29a!=null){var _97=_78.$29a;for(var _98=0;_98<_97.length;_98++){var _99=_97[_98];if(_99.$57n==null&&_99.$80t!=null){_31.append(_67,_69,'<td colspan="',_29,'">',_99.$80t,"</td>",_68);delete _99.$80t}}}
+if(_77){_76=this.$28e-1}}}
+if(!this.$568||_3==this.getTotalRows())_31.append("</TABLE>");var _100=_15-_3,_101=(!_13&&this.$60s);var _102=this.cacheDOM?0:(this.endSpace||0);this.$515=0;if(!this.showAllRows&&(_100!=0||_101)){var _103=_100*this.getAvgRowHeight();if(_101&&_100==0){var _104=this.getViewportHeight();if(_103<_104){_103=_104}}
+this.$515=_103;_102+=this.$515}
+if(!this.cacheDOM&&!this.isPrinting){_31.append("<DIV style='width:1px;");if(_43){_31.append("height:",_102,"px;overflow:hidden;")}
+if(_102==0)_31.append("display:none;");_31.append("' ");if(_13||this.isPrinting){_31.append(">")}else{_31.append(" ID="+this.getID()+"$284>")}
+_31.append(isc.Canvas.spacerHTML(1,_102),"</DIV>")}
+if(this.logIsDebugEnabled("gridHTML")){var _105=(isc.timeStamp()-_7),_106=(_29*(_3-_2)),_107=(_105/ _106),_108=(1000/_107);if(_107.toFixed!=null)_107=_107.toFixed(2);if(_108.toFixed!=null)_108=_108.toFixed(2);this.logDebug("getTableHTML: columns "+(_4?_28:_26+"->"+(_27-1))+", rows "+_2+"->"+(_3-1)+", time: "+_105+"ms ("+_106+" cells at "+_107+"ms per cell, "+_108+" cells per second), "+"spacerHeights: ["+[_41,_102]+"], "+"left/right pad: ["+[_34,_35]+"], "+_51+" single cell rows","gridHTML")}
+var _109=_31.release();if(_6){if(_5!=null){this.fireCallback(_5,"HTML,callback",[_109,_5])}
+return null}
+return _109}
 ,isc.A.gotComponentPrintHTML=function isc_GridRenderer_gotComponentPrintHTML(_1,_2){var _3=_2.context,_4=_3.component;if(_3.asyncCallback==null){return}
 _4.$80t=_1;return this.getTableHTML(_3.colNum,_3.startRow,_3.endRow,_3.discreteCols,_3.asyncCallback,true)}
 ,isc.A.$77d=function isc_GridRenderer__getEscapedStyleText(_1){if(this.$77c[_1]!=null)return this.$77c[_1];var _2=isc.Element.getStyleText(_1,true);this.$77c[_1]=_2.replaceAll("'",'"');return this.$77c[_1]}
@@ -6689,7 +6693,7 @@
 this.$t6()}}
 ,isc.A.clear=function isc_GridRenderer_clear(){this.Super("clear",arguments);this.$29j();delete this.$50v}
 ,isc.A.$29j=function isc_GridRenderer__clearTableCache(){this.$29g=null;this.$29f=null;delete this.$29o;delete this.$293;delete this.$8s;this.$250=false}
-);isc.B._maxIndex=isc.C+176;isc.GridRenderer.$294={getCellRecord:"rowNum,colNum",getCellValue:"record,rowNum,colNum,gridBody",findRowNum:"record",findColNum:"record",getBaseStyle:"record,rowNum,colNum",getCellStyle:"record,rowNum,colNum",getCellCSSText:"record,rowNum,colNum",cellIsEnabled:"rowNum,colNum",getRowHeight:"record,rowNum",getRowSpan:"record,rowNum,colNum",cellOut:"record,rowNum,colNum",cellOver:"record,rowNum,colNum",rowOut:"record,rowNum,colNum",rowOver:"record,rowNum,colNum",cellMove:"record,rowNum,colNum",rowMove:"record,rowNum,colNum",cellContextClick:"record,rowNum,colNum",rowContextClick:"record,rowNum,colNum",recordContextClick:"record,recordNum,fieldNum",cellMouseDown:"record,rowNum,colNum",rowMouseDown:"record,rowNum,colNum",recordMouseDown:"recordNum,fieldNum",cellMouseUp:"record,rowNum,colNum",rowMouseUp:"record,rowNum,colNum",recordMouseUp:"recordNum,fieldNum",selectOnMouseDown:"record,rowNum,colNum",selectOnRightMouseDown:"record,rowNum,colNum",selectOnMouseUp:"record,rowNum,colNum",cellClick:"record,rowNum,colNum",cellDoubleClick:"record,rowNum,colNum",rowClick:"record,rowNum,colNum",rowDoubleClick:"record,rowNum,colNum",cellHover:"record,rowNum,colNum",rowHover:"record,rowNum,colNum",cellHoverHTML:"record,rowNum,colNum",getCellHoverComponent:"record,rowNum,colNum",selectionChanged:"record,state",selectionUpdated:"record,recordList",cellSelectionChanged:"cellList",getRowElementId:"rowNum,physicalRowNum",getCellElementId:"rowNum,physicalRowNum,colNum,physicalColNum",shouldFixRowHeight:"record,rowNum",updateEmbeddedComponentZIndex:"component",updateEmbeddedComponentCoords:"component,record,rowNum,colNum"};isc.GridRenderer.registerStringMethods(isc.GridRenderer.$294);isc.ClassFactory.defineClass("ListGrid","Canvas","DataBoundComponent");isc.addGlobal("ListViewer",isc.ListGrid);isc.defineClass("GridBody",isc.GridRenderer);isc.A=isc.GridBody.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.adjustOverflowWhileDirty=false;isc.A.expandEmptyMessageToMatchFields=true;isc.B.push(isc.A.adjustOverflow=function isc_GridBody_adjustOverflow(_1,_2,_3,_4,_5){if(this.$80o)return;var _6=this.grid;if(_6==null)return this.Super("adjustOverflow",arguments);var _7=_6.data,_8=false;;if(isc.isA.ResultSet(_7)&&!_7.lengthIsKnown()){if(_6.emptyMessageHeight==null){return this.invokeSuper(isc.GridBody,"adjustOverflow",_1,_2,_3,_4,_5)}
+);isc.evalBoundary;isc.B.push();isc.B._maxIndex=isc.C+176;isc.GridRenderer.$294={getCellRecord:"rowNum,colNum",getCellValue:"record,rowNum,colNum,gridBody",findRowNum:"record",findColNum:"record",getBaseStyle:"record,rowNum,colNum",getCellStyle:"record,rowNum,colNum",getCellCSSText:"record,rowNum,colNum",cellIsEnabled:"rowNum,colNum",getRowHeight:"record,rowNum",getRowSpan:"record,rowNum,colNum",cellOut:"record,rowNum,colNum",cellOver:"record,rowNum,colNum",rowOut:"record,rowNum,colNum",rowOver:"record,rowNum,colNum",cellMove:"record,rowNum,colNum",rowMove:"record,rowNum,colNum",cellContextClick:"record,rowNum,colNum",rowContextClick:"record,rowNum,colNum",recordContextClick:"record,recordNum,fieldNum",cellMouseDown:"record,rowNum,colNum",rowMouseDown:"record,rowNum,colNum",recordMouseDown:"recordNum,fieldNum",cellMouseUp:"record,rowNum,colNum",rowMouseUp:"record,rowNum,colNum",recordMouseUp:"recordNum,fieldNum",selectOnMouseDown:"record,rowNum,colNum",selectOnRightMouseDown:"record,rowNum,colNum",selectOnMouseUp:"record,rowNum,colNum",cellClick:"record,rowNum,colNum",cellDoubleClick:"record,rowNum,colNum",rowClick:"record,rowNum,colNum",rowDoubleClick:"record,rowNum,colNum",cellHover:"record,rowNum,colNum",rowHover:"record,rowNum,colNum",cellHoverHTML:"record,rowNum,colNum",getCellHoverComponent:"record,rowNum,colNum",selectionChanged:"record,state",selectionUpdated:"record,recordList",cellSelectionChanged:"cellList",getRowElementId:"rowNum,physicalRowNum",getCellElementId:"rowNum,physicalRowNum,colNum,physicalColNum",shouldFixRowHeight:"record,rowNum",updateEmbeddedComponentZIndex:"component",updateEmbeddedComponentCoords:"component,record,rowNum,colNum",getRowRole:"rowNum,record",getRowAriaState:"rowNum,record",getCellRole:"rowNum,colNum,record",getCellAriaState:"rowNum,colNum,record"};isc.GridRenderer.registerStringMethods(isc.GridRenderer.$294);isc.ClassFactory.defineClass("ListGrid","Canvas","DataBoundComponent");isc.addGlobal("ListViewer",isc.ListGrid);isc.defineClass("GridBody",isc.GridRenderer);isc.A=isc.GridBody.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.adjustOverflowWhileDirty=false;isc.A.expandEmptyMessageToMatchFields=true;isc.B.push(isc.A.adjustOverflow=function isc_GridBody_adjustOverflow(_1,_2,_3,_4,_5){if(this.$80o)return;var _6=this.grid;if(_6==null)return this.Super("adjustOverflow",arguments);var _7=_6.data,_8=false;;if(isc.isA.ResultSet(_7)&&!_7.lengthIsKnown()){if(_6.emptyMessageHeight==null){return this.invokeSuper(isc.GridBody,"adjustOverflow",_1,_2,_3,_4,_5)}
 _8=true}
 var _9=(this.autoFitData=="both"),_10=_9,_11=_6&&_6.frozenFields!=null,_12=_11&&_6&&(_6.frozenBody==this);if(!_9)_9=(this.autoFitData=="vertical");if(!_10)_10=(this.autoFitData=="horizontal");if(_10||_9){var _13,_14,_15,_16,_17,_18,_19;if(_9){var _20=this.grid.getAutoFitMinBodyHeight();_13=_20;var _21=_8?0:this.getTotalRows(),_22=_21;_15=0;if(this.autoFitMaxRecords)_22=Math.min(_22,this.autoFitMaxRecords);if(_22>0){var _23=this.$26b();var _24=this.$252,_25=this.$253;if(this.$252==null){_24=_22;_25=_22}
 if(_24>0){_24=Math.min(_24,_22);for(var i=0;i<_24;i++){_15+=this.getRowHeight?this.getRowHeight(i):this.cellHeight}}
@@ -7987,7 +7991,7 @@
 delete _3.$33i}
 ,isc.A.$31n=function isc_ListGrid__remapEditRows(_1){delete this.$33j;delete this.$33q;if(this.$52b==null)return false;var _2=false;var _3=this.getEditRow(),_4=this.getEditCol(),_5=false;var _6=this.data.getLength(),_7={};var _8=isc.getKeys(this.$52b);for(var i=0;i<_8.length;i++){var _10=_8[i],_11=this.$52b[_10];var _12=_11.$24t;var _13=this.$52p(_11,_6);if(_11.$33b==null)_6++;if(_13==null)continue;var _14=_13[0],_15=_13[1];if(_14!=null&&_14>=0){if(_14!=_12)_2=true;if(_3!=null&&_3==_11.$24t&&(!this.useCellRecords||(_4==_11.$24u)))
 {_5=true;if(!_1)this.$50s(_14,_15,"remapEditRows")}
-_7[_14]=_10;_11.$24t=_14;if(this.useCellRecords)_11.$24u=_15}else{if(_12!=null&&_12>=0)_2=true;var _16=this.getOriginalData();var _17=!this.dataSource||this.saveLocally||(isc.ResultSet&&isc.isA.ResultSet(_16)&&_16.allRowsCached());if(_17&&(!this.isGrouped||!this.data.find(_11.$33b)))
+_7[_14]=_10;_11.$24t=_14;if(this.useCellRecords)_11.$24u=_15}else{if(_12!=null&&_12>=0)_2=true;var _16=this.getOriginalData();var _17=!this.dataSource||this.saveLocally||(isc.ResultSet&&isc.isA.ResultSet(_16)&&_16.allRowsCached());if(_17&&!isc.isA.Tree(this.data)&&(!this.isGrouped||!this.data.find(_11.$33b)))
 {this.logWarn("Record:"+this.echo(_11.$33b)+", is no longer present in this List.<br>Clearing edit values for this record.");delete this.$52b[this.getEditValuesID(_10)]}else{this.logWarn("Record:"+this.echo(_11.$33b)+(_17?", hidden in grouped tree data. ":", lost from local cache in paged result set. ")+"Pending edits for this record will be maintained.");delete _11.$24t;delete _11.$24u;this.$33q=true}}}
 this.$33a=_7;if(_3!=null&&!_5&&!_1){this.hideInlineEditor(true)}
 return _2}
@@ -8651,7 +8655,7 @@
 var _2=[],_3;if(this.$73p){for(var i=0;i<this.$73p.length;i++){var _5=this.$73p[i],_6=_1?_1.find("property",_5.property):null;if(!_6){_2.add(isc.shallowClone(_5));if(this.logIsInfoEnabled("sorting")){this.logInfo("In setSort - marking field "+_5.property+" for removal","sorting")}}}}
 this.$73p=_1||[];if(!this.$73p||this.$73p.length==0){if(this.logIsInfoEnabled("sorting"))
 this.logInfo("null or zero-length sortSpecifiers - unsorting only","sorting")}
-for(var i=0;i<this.$73p.length;i++){var _7=this.$73p[i],_6=_1,_8=this.getUnderlyingField(_7.property),_9=this.getField(_7.property),_10=null;if(_8){if(_9){if(!_3)_3=_9}
+for(var i=0;i<this.$73p.length;i++){var _7=this.$73p[i],_8=this.getUnderlyingField(_7.property),_9=this.getField(_7.property),_10=null;if(_8){if(_9){if(!_3)_3=_9}
 if(!_7.normalizer){if(_8.sortNormalizer){_10=_8.sortNormalizer}else if(_8.valueMap){_10=isc.isA.String(_8.valueMap)?this.getGlobalReference(_8.valueMap):_8.valueMap}else if(_8.type!=null){_10=_8.type}
 _7.normalizer=_10}
 if(_7.direction==null)_7.direction="ascending";if(_3&&_3==_9)_7.primarySort=true;if(_7.primarySort){this.sortDirection=Array.shouldSortAscending(_7.direction)}
@@ -8665,12 +8669,14 @@
 this.data.sortByProperty(_11.property,Array.shouldSortAscending(_11.direction),_11.normalizer,_11.context)}}else{if(this.logIsInfoEnabled("sorting")){this.logInfo("In setSort - not sorting:\nthis.data is"+this.echoAll(this.data),"sorting")}}}else{if(this.data){if(this.data.setSort!=null)this.data.setSort([]);else if(this.data.unsort)this.data.unsort()}
 if(this.invalidateCacheOnUnsort){this.invalidateCache()}}
 var _16=(this.header&&isc.isA.Toolbar(this.header));if(_2){if(_2.length>0){if(this.logIsInfoEnabled("sorting")){this.logInfo("In setSort - Removing sort-media from now unsorted fields:\n"+isc.echoAll(_2),"sorting")}}
-for(var i=0;i<_2.length;i++){var _17=_2[i],_8=this.getSpecifiedField(_17.property),_18=this.getFieldNum(_17.property);if(!_8){var _19=this.getFields();_8=_19.find("displayField",_17.property);_18=this.getFieldNum(_8)}
-if(_8)delete _8.sortDirection;if(_18>=0&&_16){var _20=this.getFieldHeaderButton(_18);if(_20)_20.setTitle(_20.getTitle())}}}
-if(this.$73p&&this.$73p.length>0){this.logInfo("In setSort - Setting sort-media for sorted fields:\n"+isc.echoAll(this.$73p),"sorting");var _21=false;for(var i=0;i<this.$73p.length;i++){var _17=this.$73p[i],_8=this.getSpecifiedField(_17.property),_18=this.getFieldNum(_17.property);if(!_8){var _19=this.getFields();_8=_19.find("displayField",_17.property);_18=this.getFieldNum(_8)}
-if(_8)_8.sortDirection=Array.shouldSortAscending(_17.direction);if(_16&&_18>=0){var _22=this.getFieldHeader(_18),_20=this.getFieldHeaderButton(_18);if(_20){if(!_21){_22.selectButton(_20);_21=true}
-_20.setTitle(this.getHeaderButtonTitle(_20))}}}}else if(_16){var _23;if(this.header){_23=this.header.getSelectedButton();if(_23)_23.deselect()}
-if(this.frozenHeader){_23=this.frozenHeader.getSelectedButton();if(_23)_23.deselect()}}
+for(var i=0;i<_2.length;i++){var _17=_2[i],_8=this.getSpecifiedField(_17.property),_18=[];if(_8){_18.add(_8);if(this.logIsInfoEnabled("sorting")){this.logInfo("In setSort, removing sort-media for fieldName '"+_8.name+"'","sorting")}}
+var _19=this.getFields();if(_19){var _20=_19.findAll("displayField",_17.property);if(_20){_18.addList(_20);if(this.logIsInfoEnabled("sorting")){this.logInfo("In setSort, removing sort-media for fields with displayField "+"'"+_8.name+"' - these are: "+isc.echoFull(_20.getProperty("name").join(", ")),"sorting")}}}
+for(var j=0;j<_18.length;j++){var _22=_18[j],_23=this.getFieldNum(_22.name);if(_22)delete _22.sortDirection;if(_23>=0&&_16){var _24=this.getFieldHeaderButton(_23);if(_24)_24.setTitle(_24.getTitle())}}}}
+if(this.$73p&&this.$73p.length>0){this.logInfo("In setSort - Setting sort-media for sorted fields:\n"+isc.echoAll(this.$73p),"sorting");var _25=false;for(var i=0;i<this.$73p.length;i++){var _17=this.$73p[i],_8=this.getSpecifiedField(_17.property),_18=[];if(_8){_18.add(_8);if(this.logIsInfoEnabled("sorting")){this.logInfo("In setSort, adding sort-media for fieldName '"+_8.name+"'","sorting")}}
+var _19=this.getFields();if(_19){var _20=_19.findAll("displayField",_17.property);if(_20){_18.addList(_20);if(this.logIsInfoEnabled("sorting")){this.logInfo("In setSort, adding sort-media for fields with displayField "+"'"+_8.name+"' - these are: "+isc.echoFull(_20.getProperty("name").join(", ")),"sorting")}}}
+for(var j=0;j<_18.length;j++){var _22=_18[j],_23=this.getFieldNum(_22.name);if(_22)_22.sortDirection=Array.shouldSortAscending(_17.direction);if(_16&&_23>=0){var _26=this.getFieldHeader(_23),_24=this.getFieldHeaderButton(_23);if(_24){if(!_25){_26.selectButton(_24);_25=true}
+_24.setTitle(this.getHeaderButtonTitle(_24))}}}}}else if(_16){var _27;if(this.header){_27=this.header.getSelectedButton();if(_27)_27.deselect()}
+if(this.frozenHeader){_27=this.frozenHeader.getSelectedButton();if(_27)_27.deselect()}}
 if(_13>=0){if(this.logIsInfoEnabled("sorting")){this.logInfo("In setSort - $600 called with fieldNum: "+_13+" - sortField is now: "+this.sortField+"\ngetSortState() now returns: "+isc.echoAll(this.getSortState()),"sorting")}}
 if(this.sorter){this.sorter.setTitle(this.sorter.getTitle())}
 if(this.body&&this.showRecordComponents)delete this.body.$74k;this.$25a(this.$73y);if(this.logIsInfoEnabled("sorting"))this.logInfo("Leaving setSort","sorting");this.handleSortChanged(this.$73p);return true}
@@ -8795,7 +8801,7 @@
 return this.Super("placeEmbeddedComponent",arguments)}
 );isc.B._maxIndex=isc.C+5;isc.A=isc.TreeGrid;isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.TREE_FIELD={name:"nodeTitle",treeField:true,getCellValue:function(_1,_2,_3,_4){if(!_1.getNodeTitle){var _5=_4==null?null:_1.getFieldName(_4);return _2==null||_5==null?null:_2[_5]}
 return _1.getNodeTitle(_2,_3,this)},canFilter:false,getFieldTitle:function(_1,_2){var _3=_1.getField(_2);if(_3.name=="nodeTitle")return _1.treeFieldTitle;return _3.title||_3.name}};isc.B.push(isc.A.$82d=function isc_c_TreeGrid__getTreeCellTemplate(){if(!this.$819){isc.Canvas.$816.add({target:this,methodName:"$82a"});this.$819=true}
-if(this.$34p==null){this.$34p=["<table cellpadding=0 cellspacing=0 class='",,"' style='",,isc.Canvas.$42a+"'><tr><td style='",,isc.Canvas.$42a+"' class='",,"'>",,"</td>"]}
+if(this.$34p==null){this.$34p=["<table role='presentation' cellpadding=0 cellspacing=0 class='",,"' style='",,isc.Canvas.$42a+"'><tr><td style='",,isc.Canvas.$42a+"' class='",,"'>",,"</td>"]}
 return this.$34p}
 ,isc.A.$82e=function isc_c_TreeGrid__getTreeCellTitleTemplate(){if(!this.$819){isc.Canvas.$816.add({target:this,methodName:"$82a"});this.$819=true}
 if(this.$34q==null){this.$34q=["<td style='",,";"+isc.Canvas.$42a+"' class='",,"'>"+(isc.Browser.isSafari||isc.Browser.isIE?"<nobr>":""),,,,(isc.Browser.isSafari?"</nobr>":"")+"</td><td style='",,";"+isc.Canvas.$42a+"padding-left:",,"px;' class='",,"'>",,,"</td>"]}
@@ -8911,7 +8917,7 @@
 this.$67k[0].noRemove=true;var _10=isc.rpc.startQueue();for(var i=0;i<_1.length;i++){var _15={};var _25=_9.getPrimaryKeyFieldNames();for(var j=0;j<_25.length;j++){_15[_25[j]]=_1[i][_25[j]]}
 if(_20){_15[_21.parentIdField]=_2[_21.idField]}
 isc.addProperties(_15,this.getDropValues(_15,_9,_2,_3,_4));this.updateDataViaDataSource(_15,_9,null,_4)}}else{var _10=isc.rpc.startQueue();for(var i=0;i<_1.length;i++){var _27=_1[i],_28=this.data;if(_28){_27[_28.parentIdField]=_2[_28.idField]}
-isc.addProperties(_15,this.getDropValues(_27,_9,_2,_3,_4));this.$61d(_27,_9,_4,null,_3,_2)}}}else{for(var i=0;i<_1.length;i++){this.$61d(_1[i],_9,_4,null,_3,_2)}}
+isc.addProperties(_27,this.getDropValues(_27,_9,_2,_3,_4));this.$61d(_27,_9,_4,null,_3,_2)}}}else{for(var i=0;i<_1.length;i++){this.$61d(_1[i],_9,_4,null,_3,_2)}}
 if(!this.$67l){isc.Log.logDebug("Invoking transferDragData from inside transferNodes - no server "+"queries needed?","dragDrop");_4.transferDragData(this.$67n,this);if(_8){if(!this.$67o)isc.rpc.sendQueue()}}
 this.$67m=false}
 ,isc.A.$67w=function isc_TreeGrid__updateComplete(_1,_2,_3){if(!_3.dragTree)return;if(_3.newParentNode!=this.data.root&&_3.dragTree.getParent(_3.newParentNode)==null)
@@ -9895,7 +9901,7 @@
 );isc.B._maxIndex=isc.C+17;isc._moduleEnd=isc._Grids_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('Grids module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'Grids'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-06-02 (2011-06-02)
+ * Version SC_SNAPSHOT-2011-06-06 (2011-06-06)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -9906,7 +9912,7 @@
 
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-06-02 (2011-06-02)
+ * Version SC_SNAPSHOT-2011-06-06 (2011-06-06)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -10144,7 +10150,7 @@
 isc.ClassFactory.defineClass("DynamicForm","Canvas","DataBoundComponent");isc.addGlobal("FormLayout",isc.DynamicForm);isc.A=isc.DynamicForm;isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.GET="GET";isc.A.POST="POST";isc.A.NORMAL="normal";isc.A.MULTIPART="multipart";isc.A.NORMAL_ENCODING="application/x-www-form-urlencoded";isc.A.MULTIPART_ENCODING="multipart/form-data";isc.A.$89="$89";isc.A.$9a="$9a";isc.A.$9b="$9b";isc.A.$9c="$9d";isc.A.$9e="$9f";isc.A.$9g="$9g";isc.B.push(isc.A.buildOperatorIndex=function isc_c_DynamicForm_buildOperatorIndex(){var _1=isc.getValues(isc.DataSource.getSearchOperators());_1=_1.sortByProperties(["symbol"],[false],[function(_4,_5,_6){var _2=_4[_5],_3=isc.isA.String(_2)?_2.length:0;return _3}]);this.$85l=_1.makeIndex("symbol",true)}
 ,isc.A.getOperatorIndex=function isc_c_DynamicForm_getOperatorIndex(){return this.$85l}
 );isc.B._maxIndex=isc.C+2;isc.A=isc.DynamicForm.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.flattenItems=false;isc.A.numCols=2;isc.A.fixedColWidths=false;isc.A.fixedRowHeights=false;isc.A.colWidths=null;isc.A.minColWidth=20;isc.A.cellSpacing=0;isc.A.cellPadding=2;isc.A.cellBorder=0;isc.A.defaultRowHeight=22;isc.A.sectionVisibilityMode="multiple";isc.A.allowContentAndChildren=true;isc.A.separateContentInsertion=true;isc.A.$r9=true;isc.A.fieldIdProperty="name";isc.A.titleField="title";isc.A.showDetailFields=true;isc.A.longTextEditorThreshold=255;isc.A.longTextEditorType="textArea";isc.A.titlePrefix="";isc.A.rightTitlePrefix=":&nbsp;";isc.A.titleSuffix="&nbsp;:";isc.A.rightTitleSuffix="";isc.A.titleWidth=100;isc.A.showInlineErrors=true;isc.A.showErrorIcons=true;isc.A.showErrorText=false;isc.A.showErrorStyle=true;isc.A.errorOrientation="left";isc.A.errorItemDefaults={type:"blurb",wrap:true,showIf:function(){return!this.form.showInlineErrors&&this.form.hasErrors()},defaultDynamicValue:function(_1,_2,_3){return _2.getErrorsHTML(_2.getErrors())}};isc.A.errorItemCellStyle="formCellError";isc.A.errorsPreamble="The following errors were found.";isc.A.hiliteRequiredFields=true;isc.A.requiredTitlePrefix="<b>";isc.A.requiredRightTitlePrefix="<b>:&nbsp;";isc.A.requiredTitleSuffix="&nbsp;:</b>";isc.A.requiredRightTitleSuffix="</b>";isc.A.canHover=false;isc.A.itemHoverDelay=500;isc.A.itemHoverStyle="formHover";isc.A.overflow=isc.Canvas.VISIBLE;isc.A.defaultHeight=20;isc.A.validateOnChange=false;isc.A.implicitSaveDelay=2000;isc.A.synchronousValidation=false;isc.A.autoFocus=false;isc.A.selectOnFocus=false;isc.A.canFocus=true;isc.A._useNativeTabIndex=false;isc.A.$kn=false;isc.A.uniqueMatch=true;isc.A.browserSpellCheck=true;isc.A.cancelParamName="org.apache.struts.taglib.html.CANCEL";isc.A.cancelParamValue="cancel";isc.A.action="#";isc.A.method=isc.DynamicForm.POST;isc.A.encoding=isc.DynamicForm.NORMAL_ENCODING;isc.A.writeFormTag=true;isc.A.autoSendTargetFieldName="__target__";isc.A.useNativeSelectItems=false;isc.A.hideUsingDisplayNone=isc.Browser.isMoz&&isc.Browser.isMac;isc.A.operator="and";isc.A.nestedEditorType="NestedEditorItem";isc.A.nestedListEditorType="NestedListEditorItem";isc.A.canDropItems=false;isc.A.canAddColumns=true;isc.B.push(isc.A.hasInherentHeight=function isc_DynamicForm_hasInherentHeight(){if(this.inherentHeight!=null)return this.inherentHeight;return(this.overflow==isc.Canvas.VISIBLE||this.overflow==isc.Canvas.CLIP_H)}
-);isc.B._maxIndex=isc.C+1;isc.A=isc.DynamicForm.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$9i="upload";isc.A.$9j="mutex";isc.A.$9k=["name","editorType","readOnlyEditorType","type","valueMap","defaultValue","showTitle","left","top","width","height"];isc.A.dataArity="single";isc.A.$refPropName="__ref";isc.A.$70l="/";isc.A.$9l="form";isc.A.$9m="$9n";isc.A.$9o="$9p";isc.A.$9q="absolute";isc.A.$9r="showIf";isc.A.$9s="item,value,form,values";isc.A.$9t="</FORM>";isc.A.$9u="tablePolicy";isc.A.$9v="<COL WIDTH=";isc.A.$9w=(isc.Browser.isIE?"<TR STYLE='position:absolute'>":"<TR>");isc.A.$9y=(isc.Browser.isSafari?"</div></TD>":"</TD>");isc.A.$5u="<TD>";isc.A.$5v="</TD>";isc.A.$5s="<TR>";isc.A.$5t="</TR>";isc.A.$9z="<br>";isc.A.$90="</TABLE></FORM>";isc.A.$91=["<INPUT TYPE=HIDDEN NAME='",,"' VALUE='",,"'>"];isc.A.titleHeight=15;isc.A.$92="height:";isc.A.$93="width:";isc.A.$11j="max-width:";isc.A.$94="max-height:";isc.A.$92="height:";isc.A.$95="<NOBR>";isc.A.$96="</td></tr></TABLE>";isc.A.$97="</DIV>";isc.A.$98="</TD>";isc.A.$99=["<TD ",," CLASS='",,"' ALIGN='",,"' VALIGN='",,"'",,,">"];isc.A.$10a=["<DIV style='overflow:hidden;text-overflow:ellipsis;",,,,"'>"];isc.A.$63z="$428";isc.A.$10c=["<FORM ","ID","=",,," METHOD=",," ACTION='",,"' ENCTYPE=",,,,," ONSUBMIT='return ",,".$10d()' ONRESET='",,".resetValues(); return false;'",(isc.Browser.isSafari?" STYLE='display:inline;'":null)," STYLE='margin-bottom:0px;'>"];isc.A.$10e=" STYLE='position:absolute;left:0px;top:0px;'";isc.A.$10f=" TARGET='";isc.A.$10g=["<TABLE ID='",,"' ","WIDTH=",," CELLSPACING=",," CELLPADDING=",," BORDER=",,(isc.Browser.isMoz?"><TBODY>":">")];isc.A.$10h="table";isc.A.formSubmitFailedWarning="Form was unable to be submitted. The most likely cause for this is an "+"invalid value in an upload field.";isc.A.$10i="requiredIf";isc.A.$842="required";isc.A.$10j="Enter";isc.B.push(isc.A.initWidget=function isc_DynamicForm_initWidget(){if(isc.$cv)arguments.$cw=this;if(!isc.DynamicForm.$85l)isc.DynamicForm.buildOperatorIndex();this.setColWidths(this.colWidths);this.Super("initWidget",arguments);if(this.showComplexFieldsRecursively)this.showComplexFields=true;if(this.fields&&this.items==null)this.items=this.fields;if(this.defaultItems!=null&&this.items==null){this.items=[];for(var i=0;i<this.defaultItems.length;i++){this.items[i]=isc.addProperties({},this.defaultItems[i])}}
+);isc.B._maxIndex=isc.C+1;isc.A=isc.DynamicForm.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$9i="upload";isc.A.$9j="mutex";isc.A.$9k=["name","editorType","readOnlyEditorType","type","valueMap","defaultValue","showTitle","left","top","width","height"];isc.A.dataArity="single";isc.A.$refPropName="__ref";isc.A.$70l="/";isc.A.$9l="form";isc.A.$9m="$9n";isc.A.$9o="$9p";isc.A.$9q="absolute";isc.A.$9r="showIf";isc.A.$9s="item,value,form,values";isc.A.$9t="</FORM>";isc.A.$9u="tablePolicy";isc.A.$9v="<COL WIDTH=";isc.A.$9w=(isc.Browser.isIE?"<TR STYLE='position:absolute'>":"<TR>");isc.A.$9y=(isc.Browser.isSafari?"</div></TD>":"</TD>");isc.A.$5u="<TD>";isc.A.$5v="</TD>";isc.A.$5s="<TR>";isc.A.$5t="</TR>";isc.A.$9z="<br>";isc.A.$90="</TABLE></FORM>";isc.A.$91=["<INPUT TYPE=HIDDEN NAME='",,"' VALUE='",,"'>"];isc.A.titleHeight=15;isc.A.$92="height:";isc.A.$93="width:";isc.A.$11j="max-width:";isc.A.$94="max-height:";isc.A.$92="height:";isc.A.$95="<NOBR>";isc.A.$96="</td></tr></TABLE>";isc.A.$97="</DIV>";isc.A.$98="</TD>";isc.A.$99=["<TD ",," CLASS='",,"' ALIGN='",,"' VALIGN='",,"'",,,">"];isc.A.$10a=["<DIV style='overflow:hidden;text-overflow:ellipsis;",,,,"'>"];isc.A.$63z="$428";isc.A.$10c=["<FORM ","ID","=",,," METHOD=",," ACTION='",,"' ENCTYPE=",,,,," ONSUBMIT='return ",,".$10d()' ONRESET='",,".resetValues(); return false;'",(isc.Browser.isSafari?" STYLE='display:inline;'":null)," STYLE='margin-bottom:0px;'>"];isc.A.$10e=" STYLE='position:absolute;left:0px;top:0px;'";isc.A.$10f=" TARGET='";isc.A.$10g=["<TABLE role='presentation' ID='",,"' ","WIDTH=",," CELLSPACING=",," CELLPADDING=",," BORDER=",,(isc.Browser.isMoz?"><TBODY>":">")];isc.A.$10h="table";isc.A.formSubmitFailedWarning="Form was unable to be submitted. The most likely cause for this is an "+"invalid value in an upload field.";isc.A.$10i="requiredIf";isc.A.$842="required";isc.A.$10j="Enter";isc.B.push(isc.A.initWidget=function isc_DynamicForm_initWidget(){if(isc.$cv)arguments.$cw=this;if(!isc.DynamicForm.$85l)isc.DynamicForm.buildOperatorIndex();this.setColWidths(this.colWidths);this.Super("initWidget",arguments);if(this.showComplexFieldsRecursively)this.showComplexFields=true;if(this.fields&&this.items==null)this.items=this.fields;if(this.defaultItems!=null&&this.items==null){this.items=[];for(var i=0;i<this.defaultItems.length;i++){this.items[i]=isc.addProperties({},this.defaultItems[i])}}
 if(this.values==null)this.values={};if(this.action!=isc.DynamicForm.getPrototype().action&&this.action!=null&&!isc.isA.emptyString(this.action))
 {this.setAction(this.action)}
 if(!this.dataSource){var _2=this.items||[];for(var i=0;i<_2.length;i++){if(_2[i]==null)continue;if(this.dataPath||_2[i].dataPath){this.$834=isc.shallowClone(_2);break}}}
@@ -10713,13 +10719,13 @@
 ,isc.A.$124=function isc_c_FormItem__nativeIconClick(){return false}
 ,isc.A.getErrorPromptString=function isc_c_FormItem_getErrorPromptString(_1){var _2="";if(!isc.isAn.Array(_1))_1=[_1];for(var i=0;i<_1.length;i++){_2+=(i>0?"<br>":"")+_1[i].asHTML()};return _2}
 ,isc.A.$82b=function isc_c_FormItem__getOuterTableStartTemplate(){if(!this.$819){isc.Canvas.$816.add({target:this,methodName:"$82a"});this.$819=true}
-if(this.$13y==null){this.$13y=["<TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 ID='",,"' STYLE='"+isc.Canvas.$42a,,"' CLASS='",,"'><TR>",,"<TD style='",,"' VALIGN=",,">"]}
+if(this.$13y==null){this.$13y=["<TABLE role='presentation' CELLSPACING=0 CELLPADDING=0 BORDER=0 ID='",,"' STYLE='"+isc.Canvas.$42a,,"' CLASS='",,"'><TR>",,"<TD style='",,"' VALIGN=",,">"]}
 return this.$13y}
 ,isc.A.$82c=function isc_c_FormItem__getIconsCellTemplate(){if(!this.$819){isc.Canvas.$816.add({target:this,methodName:"$82a"});this.$819=true}
 if(this.$131==null){this.$131=["</TD><TD VALIGN=",," WIDTH=",," style='"+isc.Canvas.$42a+"' class='",,"'>",null]}
 return this.$131}
 ,isc.A.$82a=function isc_c_FormItem__doublingStringsChanged(){this.$13y=null;this.$131=null}
-);isc.B._maxIndex=isc.C+18;isc.A=isc.FormItem;isc.A.$12o="input";isc.A.$12p="text";isc.A.$12q="textarea";isc.A=isc.FormItem.getPrototype();isc.A.emptyDisplayValue="";isc.A.multipleValueSeparator=", ";isc.A.fetchMissingValues=true;isc.A.alwaysFetchMissingValues=false;isc.A.useShortDateFormat=true;isc.A.valueIconSize=16;isc.A.valueIconLeftPadding=0;isc.A.valueIconRightPadding=3;isc.A.showFocusedPickerIcon=false;isc.A.pickerIconHSpace=0;isc.A.pickerIconName="picker";isc.A.pickerIconSrc="";isc.A.visible=true;isc.A.accessKey=null;isc.A.changeOnKeypress=true;isc.A.maintainSelectionOnTransform=true;isc.A.dirtyOnKeyDown=true;isc.A.showTitle=true;isc.A.width="*";isc.A.height=20;isc.A.titleColSpan=1;isc.A.colSpan=1;isc.A.rowSpan=1;isc.A.browserInputTypeMap={"text":"text","email":"email","url":"url","tel":"tel","phone":"tel","number":"[0-9]*","zip":"[0-9]*"};isc.A.defaultIconSrc="[SKIN]/DynamicForm/default_formItem_icon.gif";isc.A.iconHSpace=3;isc.A.iconVAlign=isc.Canvas.BOTTOM;isc.A.iconHeight=20;isc.A.iconWidth=20;isc.A.iconPrompt="";isc.A.showIcons=true;isc.A.redrawOnShowIcon=true;isc.A.errorIconHeight=16;isc.A.errorIconWidth=16;isc.A.errorIconSrc="[SKIN]/DynamicForm/validation_error_icon.png";isc.A.showHint=true;isc.A.showFocused=false;isc.A.showDisabled=true;isc.A.cellStyle="formCell";isc.A.hintStyle="formHint";isc.A.titleStyle="formTitle";isc.A.$125=false;isc.A=isc.FormItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$o5="height";isc.A.$o6="width";isc.A.$126="colSpan";isc.A.$127="rowSpan";isc.A.$pa="*";isc.A.$bv="_";isc.A.$128="value";isc.A.$129="dataElement";isc.A.$o9="%";isc.A.errorMessageWidth=80;isc.A.$68w=1;isc.A.$682=new RegExp(".*_inactiveContext(.*)$");isc.A.$13a="<DIV STYLE='position:absolute;left:";isc.A.$13b="px;top:";isc.A.$13c="px;width:";isc.A.$13d="px;height:";isc.A.$13e="px;' ID='";isc.A.$13f="'>";isc.A.$13g="</DIV>";isc.A.$13h=["<SPAN style='white-space:nowrap;' eventProxy=",," "+isc.DynamicForm.$89+"='",,"' ID='",,"'>"];isc.A.$13i="</SPAN>";isc.A.$13j="$13k";isc.A.$13l="$13m";isc.A.$13n=["<DIV isDisabledEventMask='true' style='overflow:hidden;position:absolute;width:",null,"px;height:",null,"px' "+isc.DynamicForm.$89+"='",null,"' "+isc.DynamicForm.$9a+"='"+isc.DynamicForm.$9b+"' ID='",,"'>",(isc.Browser.isIE?isc.Canvas.spacerHTML(1600,100):"&nbsp;"),"</DIV>"];isc.A.$13o="hiddenDataElement";isc.A.$13p="control";isc.A.$13q="textBox";isc.A.$13r="pickerIconCell";isc.A.$59p="hintCell";isc.A.$13s="FormItemStyling";isc.A.$13t="deprecated";isc.A.$13u="Over";isc.A.$13v="Down";isc.A.$13w="Disabled";isc.A.$13x="valueIcon";isc.A.$13z="</TD></TR></TABLE>";isc.A.$130=["<TABLE ID='",,"' "+isc.DynamicForm.$89+"='",,"' "+isc.DynamicForm.$9a+"='"+isc.DynamicForm.$9e,"' CELLPADDING=0 CELLSPACING=0 STYLE='",,"' CLASS='",,"'><TR><TD style='",,"'>",,"</TD><TD ID='",,"' CLASS='",,"' STYLE='",,"'>",,"</TD></TR></TABLE>"];isc.A.$132=["</TD><TD ID='",,"' CLASS='",,"'>"];isc.A.$133="$134";isc.A.$135="white-space:normal;";isc.A.$136="white-space:nowrap;";isc.A.$137="min-width:";isc.A.$138="min-height:";isc.A.$93="width:";isc.A.$92="height:";isc.A.$38="px;";isc.A.$39=";";isc.A.$139={};isc.A.$14a="cursor:default;";isc.A.$14b="overflow:hidden;";isc.A.$14c="text-align:";isc.A.$14d="font-size:";isc.A.$14e=" ACCESSKEY='";isc.A.$14f=" TABINDEX='";isc.A.$ob="'";isc.A.$14g=["<DIV ID='",,"' "+isc.DynamicForm.$89+"='",,"' "+isc.DynamicForm.$9a+"='"+isc.DynamicForm.$9c,"' CLASS='",,"' STYLE='",,"'",,">",,,"</DIV>"];isc.A.$n3="drawing";isc.A.$14h="#";isc.A.$80b="<table cellpadding=0 cellspacing=0 margin=0><tr>";isc.A.$14i="vertical-align:";isc.A.$14j={};isc.A._$_iLink_="_iLink_";isc.A._$_iImg_="_iImg_";isc.A.$14k="cell";isc.A.applyStaticTypeFormat=true;isc.A.$14l="smart";isc.A.$14m={"Tab":true,"Arrow_Left":true,"Arrow_Right":true,"Arrow_Up":true,"Arrow_Down":true,"Home":true,"End":true,"Page_Up":true,"Page_Down":true,"Enter":true};isc.A.shouldSaveValue=true;isc.A.$14n="character";isc.A.$14o="EndToEnd";isc.A.$14p="EndToStart";isc.A.$14n="character";isc.A.$683={};isc.A.$115=isc.Class.NO_OP;isc.A.$10j="Enter";isc.A.$54n="img";isc.A.$jf="Tab";isc.A.$14q="$14r";isc.A.$14s={colSpan:true,rowSpan:true,startRow:true,endRow:true,showTitle:true,showHint:true};isc.A.$59q={baseStyle:true,showErrorStyle:true,showFocused:true,showErrorStyle:true,controlStyle:true,pickerIconStyle:true,textBoxStyle:true};isc.A.$59r="itemCellStyle";isc.B.push(isc.A.init=function isc_FormItem_init(){if(isc.$cv)arguments.$cw=this;if(this.ID==null||window[this.ID]!=this){isc.ClassFactory.addGlobalID(this)}
+);isc.B._maxIndex=isc.C+18;isc.A=isc.FormItem;isc.A.$12o="input";isc.A.$12p="text";isc.A.$12q="textarea";isc.A=isc.FormItem.getPrototype();isc.A.emptyDisplayValue="";isc.A.multipleValueSeparator=", ";isc.A.fetchMissingValues=true;isc.A.alwaysFetchMissingValues=false;isc.A.useShortDateFormat=true;isc.A.valueIconSize=16;isc.A.valueIconLeftPadding=0;isc.A.valueIconRightPadding=3;isc.A.showFocusedPickerIcon=false;isc.A.pickerIconHSpace=0;isc.A.pickerIconName="picker";isc.A.pickerIconSrc="";isc.A.visible=true;isc.A.accessKey=null;isc.A.changeOnKeypress=true;isc.A.maintainSelectionOnTransform=true;isc.A.dirtyOnKeyDown=true;isc.A.showTitle=true;isc.A.width="*";isc.A.height=20;isc.A.titleColSpan=1;isc.A.colSpan=1;isc.A.rowSpan=1;isc.A.browserInputTypeMap={"text":"text","email":"email","url":"url","tel":"tel","phone":"tel","number":"[0-9]*","zip":"[0-9]*"};isc.A.defaultIconSrc="[SKIN]/DynamicForm/default_formItem_icon.gif";isc.A.iconHSpace=3;isc.A.iconVAlign=isc.Canvas.BOTTOM;isc.A.iconHeight=20;isc.A.iconWidth=20;isc.A.iconPrompt="";isc.A.showIcons=true;isc.A.redrawOnShowIcon=true;isc.A.errorIconHeight=16;isc.A.errorIconWidth=16;isc.A.errorIconSrc="[SKIN]/DynamicForm/validation_error_icon.png";isc.A.showHint=true;isc.A.showFocused=false;isc.A.showDisabled=true;isc.A.cellStyle="formCell";isc.A.hintStyle="formHint";isc.A.titleStyle="formTitle";isc.A.$125=false;isc.A=isc.FormItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$o5="height";isc.A.$o6="width";isc.A.$126="colSpan";isc.A.$127="rowSpan";isc.A.$pa="*";isc.A.$bv="_";isc.A.$128="value";isc.A.$129="dataElement";isc.A.$o9="%";isc.A.errorMessageWidth=80;isc.A.$68w=1;isc.A.$682=new RegExp(".*_inactiveContext(.*)$");isc.A.$13a="<DIV STYLE='position:absolute;left:";isc.A.$13b="px;top:";isc.A.$13c="px;width:";isc.A.$13d="px;height:";isc.A.$13e="px;' ID='";isc.A.$13f="'>";isc.A.$13g="</DIV>";isc.A.$13h=["<SPAN style='white-space:nowrap;' eventProxy=",," "+isc.DynamicForm.$89+"='",,"' ID='",,"'>"];isc.A.$13i="</SPAN>";isc.A.$13j="$13k";isc.A.$13l="$13m";isc.A.$13n=["<DIV isDisabledEventMask='true' style='overflow:hidden;position:absolute;width:",null,"px;height:",null,"px' "+isc.DynamicForm.$89+"='",null,"' "+isc.DynamicForm.$9a+"='"+isc.DynamicForm.$9b+"' ID='",,"'>",(isc.Browser.isIE?isc.Canvas.spacerHTML(1600,100):"&nbsp;"),"</DIV>"];isc.A.$13o="hiddenDataElement";isc.A.$13p="control";isc.A.$13q="textBox";isc.A.$13r="pickerIconCell";isc.A.$59p="hintCell";isc.A.$13s="FormItemStyling";isc.A.$13t="deprecated";isc.A.$13u="Over";isc.A.$13v="Down";isc.A.$13w="Disabled";isc.A.$13x="valueIcon";isc.A.$13z="</TD></TR></TABLE>";isc.A.$130=["<TABLE role='presentation' ID='",,"' "+isc.DynamicForm.$89+"='",,"' "+isc.DynamicForm.$9a+"='"+isc.DynamicForm.$9e,"' CELLPADDING=0 CELLSPACING=0 STYLE='",,"' CLASS='",,"'><TR><TD style='",,"'>",,"</TD><TD ID='",,"' CLASS='",,"' STYLE='",,"'>",,"</TD></TR></TABLE>"];isc.A.$132=["</TD><TD ID='",,"' CLASS='",,"'>"];isc.A.$133="$134";isc.A.$135="white-space:normal;";isc.A.$136="white-space:nowrap;";isc.A.$137="min-width:";isc.A.$138="min-height:";isc.A.$93="width:";isc.A.$92="height:";isc.A.$38="px;";isc.A.$39=";";isc.A.$139={};isc.A.$14a="cursor:default;";isc.A.$14b="overflow:hidden;";isc.A.$14c="text-align:";isc.A.$14d="font-size:";isc.A.$14e=" ACCESSKEY='";isc.A.$14f=" TABINDEX='";isc.A.$ob="'";isc.A.$14g=["<DIV ID='",,"' "+isc.DynamicForm.$89+"='",,"' "+isc.DynamicForm.$9a+"='"+isc.DynamicForm.$9c,"' CLASS='",,"' STYLE='",,"'",,">",,,"</DIV>"];isc.A.$n3="drawing";isc.A.$14h="#";isc.A.$80b="<table role='presentation' cellpadding=0 cellspacing=0 margin=0><tr>";isc.A.$14i="vertical-align:";isc.A.$14j={};isc.A._$_iLink_="_iLink_";isc.A._$_iImg_="_iImg_";isc.A.$14k="cell";isc.A.applyStaticTypeFormat=true;isc.A.$14l="smart";isc.A.$14m={"Tab":true,"Arrow_Left":true,"Arrow_Right":true,"Arrow_Up":true,"Arrow_Down":true,"Home":true,"End":true,"Page_Up":true,"Page_Down":true,"Enter":true};isc.A.shouldSaveValue=true;isc.A.$14n="character";isc.A.$14o="EndToEnd";isc.A.$14p="EndToStart";isc.A.$14n="character";isc.A.$683={};isc.A.$115=isc.Class.NO_OP;isc.A.$10j="Enter";isc.A.$54n="img";isc.A.$jf="Tab";isc.A.$14q="$14r";isc.A.$14s={colSpan:true,rowSpan:true,startRow:true,endRow:true,showTitle:true,showHint:true};isc.A.$59q={baseStyle:true,showErrorStyle:true,showFocused:true,showErrorStyle:true,controlStyle:true,pickerIconStyle:true,textBoxStyle:true};isc.A.$59r="itemCellStyle";isc.B.push(isc.A.init=function isc_FormItem_init(){if(isc.$cv)arguments.$cw=this;if(this.ID==null||window[this.ID]!=this){isc.ClassFactory.addGlobalID(this)}
 if(this.options&&!this.valueMap){this.valueMap=this.options;delete this.options}
 this.$14t(this.$o5);this.$14t(this.$o6);this.$14t(this.$126);this.$14t(this.$127);this._value=this.getDefaultValue();this.$14u=true;this.$14v();if((!this.validateOnExit||!this.synchronousValidation)&&this.validators&&this.validators.length>0)
 {for(var i=0;i<this.validators.length;i++){if(this.validators[i].stopOnError){this.validateOnExit=true;this.synchronousValidation=true;break}}}
@@ -10963,9 +10969,9 @@
 ,isc.A.shouldShowErrorStyle=function isc_FormItem_shouldShowErrorStyle(){return this.showErrorStyle!=null?this.showErrorStyle:this.form.showErrorStyle}
 ,isc.A.shouldShowErrorIconPrompt=function isc_FormItem_shouldShowErrorIconPrompt(){return this.shouldShowErrorIcon&&!this.shouldShowErrorText()}
 ,isc.A.getErrorOrientation=function isc_FormItem_getErrorOrientation(){return this.errorOrientation!=null?this.errorOrientation:this.form.errorOrientation}
-,isc.A.getErrorHTML=function isc_FormItem_getErrorHTML(_1){var _2=this.shouldShowErrorText(),_3=this.shouldShowErrorIcon();if(!_2&&!_3)return isc.emptyString;var _4=this.form,_5=_3&&_2,_6=!_5&&_3&&((this.getErrorOrientation()==isc.Canvas.LEFT)||(this.getErrorOrientation()==isc.Canvas.RIGHT)),_7=(_2&&this.form.showTitlesWithErrorMessages&&this.getTitle()!=null?this.getTitle()+": ":null),_8,_9=_2?this.getErrorMessage(_1):null;if(!_5){_8=isc.SB.concat("<DIV ",(_6?"style='display:inline;'":null)," CLASS='",this.getCellStyle(),"'>",(_3?this.getErrorIconHTML(_1)+"&nbsp;":null),_7,_9,"</DIV>")}else{_8=isc.SB.concat("<TABLE WIDTH=100% CELLSPACING=0 CELLPADDING=0><TR>","<TD WIDTH=",this.errorIconWidth,">",this.getErrorIconHTML(_1),"</TD><TD STYLE='",isc.Canvas.$42a,"' CLASS='",this.getCellStyle(),"'>&nbsp;",_7,_9,"</TD></TR></TABLE>")}
+,isc.A.getErrorHTML=function isc_FormItem_getErrorHTML(_1){var _2=this.shouldShowErrorText(),_3=this.shouldShowErrorIcon();if(!_2&&!_3)return isc.emptyString;var _4=this.form,_5=_3&&_2,_6=!_5&&_3&&((this.getErrorOrientation()==isc.Canvas.LEFT)||(this.getErrorOrientation()==isc.Canvas.RIGHT)),_7=(_2&&this.form.showTitlesWithErrorMessages&&this.getTitle()!=null?this.getTitle()+": ":null),_8,_9=_2?this.getErrorMessage(_1):null;if(!_5){_8=isc.SB.concat("<DIV ",(_6?"style='display:inline;'":null)," CLASS='",this.getCellStyle(),"'>",(_3?this.getErrorIconHTML(_1)+"&nbsp;":null),_7,_9,"</DIV>")}else{_8=isc.SB.concat("<TABLE role='presentation' WIDTH=100% CELLSPACING=0 CELLPADDING=0><TR>","<TD WIDTH=",this.errorIconWidth,">",this.getErrorIconHTML(_1),"</TD><TD STYLE='",isc.Canvas.$42a,"' CLASS='",this.getCellStyle(),"'>&nbsp;",_7,_9,"</TD></TR></TABLE>")}
 return _8}
-,isc.A.getErrorIconHTML=function isc_FormItem_getErrorIconHTML(_1){this.$79u=_1;var _2=this.getErrorIconId();return this.$157(_2,this.errorIconWidth,this.errorIconHeight,"top",0,null,null,this.form.getImgURL(this.errorIconSrc),this.getID(),_2,null,true,isc.DynamicForm.$89+"='"+this.getID()+"' "+isc.DynamicForm.$9a+"='"+_2+"'")}
+,isc.A.getErrorIconHTML=function isc_FormItem_getErrorIconHTML(_1){this.$79u=_1;var _2=this.getErrorIconId();return this.$157(_2,this.errorIconWidth,this.errorIconHeight,"top",0,null,null,this.form.getImgURL(this.errorIconSrc),this.getID(),_2,null,true,isc.DynamicForm.$89+"='"+this.getID()+"' "+isc.DynamicForm.$9a+"='"+_2+"'"+(_1!=null&&isc.Canvas.ariaEnabled()?" aria-label="+_1.asSource():""))}
 ,isc.A.getErrorIconId=function isc_FormItem_getErrorIconId(){return this.$qs("error")}
 ,isc.A.getHint=function isc_FormItem_getHint(){if(!this.showHint||!this.hint)return null
 return this.hint}
@@ -11014,9 +11020,11 @@
 ,isc.A.$16m=function isc_FormItem__getIconVMargin(){return 0}
 ,isc.A.getIconPrompt=function isc_FormItem_getIconPrompt(_1){if(this.iconIsDisabled(_1))return null;return _1.prompt||this.iconPrompt}
 ,isc.A.getIconURL=function isc_FormItem_getIconURL(_1,_2,_3,_4){var _5=_1.src||this.defaultIconSrc,_6=(_3||this.iconIsDisabled(_1))?isc.StatefulCanvas.STATE_DISABLED:_2?isc.StatefulCanvas.STATE_OVER:null;_5=isc.Img.urlForState(_5,false,_4,_6);return _5}
-,isc.A.getIconHTML=function isc_FormItem_getIconHTML(_1,_2,_3,_4){var _5=this.getIconURL(_1,_2,_3,_4),_6=this.getIconWidth(_1),_7=this.getIconHeight(_1),_8=(_1.hspace!=null?_1.hspace:this.iconHSpace),_9=_1.backgroundColor,_10=this.form.getID(),_11=this.getItemID(),_12=_1.name;if(_1.imgOnly){return this.$157(this.$16n(_12),_6,_7,this.$16l(_1),this.$16m(_1),_8,_9,_5,_11,_12)}else{if(isc.FormItem.$16o==null){isc.FormItem.$16o=["<a ID='",,"'"," style='margin-left:",,"px;"+(isc.Browser.isMoz?"-moz-user-focus:":""),,,"' tabIndex=",," ",isc.DynamicForm.$89,"='",,"' ",isc.DynamicForm.$9a,"='",,"' handleNativeEvents=false>",,"</a>"]}
+,isc.A.getIconHTML=function isc_FormItem_getIconHTML(_1,_2,_3,_4){var _5=this.getIconURL(_1,_2,_3,_4),_6=this.getIconWidth(_1),_7=this.getIconHeight(_1),_8=(_1.hspace!=null?_1.hspace:this.iconHSpace),_9=_1.backgroundColor,_10=this.form.getID(),_11=this.getItemID(),_12=_1.name;if(_1.imgOnly){return this.$157(this.$16n(_12),_6,_7,this.$16l(_1),this.$16m(_1),_8,_9,_5,_11,_12)}else{if(isc.FormItem.$16o==null){isc.FormItem.$16o=["<a role='button' ID='",,"'"," style='margin-left:",,"px;"+(isc.Browser.isMoz?"-moz-user-focus:":""),,,"' tabIndex=",," ",isc.DynamicForm.$89,"='",,"' ",isc.DynamicForm.$9a,"='",,"' handleNativeEvents=false>",,"</a>"]}
 var _13=isc.FormItem.$16o;var _3=this.iconIsDisabled(_1),_14=(_3||this.canTabToIcons==false)?-1:this.$16p(_1);_13[1]=this.$16q(_12);var _15=this.$16r(_1);if(_15)_13[4]=_8;else _13[4]="0"
-if(isc.Browser.isMoz)_13[6]=(_14<0?"ignore;":"normal;");_13[7]=_3?"cursor:default;":null;_13[9]=_14;_13[13]=_11;_13[17]=_12;_13[19]=this.$157(this.$16n(_12),_6,_7,this.$16l(_1),this.$16m(_1),(!_15?_8:null),_9,_5,_11,_12,_8);return _13.join(isc.emptyString)}}
+if(isc.Browser.isMoz)_13[6]=(_14<0?"ignore;":"normal;");_13[7]=_3?"cursor:default;":null;_13[9]=_14;if(isc.Canvas.ariaEnabled()&&!isc.liteAria){_13[10]=" ";if(_1.prompt){_13[10]=" aria-label="+_1.prompt.asSource()+" "}
+if(_3)_13[10]+=" aria-disabled='true' "}
+_13[13]=_11;_13[17]=_12;_13[19]=this.$157(this.$16n(_12),_6,_7,this.$16l(_1),this.$16m(_1),(!_15?_8:null),_9,_5,_11,_12,_8);return _13.join(isc.emptyString)}}
 ,isc.A.$16r=function isc_FormItem__applyIconHSpaceToLink(_1){return(!isc.Browser.isIE&&!isc.Browser.isSafari&&!_1.imgOnly&&!isc.Browser.isStrict)}
 ,isc.A.$157=function isc_FormItem__getIconImgHTML(_1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,_13){if(isc.FormItem.$16s==null){isc.FormItem.$16s=["ID='",,"' style='",,,";margin-top:",,"px;margin-bottom:",,"px;",,,,"'"]}
 var _14=isc.FormItem.$16s;_14[1]=_1
@@ -11180,10 +11188,10 @@
 if(_2)return false;if(this.alwaysFetchMissingValues)return true;if(this.getDisplayFieldName()==null)return false;var _3=(this.$17b(_1,true)!=null);return!_3}
 ,isc.A.setDefaultValue=function isc_FormItem_setDefaultValue(_1){var _2=this.defaultValue,_3;this.defaultValue=_1;if(this.isSetToDefaultValue()||(this._value==null&&_2===_3))
 this.clearValue()}
-,isc.A.$43f=function isc_FormItem__checkForDisplayFieldValue(_1){if(this.$63l==null||!this.$63l[_1]){if(!this.$63l)this.$63l={};this.$63l[_1]=true;var _2=this.optionCriteria||{};if(!this.filterLocally){_2[this.getValueFieldName()]=_1}
+);isc.evalBoundary;isc.B.push(isc.A.$43f=function isc_FormItem__checkForDisplayFieldValue(_1){if(this.$63l==null||!this.$63l[_1]){if(!this.$63l)this.$63l={};this.$63l[_1]=true;var _2=this.optionCriteria||{};if(!this.filterLocally){_2[this.getValueFieldName()]=_1}
 var _3=isc.addProperties({},this.optionFilterContext,{showPrompt:false,clientContext:{dataValue:_1,filterLocally:this.filterLocally},componentId:this.containerWidget.getID(),componentContext:this.getFieldName()});var _4;if(this.optionOperationId!==_4){_3.operationId=this.optionOperationId}
 this.getOptionDataSource().fetchData(_2,{target:this,methodName:"fetchMissingValueReply"},_3)}}
-);isc.evalBoundary;isc.B.push(isc.A.fetchMissingValueReply=function isc_FormItem_fetchMissingValueReply(_1,_2,_3){var _4,_5=_1.clientContext.dataValue,_6=_1.clientContext.filterLocally,_7=this.getDisplayFieldName(),_8=this.getValueFieldName();delete this.$63l[_5];if(_2)_4=_2.find(_8,_5);if(!_4){this.logInfo("Unable to retrieve display value for data value:"+_5+" from dataSource "+this.getOptionDataSource());if(!_6){if(_2!=null&&_2.getLength()>0){this.logWarn("FetchMissingValues - filterLocally is false yet optionDataSource "+"fetch included records that do not match our current data value. Ignoring "+"these values.","fetchMissingValues");this.logDebug("Data returned:"+this.echoAll(_2),"fetchMissingValues")}
+,isc.A.fetchMissingValueReply=function isc_FormItem_fetchMissingValueReply(_1,_2,_3){var _4,_5=_1.clientContext.dataValue,_6=_1.clientContext.filterLocally,_7=this.getDisplayFieldName(),_8=this.getValueFieldName();delete this.$63l[_5];if(_2)_4=_2.find(_8,_5);if(!_4){this.logInfo("Unable to retrieve display value for data value:"+_5+" from dataSource "+this.getOptionDataSource());if(!_6){if(_2!=null&&_2.getLength()>0){this.logWarn("FetchMissingValues - filterLocally is false yet optionDataSource "+"fetch included records that do not match our current data value. Ignoring "+"these values.","fetchMissingValues");this.logDebug("Data returned:"+this.echoAll(_2),"fetchMissingValues")}
 return}}
 this.$848(_2);if(_6)this.$43e=true;var _9=(this._value==_5)&&this.$849();this.updateDisplayValueMap(_9)}
 ,isc.A.$848=function isc_FormItem__addDataToDisplayFieldCache(_1){if(this.$847==null){this.$847=[]}
@@ -11419,13 +11427,13 @@
 ,isc.A.$177=function isc_FormItem__setIconsEnabled(){if(this.showPickerIcon){var _1=this.getPickerIcon();this.setIconEnabled(_1)}
 if(!this.icons||this.icons.length<1)return;for(var i=0;i<this.icons.length;i++){this.setIconEnabled(this.icons[i])}}
 ,isc.A.iconIsDisabled=function isc_FormItem_iconIsDisabled(_1){_1=this.getIcon(_1);if(!_1)return;if(this.containerWidget&&this.containerWidget.isDisabled())return true;if(_1.neverDisable)return false;return this.isDisabled()}
-,isc.A.$kk=function isc_FormItem__canFocus(){if(this.canFocus!=null)return this.canFocus;return this.hasDataElement()}
+);isc.evalBoundary;isc.B.push(isc.A.$kk=function isc_FormItem__canFocus(){if(this.canFocus!=null)return this.canFocus;return this.hasDataElement()}
 ,isc.A.getCanFocus=function isc_FormItem_getCanFocus(){return this.$kk()}
 ,isc.A.focusInItem=function isc_FormItem_focusInItem(){var _1=this.isVisible()&&this.$kk()&&!this.isDisabled(),_2=_1?this.getFocusElement():null;if(!_1||!_2){return}
 if(_2.focus){var _3=this.getActiveElement();if(!isc.Browser.isIE||_3!=_2){this.logInfo("about to call element.focus() "+isc.EH.$lb()+(this.logIsDebugEnabled("traceFocus")?this.getStackTrace():""),"nativeFocus");isc.FormItem.$12n(this);isc.EventHandler.$lg=this;_2.focus()}else{this.logInfo("element already focused, not focus()ing","nativeFocus")}
 if(isc.Browser.isIE){isc.EH.$vm=this;this.$167=_2}}else{this.logInfo("can't call element focus, no element","nativeFocus")}
 var _4=this.selectOnFocus;if(_4==null&&this.form)_4=this.form.selectOnFocus;if(_4&&_2.select)_2.select()}
-);isc.evalBoundary;isc.B.push(isc.A.blurItem=function isc_FormItem_blurItem(){if(!this.isVisible()||!(this.hasFocus||isc.EH.$vm==this))return;var _1=this.$166();if(_1&&_1.blur){this.logInfo("about to call element blur"+isc.EH.$lb()+(this.logIsDebugEnabled("traceBlur")?this.getStackTrace():""),"nativeFocus");isc.EH.$ld=this;if(isc.Browser.isIE){try{_1.blur()}catch(e){}}else{_1.blur()}}else{this.logInfo("can't call element blur, no element","nativeFocus")}}
+,isc.A.blurItem=function isc_FormItem_blurItem(){if(!this.isVisible()||!(this.hasFocus||isc.EH.$vm==this))return;var _1=this.$166();if(_1&&_1.blur){this.logInfo("about to call element blur"+isc.EH.$lb()+(this.logIsDebugEnabled("traceBlur")?this.getStackTrace():""),"nativeFocus");isc.EH.$ld=this;if(isc.Browser.isIE){try{_1.blur()}catch(e){}}else{_1.blur()}}else{this.logInfo("can't call element blur, no element","nativeFocus")}}
 ,isc.A.focusInIcon=function isc_FormItem_focusInIcon(_1){_1=this.getIcon(_1);if(_1==null||_1.imgOnly)return;var _2=this.$16g(_1);if(_2!=null)_2.focus()}
 ,isc.A.blurIcon=function isc_FormItem_blurIcon(_1){if(isc.isA.String(_1))_1=this.getIcon(_1);if(_1==null||!this.icons||!this.icons.contains(_1)||_1.imgOnly)return;var _2=this.$16g(_1);if(_2!=null)_2.blur()}
 ,isc.A.$12v=function isc_FormItem__nativeElementFocus(_1,_2){if(isc.EH.$lg==this)delete isc.EH.$lg
@@ -11972,7 +11980,9 @@
 this.filterDataBoundPickList(_2)}else{var _6=this.filterClientPickListData();if(this.pickList.data!=_6)this.pickList.setData(_6);this.filterComplete()}},$61x:function(_1){if(!this.$19m()||!_1)return;var _2=this.getOptionDataSource();if(_1.getDataSource()==_2&&_1.data){var _3=_1.data.context,_4=_1.data.criteria;if(_3.textMatchStyle!=this.textMatchStyle)return true;if(this.optionFilterContext!=null){for(var _5 in this.optionFilterContext){if(this.optionFilterContext[_5]!=_3[_5])return true}}
 if(_2.compareCriteria(_4,this.getPickListFilterCriteria(),_3)==0){return false}}
 return true},getFirstOptionValue:function(){var _1;if(this.$19m()){var _2=this.pickList||(this.reusePickList()?this.getSharedPickList():null);if(_2&&!this.$61x(_2)){var _3=_2.data.get(0);if(_3==null||Array.isLoading(_3)){_1=null}else{_1=_3[this.getValueFieldName()]}}else{this.fetchData(null,null,true)}}else{var _4=this.valueMap;if(isc.isAn.Array(_4))_1=_4[0];else if(isc.isAn.Object(_4)){for(var _5 in _4){_1=_5;break}}}
-return _1},getClientPickListData:function(){return isc.PickList.optionsFromValueMap(this)},$19h:function(){if(this.pickListHidden)this.pickListHidden()},$19j:function(){if(this.pickListShown)this.pickListShown()},selectDefaultItem:function(){return this.selectItemFromValue(this.getValue())},selectItemFromValue:function(_1){if(!isc.isAn.Array(_1))_1=[_1];var _2=this.pickList.getSelection(),_3=this.getValueFieldName(),_4=true,_5;for(var i=0;i<_1.length;i++){var _7=_1[i],_8;if(_2.find(_3,_7))continue;var _9=this.pickList.getData();if(isc.ResultSet&&isc.isA.ResultSet(_9)){var _10=_9.localData;if(_10)_8=_10.find(_3,_7)}else{_8=_9.find(_3,_7)}
+return _1},getClientPickListData:function(){return isc.PickList.optionsFromValueMap(this)},$19h:function(){if(isc.Canvas.ariaEnabled()){this.setAriaState("expanded",false);this.clearAriaState("owns")}
+if(this.pickListHidden)this.pickListHidden()},$19j:function(){if(isc.Canvas.ariaEnabled()){this.setAriaState("expanded",true);this.setAriaState("owns",this.pickList.getCanvasName())}
+if(this.pickListShown)this.pickListShown()},selectDefaultItem:function(){return this.selectItemFromValue(this.getValue())},selectItemFromValue:function(_1){if(!isc.isAn.Array(_1))_1=[_1];var _2=this.pickList.getSelection(),_3=this.getValueFieldName(),_4=true,_5;for(var i=0;i<_1.length;i++){var _7=_1[i],_8;if(_2.find(_3,_7))continue;var _9=this.pickList.getData();if(isc.ResultSet&&isc.isA.ResultSet(_9)){var _10=_9.localData;if(_10)_8=_10.find(_3,_7)}else{_8=_9.find(_3,_7)}
 if(_8&&_8!=Array.LOADING){if(this.pickList.allowMultiSelect)this.pickList.selectRecord(_8);else this.pickList.selection.selectSingle(_8);_5=_9.indexOf(_8)}else{_4=false}}
 if(_5!=null)this.pickList.scrollRecordIntoView(_5);return _4},filterComplete:function(_1,_2,_3,_4){if(!_4&&_3!=null&&_3.clientContext!=null){var _5=this.$84p,_6=_3.clientContext.fetchID;if(_5==null||_5<_6){this.$84p=_6}else{this.logWarn("Server returned out of order responses for databound fetch requests."+" Ignoring superceded request results");return}}
 this.$43j=false;this.$82n(_1,_2,_3);this.$82o(_1,_2,_3);var _7=(_3&&_3.clientContext?_3.clientContext.$03:null);if(_7){this.fireCallback(_7,"item,dsResponse,data,dsRequest",[this,_1,_2,_3])}},$82n:function(_1,_2,_3){var _4=this.pickList;if(!_4||_4.destroyed)return;var _5=_4.hasFocus||(_4.body&&_4.body.hasFocus);var _2=_4.getData();if(_2.getLength()==0&&_4.isVisible()&&_4.isDrawn()){if(this.hideEmptyPickList){_4.hide();if(_5)this.focusInItem()}else{var _6=this.getPickListPosition();if(this.allowPickListToClip)_4.setRect([_6[0],_6[1]]);else _4.placeNear(_6[0],_6[1])}}else{if(this.$19i)this.$19l();else if(_4.isVisible()&&_4.isDrawn())this.placePickList();delete this.$19i}},$82o:function(_1,_2,_3){this.selectDefaultItem();if(this.$43k){delete this.$43k;this.$43f(this._value)}
@@ -12180,7 +12190,7 @@
 ,isc.A.getTextBoxHeight=function isc_CheckboxItem_getTextBoxHeight(){return null}
 ,isc.A.getTextBoxCellCSS=function isc_CheckboxItem_getTextBoxCellCSS(){var _1=isc.Canvas.$42a;var _2=this.invokeSuper(isc.CheckboxItem,"getTextBoxHeight");if(_2&&isc.isA.Number(_2))
 _1+=this.$20a+_2+this.$ph;return _1}
-);isc.B._maxIndex=isc.C+11;isc.ClassFactory.defineClass("NativeCheckboxItem","FormItem");isc.A=isc.NativeCheckboxItem.getPrototype();isc.A.textBoxStyle="labelAnchor";isc.A.implementsPromptNatively=isc.screenReader;isc.A.$183="CHECKBOX";isc.A.$125=true;isc.A.showLabel=true;isc.A.$16b={onclick:isc.FormItem.$12y};isc.A=isc.NativeCheckboxItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$20c=["<TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0><TR>","<TD WIDTH=20><INPUT TYPE=",," NAME=",," ID=",,,,,,," handleNativeEvents=false ",,,," TABINDEX=",,(isc.Browser.isMoz?" STYLE='-moz-user-focus:":null),,"></TD>",,"</TR></TABLE>"];isc.A.$20d=["<TD CLASS='",,"' ALIGN=LEFT",,,,," style='",,"'>",,"</TD>"];isc.A.$20e=["<A HREF='javascript:void ",,".boxTitleClick()' ONMOUSEOVER='window.status = \"",,"\"; return true' ONMOUSEOUT='window.status = \"\"; return true' CLASS='",,"' title=\"",,"\">",,"</A>"];isc.B.push(isc.A.getInnerWidth=function isc_NativeCheckboxItem_getInnerWidth(_1,_2,_3,_4){if(!this.showLabel||this.showValueIconOnly){return 20}
+);isc.B._maxIndex=isc.C+11;isc.ClassFactory.defineClass("NativeCheckboxItem","FormItem");isc.A=isc.NativeCheckboxItem.getPrototype();isc.A.textBoxStyle="labelAnchor";isc.A.implementsPromptNatively=isc.screenReader;isc.A.$183="CHECKBOX";isc.A.$125=true;isc.A.showLabel=true;isc.A.$16b={onclick:isc.FormItem.$12y};isc.A=isc.NativeCheckboxItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$20c=["<TABLE role='presentation' CELLSPACING=0 CELLPADDING=0 BORDER=0><TR>","<TD WIDTH=20><INPUT TYPE=",," NAME=",," ID=",,,,,,," handleNativeEvents=false ",,,," TABINDEX=",,(isc.Browser.isMoz?" STYLE='-moz-user-focus:":null),,"></TD>",,"</TR></TABLE>"];isc.A.$20d=["<TD CLASS='",,"' ALIGN=LEFT",,,,," style='",,"'>",,"</TD>"];isc.A.$20e=["<A HREF='javascript:void ",,".boxTitleClick()' ONMOUSEOVER='window.status = \"",,"\"; return true' ONMOUSEOUT='window.status = \"\"; return true' CLASS='",,"' title=\"",,"\">",,"</A>"];isc.B.push(isc.A.getInnerWidth=function isc_NativeCheckboxItem_getInnerWidth(_1,_2,_3,_4){if(!this.showLabel||this.showValueIconOnly){return 20}
 return this.invokeSuper(isc.NativeCheckboxItem,"getInnerWidth",_1,_2,_3,_4)}
 ,isc.A.getElementHTML=function isc_NativeCheckboxItem_getElementHTML(_1){var _2=this.form.getID(),_3=this.getItemID(),_4=this.$20c,_5=this.getAnchorTitle();_4[2]=this.$183;_4[4]=this.getElementName();_4[6]=this.getDataElementId();_4[7]=this.$155();if(this.value!=null){_4[8]=" VALUE='";_4[9]=this.value;_4[10]="'";if(this.containerWidget&&this.containerWidget.isPrinting){if(_1==this.value)_4[10]+=" CHECKED='true'"}}else{_4[8]=null;_4[9]=null;_4[10]=null}
 if(this.isDisabled())_4[11]=" DISABLED";else _4[11]=null;if(this.implementsPromptNatively){if(this.prompt!=null){_4[13]=" TITLE='";_4[14]=this.prompt;_4[15]="'"}else{_4[13]=_4[14]=_4[15]=null}}
@@ -12368,13 +12378,13 @@
 _1.startYear=this.getStartDate().getFullYear();_1.endYear=this.getEndDate().getFullYear();return this.Super("showPicker",arguments)}
 ,isc.A.getPickerRect=function isc_DateItem_getPickerRect(){var _1=this.getPageLeft(),_2=this.getPageTop(),_3=isc.DateItem.chooserWidth+3,_4=isc.DateItem.chooserHeight+3;_1+=Math.round((this.getVisibleWidth()-(this.getPickerIconWidth()/2))-
 (_3/ 2));_2+=Math.round((this.getPickerIconHeight()/2)-(_4/ 2));return[_1,_2]}
-,isc.A.pickerDataChanged=function isc_DateItem_pickerDataChanged(_1){var _2=_1.getData();var _3=_2.getFullYear(),_4=_2.getMonth(),_5=_2.getDate();var _6=this.getType(),_7=!isc.SimpleType.inheritsFrom("date")||isc.SimpleType.inheritsFrom("datetime");if(_7){var _8=isc.Time.getUTCHoursDisplayOffset(_2),_9=isc.Time.getUTCMinutesDisplayOffset(_2),_10=_8>0?24-_8:0-_8,_11=_9>0?60-_9:0-_9;_2.setUTCHours(_10)
-_2.setUTCMinutes(_11)}
-this.$20l=true;if(this.useTextField){var _12=this.formatDate(_2);this.dateTextField.setValue(_12)}else{var _2=this._value||this.getDefaultValue(),_13;if(this.yearSelector)this.yearSelector.setValue(_3);else{_2.setFullYear(_3);_13=true}
-if(this.monthSelector)this.monthSelector.setValue(_4);else{_2.setMonth(_4-1);_13=true}
-if(this.daySelector)this.daySelector.setValue(_5);else{_2.setDate(_5);_13=true}
-if(_13){this._value=_2}}
-this.$20l=false;this.updateValue();if(!this.hasFocus)this.focusInItem();var _14=this.getErrors();if(_14&&_14.length>0)this.validate();if(this.validateOnExit||this.form.validateOnExit){this.$84r=true}}
+,isc.A.pickerDataChanged=function isc_DateItem_pickerDataChanged(_1){var _2=_1.getData();var _3=_2.getFullYear(),_4=_2.getMonth(),_5=_2.getDate(),_6=_2.getTime();var _7=this.getType(),_8=!isc.SimpleType.inheritsFrom(_7,"date")||isc.SimpleType.inheritsFrom(_7,"datetime");if(_8){var _9=isc.Time.getUTCHoursDisplayOffset(_2),_10=isc.Time.getUTCMinutesDisplayOffset(_2),_11=_9>0?24-_9:0-_9,_12=_10>0?60-_10:0-_10;var _13=(_11-_2.getUTCHours())+_2.getHours();if(_13>=24)_13-=24;else if(_13<0)_13+=24;_2.setHours(_13);if(_2.getHours()!=_13){_2.setTime(_6);_2.setHours(_13+1);if(_2.getHours()!=_13+1){_2.setTime(_6);_2.setHours(_13+2)}}
+_2.setUTCMinutes(_12)}
+this.$20l=true;if(this.useTextField){var _14=this.formatDate(_2);this.dateTextField.setValue(_14)}else{var _2=this._value||this.getDefaultValue(),_15;if(this.yearSelector)this.yearSelector.setValue(_3);else{_2.setFullYear(_3);_15=true}
+if(this.monthSelector)this.monthSelector.setValue(_4);else{_2.setMonth(_4-1);_15=true}
+if(this.daySelector)this.daySelector.setValue(_5);else{_2.setDate(_5);_15=true}
+if(_15){this._value=_2}}
+this.$20l=false;this.updateValue();if(!this.hasFocus)this.focusInItem();var _16=this.getErrors();if(_16&&_16.length>0)this.validate();if(this.validateOnExit||this.form.validateOnExit){this.$84r=true}}
 ,isc.A.setHint=function isc_DateItem_setHint(_1){if(this.useTextField&&this.showHintInField){this.dateTextField.setHint(_1)}else{this.Super("setHint",arguments)}}
 ,isc.A.getPickerData=function isc_DateItem_getPickerData(){var _1=this.getValue();if(_1!=null&&isc.isA.Date(_1))return _1;return this.getDefaultChooserDate()}
 ,isc.A.getDefaultChooserDate=function isc_DateItem_getDefaultChooserDate(){return this.defaultChooserDate}
@@ -12674,7 +12684,7 @@
 );isc.B._maxIndex=isc.C+7;isc.defineClass("DialogUploadPicker","MultiFilePicker");isc.A=isc.DialogUploadPicker.getPrototype();isc.A.maxUploadFields=1;isc.A.uploadWithoutPKButtonName="Upload";isc.A.uploadWithPKButtonName="Upload";isc.A.showUploadRemoveButton=false;isc.A.uploadWithoutPK=true}
 if(isc.ListGrid){isc.ClassFactory.defineClass("SOAPUploadItem","DialogUploadItem");isc.A=isc.SOAPUploadItem.getPrototype();isc.A.dataSource="sessionFiles"}isc.ClassFactory.defineClass("SpinnerItem","TextItem");isc.A=isc.SpinnerItem;isc.A.INCREASE_ICON={width:16,height:9,src:"[SKIN]/DynamicForm/Spinner_increase_icon.png",name:"increase",showOver:true,imgOnly:true,hspace:0};isc.A.DECREASE_ICON={width:16,height:9,src:"[SKIN]/DynamicForm/Spinner_decrease_icon.png",name:"decrease",showOver:true,imgOnly:true,hspace:0};isc.A=isc.SpinnerItem.getPrototype();isc.A.changeOnKeypress=false;isc.A.canTabToIcons=false;isc.A.height=18;isc.A.step=1;isc.A=isc.SpinnerItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.init=function isc_SpinnerItem_init(){this.Super("init",arguments);var _1=this.step;if(_1!=null&&!isc.isA.Number(_1)){_1=parseFloat(_1);if(!isc.isA.Number(_1))_1=1;this.step=_1}}
 ,isc.A.$14v=function isc_SpinnerItem__setUpIcons(){if(this.icons==null)this.icons=[];var _1=isc.addProperties({},isc.SpinnerItem.INCREASE_ICON),_2=isc.addProperties({},isc.SpinnerItem.DECREASE_ICON);this.icons.addListAt([_1,_2],0);this.Super("$14v",arguments)}
-,isc.A.getIconsHTML=function isc_SpinnerItem_getIconsHTML(){if(!this.showIcons)return"";var _1=isc.SB.create();if(!this.$204){var _2="<TD tabIndex=-1"+(isc.Browser.isIE?" style='font-size:0px'":"")+">",_3={},_4=this.$16l(_3),_5=this.$16m(_3);this.$204=["<TABLE STYLE='vertical-align:",_4,";margin-top:",_5,";margin-bottom:",_5,";display:inline;' BORDER=0 CELLPADDING=0 CELLSPACING=0><TR>",_2,this.getIconHTML(this.icons[0]),"<TD></TR><TR>",_2,this.getIconHTML(this.icons[1]),"</TD></TR></TABLE>"]}else{this.$204[8]=this.getIconHTML(this.icons[0]);this.$204[11]=this.getIconHTML(this.icons[1])}
+,isc.A.getIconsHTML=function isc_SpinnerItem_getIconsHTML(){if(!this.showIcons)return"";var _1=isc.SB.create();if(!this.$204){var _2="<TD tabIndex=-1"+(isc.Browser.isIE?" style='font-size:0px'":"")+">",_3={},_4=this.$16l(_3),_5=this.$16m(_3);this.$204=["<TABLE role='presentation' STYLE='vertical-align:",_4,";margin-top:",_5,";margin-bottom:",_5,";display:inline;' BORDER=0 CELLPADDING=0 CELLSPACING=0><TR>",_2,this.getIconHTML(this.icons[0]),"<TD></TR><TR>",_2,this.getIconHTML(this.icons[1]),"</TD></TR></TABLE>"]}else{this.$204[8]=this.getIconHTML(this.icons[0]);this.$204[11]=this.getIconHTML(this.icons[1])}
 _1.append(this.$204);for(var i=2;i<this.icons.length;i++){var _7=this.icons[i];if(!this.$16f(_7)||this.$16e(_7))continue;_1.append(this.getIconHTML(_7))}
 return _1.toString()}
 ,isc.A.$16m=function isc_SpinnerItem__getIconVMargin(_1){if(_1==this.icons[0]||_1==this.icons[1])return 0;return this.Super("$16m",arguments)}
@@ -13337,7 +13347,7 @@
 );isc.B._maxIndex=isc.C+4;isc._moduleEnd=isc._Forms_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('Forms module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'Forms'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-06-02 (2011-06-02)
+ * Version SC_SNAPSHOT-2011-06-06 (2011-06-06)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -13348,7 +13358,7 @@
 
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-06-02 (2011-06-02)
+ * Version SC_SNAPSHOT-2011-06-06 (2011-06-06)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -13937,7 +13947,7 @@
 this.cacheAllData=true;this.$85n=isc.timestamp()}
 if(this.fetchingClientOnlyData(_1))return;if(this.logIsDebugEnabled()){this.logDebug("Outbound DSRequest: "+this.echo(_1))}
 _1.$376=_1.callback;var _3=_1.operationType;if((_3=="update"||_3=="add")&&(this.sparseUpdates||this.noNullUpdates))
-{this.$79c(_1.data,_1.oldValues,_3,this)}
+{_1.data=this.$708(_1.data);this.$79c(_1.data,_1.oldValues,_3,this)}
 if(_2=="iscServer"){this.$754(_1);_1.unconvertedDSRequest=isc.shallowClone(_1);if(this.autoConvertRelativeDates==true){if(this.logIsInfoEnabled("relativeDates")){this.logInfo("Calling convertRelativeDates from sendDSRequest "+"- data is\n\n"+isc.echoFull(_4))}
 var _4=this.convertRelativeDates(_1.data);if(this.logIsInfoEnabled("relativeDates")){this.logInfo("Called convertRelativeDates from sendDSRequest "+"- data is\n\n"+isc.echoFull(_4))}
 _1.data=_4}
@@ -13955,6 +13965,12 @@
 if(isc.isA.Date(_7)&&Date.compareDates(_7,_11)==0){delete _1[_6]}else if(isc.isAn.Array(_7)){for(var i=0;i<_7.length;i++){this.$79c(_7[i],_11[i],_3,_8==null?null:isc.DataSource.get(_8.type));var _13=0;for(var _14 in _7[i])_13++;if(_13==0)delete _7[i]}
 var _15=false;for(var i=0;i<_7.length;i++){if(_7[i]!=null){_15=true;break}}
 if(!_15)delete _1[_6]}else if(isc.isAn.Object(_7)){this.$79c(_7,_11,_3,_8==null?null:isc.DataSource.get(_8.type));var _13=0;for(var _14 in _7)_13++;if(_13==0)delete _1[_6]}else if(_7==_11){delete _1[_6]}}}}
+,isc.A.$708=function isc_DataSource__cloneValues(_1){if(_1==null)return;if(isc.isAn.Array(_1)){var _2=[];for(var i=0;i<_1.length;i++){var _4=_1[i];if(isc.isA.Function(_4))continue;if(isc.isAn.Instance(_1[_6])||isc.isA.Class(_1[_6]))continue;if(_4==null||isc.isA.String(_4)||isc.isA.Boolean(_4)||isc.isA.Number(_4))
+{_2[_2.length]=_4}else if(isc.isA.Date(_4)){_2[_2.length]=new Date(_4.getTime())}else if(isc.isAn.Object(_4)){_2[_2.length]=this.$708(_4)}}
+return _2}
+var _2={};if(_1.$42c!=null){_1=isc.JSONEncoder.$42b(_1)}
+var _5={__ref:true,$81y:true,$29a:true};for(var _6 in _1){if(isc.isA.Function(_1[_6]))continue;if(_5[_6]==true)continue;if(isc.isAn.Instance(_1[_6])||isc.isA.Class(_1[_6]))continue;var _7=_1[_6];if(isc.isA.Date(_7)){_2[_6]=_7.duplicate()}else if(isc.isAn.Object(_7)&&!isc.isAn.Array(_7)){_2[_6]=this.$708(_7)}else{_2[_6]=_1[_6]}}
+return _2}
 ,isc.A.fulfilledFromOffline=function isc_DataSource_fulfilledFromOffline(_1){var _2=_1.unconvertedDSRequest?_1.unconvertedDSRequest:_1;if(this.useOfflineStorage&&isc.Offline){var _3=_1.dataSource+"."+_1.operationType;if(isc.Offline.isOffline()){var _4=isc.Offline.getResponse(_2);this.logInfo("currently offline, for request: "+_3+" found cached response: "+this.echoLeaf(_4),"offline");if(this.useOfflineResponse&&!this.useOfflineResponse(_2,_4)){this.logInfo("User-written useOfflineResponse() method returned false; "+"not using cached response","offline");_4=null}
 this.processOfflineResponse(_1,_4);return true}else if(_2.useOfflineCache||_2.useOfflineCacheOnly){var _4=isc.Offline.getResponse(_2);if(_4!=null){this.logInfo("request: "+_3+", returning cached offline response","offline");if(this.useOfflineResponse&&!this.useOfflineResponse(_2,_4)){this.logInfo("User-written useOfflineResponse() method returned false; "+"not using cached response","offline");_4=null}
 this.processOfflineResponse(_1,_4);return true}else if(_1.useOfflineCacheOnly){this.logInfo("request: "+_3+": useOfflineCacheOnly: no response available","offline");this.processOfflineResponse(_1);return true}
@@ -14111,12 +14127,12 @@
 break;case"add":case"insert":var _16=isc.addProperties({},_1.data);_16=this.applySequenceFields(_16);_2.add(_16);_4.data=isc.addProperties({},_16);break;case"replace":case"update":var _15=this.findByKeys(_1.data,_2);if(_15==-1){this.logWarn("clientOnly update operation: Unable to find record matching criteria:"+this.echo(_1.data))}else{var _16=_2[_15];isc.addProperties(_16,_1.data);_4.data=isc.addProperties({},_16)}
 break;case"validate":default:break}
 return _4}
-,isc.A.getNextSequenceValue=function isc_DataSource_getNextSequenceValue(_1){var _2=this.testData,_3=0;for(var i=0;i<_2.length;i++){var _5=_2[i][_1.name];if(_5!=null&&_5>_3)_3=_5}
+);isc.evalBoundary;isc.B.push(isc.A.getNextSequenceValue=function isc_DataSource_getNextSequenceValue(_1){var _2=this.testData,_3=0;for(var i=0;i<_2.length;i++){var _5=_2[i][_1.name];if(_5!=null&&_5>_3)_3=_5}
 return _3+1}
 ,isc.A.applySequenceFields=function isc_DataSource_applySequenceFields(_1){if(!this.clientOnly){return}
 var _2=this.getFields();for(var _3 in _2){var _4=_2[_3];if((_4.type=="sequence"||_4.primaryKey)&&_1[_3]==null){_1[_3]=this.getNextSequenceValue(_4)}}
 return _1}
-);isc.evalBoundary;isc.B.push(isc.A.initializeSequenceFields=function isc_DataSource_initializeSequenceFields(_1){if(!isc.isAn.Array(_1))return;var _2=this.getFields();var _3=[];for(var _4 in _2){if(_2[_4].type=="sequence"||_2[_4].primaryKey)_3.add(_4)}
+,isc.A.initializeSequenceFields=function isc_DataSource_initializeSequenceFields(_1){if(!isc.isAn.Array(_1))return;var _2=this.getFields();var _3=[];for(var _4 in _2){if(_2[_4].type=="sequence"||_2[_4].primaryKey)_3.add(_4)}
 for(var i=0;i<_1.length;i++){for(var j=0;j<_3.length;j++){var _4=_3[j];if(_1[i][_4]==null)_1[i][_4]=i}}
 return _1}
 ,isc.A.findByKeys=function isc_DataSource_findByKeys(_1,_2,_3,_4){return _2.findByKeys(_1,this,_3,_4)}
@@ -14165,7 +14181,7 @@
 if(_6>0){_4.removeList(_5);for(var i=0;i<_4.length;i++){if(this.getField(_4[i])==null)return-1}
 return 1}
 return _7}
-);isc.B._maxIndex=isc.C+161;isc.A=isc.DataSource;isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$628=0;isc.A.$71l={sum:function(_1,_2,_3){var _4=0;for(var i=0;i<_2.length;i++){var _6=_1[_2[i].name],_7=parseFloat(_6);if(isc.isA.Number(_7)&&_7==_6){_4+=_7}else{if(_6!=null&&_6!=isc.emptyString){return null}}}
+);isc.B._maxIndex=isc.C+162;isc.A=isc.DataSource;isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$628=0;isc.A.$71l={sum:function(_1,_2,_3){var _4=0;for(var i=0;i<_2.length;i++){var _6=_1[_2[i].name],_7=parseFloat(_6);if(isc.isA.Number(_7)&&_7==_6){_4+=_7}else{if(_6!=null&&_6!=isc.emptyString){return null}}}
 return _4},avg:function(_1,_2,_3){var _4=0,_5=0;for(var i=0;i<_2.length;i++){var _7=_1[_2[i].name],_8=parseFloat(_7);if(isc.isA.Number(_8)&&(_8==_7)){_5+=1;_4+=_8}else{if(_7!=null&&_7!=isc.emptyString){return null}}}
 return _5>0?_4/ _5:null},max:function(_1,_2,_3){var _4,_5;for(var i=0;i<_2.length;i++){var _7=_1[_2[i].name];if(isc.isA.Date(_7)){if(_5)return null;if(_4==null)_4=_7.duplicate();else if(_4.getTime()<_7.getTime())_4=_7.duplicate()}else{_5=true;var _8=parseFloat(_7);if(isc.isA.Number(_8)&&(_8==_7)){if(_4==null)_4=_8;else if(_4<_7)_4=_8}else{if(_7!=null&&_7!=isc.emptyString){return null}}}}
 return _4},min:function(_1,_2,_3){var _4,_5
@@ -14191,7 +14207,8 @@
 ,isc.A.getCriteriaOperator=function isc_c_DataSource_getCriteriaOperator(_1,_2){var _3;if(isc.isA.Number(_1)||isc.isA.Date(_1)||isc.isA.Boolean(_1)){_3="equals"}else if(_2=="equals"||_2=="exact"){_3="iEquals"}else if(_2=="startsWith"){_3="iStartsWith"}else{_3="iContains"}
 return _3}
 ,isc.A.combineCriteria=function isc_c_DataSource_combineCriteria(_1,_2,_3,_4){if(!_1)return _2;if(!_2)return _1;if(!_3)_3="and";if(_3!="and"&&_3!="or"){isc.logWarn("combineCriteria called with invalid outerOperator '"+_3+"'");return null}
-var _5,_6;if(_1._constructor!="AdvancedCriteria"&&_2._constructor!="AdvancedCriteria"&&_3=="and"){for(var _7 in _1){if(_2[_7]!=_5){_6=true;break}}}else{_6=true}
+var _5,_6;if(_1._constructor!="AdvancedCriteria"&&_2._constructor!="AdvancedCriteria"&&_3=="and")
+{for(var _7 in _1){if(_2[_7]!=_5){_6=true;break}}}else{_6=true}
 if(!_6){return isc.addProperties({},_1,_2)}
 var _8,_9;if(_1._constructor=="AdvancedCriteria"){_8=_1}else{_8=isc.DataSource.convertCriteria(_1,_4)}
 if(_2._constructor=="AdvancedCriteria"){_9=_2}else{_9=isc.DataSource.convertCriteria(_2,_4)}
@@ -14902,7 +14919,9 @@
 if(this.$458==null)this.$458=[];this.$458.add(_2);_3=this.buildRequest(_3,"fetch");_4.fetchData(_1,{target:this,methodName:"fetchDataReply"},_3)},fetchDataReply:function(_1,_2,_3){if(_2==null||isc.isAn.emptyObject(_2)||(isc.isAn.Array(_2)&&_2.getLength()==0))
 {if(_1.status==isc.RPCResponse.STATUS_OFFLINE){isc.say(this.offlineMessage)}}
 var _4;if(isc.isAn.Array(_2)){_4=_2.get(0)}else{_4=_2}
-this.editRecord(_4);var _5=this.$458.pop();if(_5)this.fireCallback(_5,"dsResponse,data,dsRequest",[_1,_2,_3])},filterData:function(_1,_2,_3){var _4=this.getDataSource();if(!_4){this.logWarn("Ignoring call to filterData() on a DynamicForm with no valid dataSource");return}
+if(_1.status==isc.RPCResponse.STATUS_SUCCESS||_1.status==isc.RPCResponse.STATUS_VALIDATION_ERROR)
+{this.editRecord(_4)}
+var _5=this.$458.pop();if(_5)this.fireCallback(_5,"dsResponse,data,dsRequest",[_1,_2,_3])},filterData:function(_1,_2,_3){var _4=this.getDataSource();if(!_4){this.logWarn("Ignoring call to filterData() on a DynamicForm with no valid dataSource");return}
 if(this.$458==null)this.$458=[];this.$458.add(_2);_4.filterData(_1,{target:this,methodName:"fetchDataReply"},_3)}}
 if(isc.DynamicForm)isc.DynamicForm.addMethods(isc.$457)
 if(isc.ValuesManager)isc.ClassFactory.mixInInterface("ValuesManager","EditorActionMethods");if(isc.ValuesManager)isc.ValuesManager.addMethods(isc.$457)
@@ -15643,6 +15662,12 @@
 showPrompt:{
 type:"boolean"
 },
+dataSourceVersion:{
+title:"DataSource Version",
+type:"number",
+visibility:"internal",
+xmlAttribute:"true"
+},
 dbName:{
 title:"Database Name",
 type:"string",
@@ -15798,7 +15823,8 @@
 type:"Object"
 },
 autoDeriveSchema:{
-type:"boolean"
+type:"boolean",
+xmlAttribute:"true"
 },
 useLocalValidators:{
 type:"boolean"
@@ -15807,7 +15833,8 @@
 type:"boolean"
 },
 qualifyColumnNames:{
-type:"boolean"
+type:"boolean",
+xmlAttribute:"true"
 },
 validateRelatedRecords:{
 type:"boolean"
@@ -15822,10 +15849,12 @@
 type:"string"
 },
 beanClassName:{
-type:"string"
+type:"string",
+xmlAttribute:"true"
 },
 autoJoinTransactions:{
-type:"boolean"
+type:"boolean",
+xmlAttribute:"true"
 },
 sparseUpdates:{
 type:"boolean"
@@ -16017,6 +16046,10 @@
 ignore:{
 type:"boolean"
 },
+unknownType:{
+type:"boolean",
+xmlAttribute:"true"
+},
 canSortClientOnly:{
 type:"boolean",
 xmlAttribute:"true"
@@ -16424,26 +16457,44 @@
 ,isc.A.getSelectedClauses=function isc_FilterBuilder_getSelectedClauses(){var _1=[];if(this.showSelectionCheckbox){for(var i=0;i<this.clauses.length;i++){var c=this.clauses[i];if(c.topOperatorForm&&c.topOperatorForm.getValue("select")){_1.add(c)}}}
 return _1}
 );isc.B._maxIndex=isc.C+37;isc.FilterBuilder.registerStringMethods({search:"criteria",filterChanged:""})}
-isc.screenReader=false;isc.A=isc.Canvas.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.addPrimaryRole=function isc_Canvas_addPrimaryRole(){if(!isc.Browser.isMoz||isc.Browser.geckoVersion<20051111)return;if(!this.waiRole)return;var _1=this.getClipHandle();isc.Canvas.setWAIRole(_1,this.waiRole);var _2=this.waiStateProps;if(_2)return;for(var _3 in _2){var _4=_2[_3],_5=this[_4];if(_5==null)continue;isc.Canvas.setWAIState(_1,_3,_5)}}
-,isc.A.addContentRoles=function isc_Canvas_addContentRoles(){}
-);isc.B._maxIndex=isc.C+2;isc.A=isc.Canvas;isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.waiStateNS="http://www.w3.org/2005/07/aaa";isc.A.xhtml2NS="http://www.w3.org/TR/xhtml2";isc.B.push(isc.A.setWAIRole=function isc_c_Canvas_setWAIRole(_1,_2){_1.setAttributeNS(this.xhtml2NS,"role","wairole:"+_2)}
-,isc.A.setWAIState=function isc_c_Canvas_setWAIState(_1,_2,_3){_1.setAttributeNS(this.waiStateNS,_2,_3)}
-,isc.A.setWAIStates=function isc_c_Canvas_setWAIStates(_1,_2){for(var _3 in _2){this.setWAIState(_1,_3,_2[_3])}}
-);isc.B._maxIndex=isc.C+3;if(isc.DynamicForm){isc.A=isc.FormItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.addContentRoles=function isc_FormItem_addContentRoles(){if(!isc.Browser.isMoz||isc.Browser.geckoVersion<20051111)return;if(!this.$kk())return;var _1=this.getFocusElement();if(_1!=null)isc.Canvas.setWAIRole(_1,this.waiRole)}
-);isc.B._maxIndex=isc.C+1}
-if(isc.GridRenderer){isc.A=isc.GridRenderer.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.addContentRoles=function isc_GridRenderer_addContentRoles(){if(!isc.Browser.isMoz||isc.Browser.geckoVersion<20051111)return;var _1=this.parentElement;if(!_1||(!_1.rowRole&&!_1.getRowRole))return;for(var i=this.$252;i<=this.$253;i++){var _3=i,_4=this.getTableElement(_3),_5=_1.getRowRole?_1.getRowRole(_3):_1.rowRole;if(_5&&_4){isc.Canvas.setWAIRole(_4,_5);if(_1.getRowWAIState){var _6=_1.getRowWAIState(_3);if(_6)isc.Canvas.setWAIStates(_4,_6)}}
-this.addCellRoles(_3)}}
-,isc.A.addCellRoles=function isc_GridRenderer_addCellRoles(_1){var _2=this.parentElement;if(!_2||(!_2.cellRole&&!_2.getCellRole))return;for(var i=this.$254;i<=this.$255;i++){var _4=this.getTableElement(_1,i),_5=_2.getCellRole?_2.getCellRole(_1,i):_2.cellRole;if(_5){isc.Canvas.setWAIRole(_4,_5);if(_2.getCellWAIState){var _6=_2.getCellWAIState(_1,i);if(_6)isc.Canvas.setWAIStates(_4,_6)}}}}
-);isc.B._maxIndex=isc.C+2;isc.A=isc.ListGrid.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.waiRole="list";isc.A.rowRole="listitem";isc.B.push(isc.A.getRowRole=function isc_ListGrid_getRowRole(_1){var _2=this.getCellRecord(_1);if(_2&&_2.isSeparator)return"separator";return this.rowRole}
-,isc.A.getRowWAIState=function isc_ListGrid_getRowWAIState(_1){var _2=this.getRecord(_1);if(this.selection&&this.selection.isSelected&&this.selection.isSelected(_1)){return{selected:true}}}
-);isc.B._maxIndex=isc.C+2;isc.A=isc.TreeGrid.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.waiRole="tree";isc.A.rowRole="treeitem";isc.B.push(isc.A.getRowRole=function isc_TreeGrid_getRowRole(_1){if(!isc.isA.Tree(this.data)){return this.rowRole}
-var _2=this.getRecord(_1);if(this.data.isFolder(_2))return"group";else return this.rowRole}
-,isc.A.getRowWAIState=function isc_TreeGrid_getRowWAIState(_1){var _2=this.getRecord(_1),_3=this.data,_4=!!(this.selection&&this.selection.isSelected&&this.selection.isSelected(_2));if(!_4&&!_3.isFolder(_2))return;var _5={selected:_4};if(_3.isFolder(_2))_5.expanded=!!_3.isOpen(_2);return _5}
-);isc.B._maxIndex=isc.C+2;isc.A=isc.Menu.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.waiRole="menu";isc.B.push(isc.A.getRowRole=function isc_Menu_getRowRole(_1){var _2=this.getItem(_1);if(!_2||_2.isSeparator)return"separator";if(_2.checked||_2.checkIf||_2.checkable)return"menuitemcheckable";if(_2.radio)return"menuitemradio";return"menuitem"}
+isc.liteAria=isc.Browser.isIE&&isc.Browser.version<9;isc.A=isc.Canvas;isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.ariaEnabled=function isc_c_Canvas_ariaEnabled(){return isc.screenReader||isc.screenReader!==false&&(isc.Browser.isIE&&isc.Browser.version>=8||!isc.Browser.isIE)}
+,isc.A.setAriaRole=function isc_c_Canvas_setAriaRole(_1,_2){if(this.logIsDebugEnabled("aria")){this.logDebug("ARIA role changed to: "+_2+" on element: "+this.echoLeaf(_1),"aria")}
+_1.setAttribute("role",_2)}
+,isc.A.setAriaState=function isc_c_Canvas_setAriaState(_1,_2,_3){if(this.logIsInfoEnabled("aria")){this.logInfo("ARIA state: "+_2+": "+_3+", set on element: "+isc.echoLeaf(_1),"aria")}
+_1.setAttribute("aria-"+_2,_3)}
+,isc.A.setAriaStates=function isc_c_Canvas_setAriaStates(_1,_2){if(_2==null)return;for(var _3 in _2){this.setAriaState(_1,_3,_2[_3])}}
+,isc.A.clearAriaState=function isc_c_Canvas_clearAriaState(_1,_2){_1.removeAttribute("aria-"+_2)}
+,isc.A.getAriaStateAttributes=function isc_c_Canvas_getAriaStateAttributes(_1){var _2="";for(var _3 in _1){_2+=" aria-"+_3+"='"+_1[_3]+"'"}
+return _2}
+);isc.B._maxIndex=isc.C+6;isc.A=isc.Canvas.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.setAriaRole=function isc_Canvas_setAriaRole(_1){isc.Canvas.setAriaRole(this.getClipHandle(),_1)}
+,isc.A.setAriaState=function isc_Canvas_setAriaState(_1,_2){isc.Canvas.setAriaState(this.getClipHandle(),_1,_2)}
+,isc.A.setAriaStates=function isc_Canvas_setAriaStates(_1){isc.Canvas.setAriaStates(this.getClipHandle(),_1)}
+,isc.A.clearAriaState=function isc_Canvas_clearAriaState(_1){isc.Canvas.clearAriaState(this.getClipHandle(),_1)}
+,isc.A.getAriaStateAttributes=function isc_Canvas_getAriaStateAttributes(){return isc.Canvas.getAriaStateAttributes(this.ariaState)}
+);isc.B._maxIndex=isc.C+5;if(isc.DynamicForm){isc.A=isc.FormItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.setAriaRole=function isc_FormItem_setAriaRole(_1){var _2=this.getFocusElement();if(_2!=null)isc.Canvas.setAriaRole(_2,_1)}
+,isc.A.setAriaState=function isc_FormItem_setAriaState(_1,_2){var _3=this.getFocusElement();if(_3!=null)isc.Canvas.setAriaState(_3,_1,_2)}
+,isc.A.setAriaStates=function isc_FormItem_setAriaStates(_1){var _2=this.getFocusElement();if(_2!=null)isc.Canvas.setAriaStates(_2,_1)}
+,isc.A.clearAriaState=function isc_FormItem_clearAriaState(_1){var _2=this.getFocusElement();if(_2!=null)isc.Canvas.clearAriaState(_2,_1)}
+,isc.A.getAriaState=function isc_FormItem_getAriaState(){var _1={};if(this.required&&this.hiliteRequiredFields)_1.required=true;if(this.hasErrors()){_1.invalid=true;var _2=this.getErrorIconId();_1.describedby=_2}
+if(this.isDisabled())_1.disabled=true;if(isc.isA.CheckboxItem(this))_1.checked=!!this.getValue();return _1}
+,isc.A.addContentRoles=function isc_FormItem_addContentRoles(){if(!isc.Canvas.ariaEnabled()||isc.liteAria)return;if(!this.$kk()||!this.ariaRole)return;this.setAriaRole(this.ariaRole);if(this.textBoxAriaRole){var _1=this.$15h();if(_1!=null)isc.Canvas.setAriaRole(_1,this.textBoxAriaRole)}
+if(this.controlTableAriaRole){var _2=this.$15f();if(_2!=null)isc.Canvas.setAriaRole(_2,this.controlTableAriaRole)}
+if(this.ariaState)this.setAriaStates(this.ariaState);this.setAriaStates(this.getAriaState())}
+);isc.B._maxIndex=isc.C+6;isc.A=isc.TextAreaItem.getPrototype();isc.A.ariaState={multiline:true};isc.A=isc.ComboBoxItem.getPrototype();isc.A.ariaState={autocomplete:"list"};isc.A.ariaRole="combobox";isc.A=isc.SelectItem.getPrototype();isc.A.ariaRole="option";isc.A.controlTableAriaRole="listbox";isc.A.ariaState={expanded:false,selected:true}}
+if(isc.GridRenderer){isc.A=isc.GridRenderer.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.setRowAriaState=function isc_GridRenderer_setRowAriaState(_1,_2,_3){var _4=this.getTableElement(_1);if(_4==null)return;isc.Canvas.setAriaState(_4,_2,_3)}
+,isc.A.setRowAriaStates=function isc_GridRenderer_setRowAriaStates(_1,_2){var _3=this.getTableElement(_1);if(_3==null)return;isc.Canvas.setAriaStates(_3,_2)}
+);isc.B._maxIndex=isc.C+2;isc.A=isc.ListGrid.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.ariaRole="list";isc.A.rowRole="listitem";isc.B.push(isc.A.getRowRole=function isc_ListGrid_getRowRole(_1,_2){if(_2&&_2.isSeparator)return"separator";return this.rowRole}
+,isc.A.getRowAriaState=function isc_ListGrid_getRowAriaState(_1,_2){if(!isc.Canvas.ariaEnabled()||isc.liteAria)return;var _3;if(!this.showAllRecords&&this.data!=null){_3={setsize:this.getTotalRows(),posinset:_1}}
+if(this.selection&&this.selection.isSelected&&this.selection.isSelected(_1)){if(_3==null)_3={}
+_3.selected=true}
+return _3}
+);isc.B._maxIndex=isc.C+2;isc.A=isc.TreeGrid.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.ariaRole="tree";isc.A.rowRole="treeitem";isc.B.push(isc.A.getRowRole=function isc_TreeGrid_getRowRole(_1,_2){return this.rowRole}
+,isc.A.getRowAriaState=function isc_TreeGrid_getRowAriaState(_1,_2){if(!isc.Canvas.ariaEnabled()||isc.liteAria)return;var _3=this.data,_4=!!(this.selection&&this.selection.isSelected&&this.selection.isSelected(_2)),_5=_3.getLevel(_2);var _6={selected:_4,level:_5,setsize:this.getTotalRows(),posinset:_1};if(_3.isFolder(_2))_6.expanded=!!_3.isOpen(_2);return _6}
+);isc.B._maxIndex=isc.C+2;isc.A=isc.Menu.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.ariaRole="menu";isc.B.push(isc.A.getRowRole=function isc_Menu_getRowRole(_1,_2){if(!_2||_2.isSeparator)return"separator";if(_2.checked||_2.checkIf||_2.checkable)return"menuitemcheckable";if(_2.radio)return"menuitemradio";return"menuitem"}
 ,isc.A.getRowState=function isc_Menu_getRowState(_1){if(this.hasSubmenu(this.getItem(_1)))return{haspopup:true}}
-);isc.B._maxIndex=isc.C+2;isc.A=isc.MenuButton.getPrototype();isc.A.waiRole="menu";isc.A=isc.MenuBar.getPrototype();isc.A.waiRole="menubar"}
-(function(){var _1={Button:"button",StretchImgButton:"button",ImgButton:"button",Label:"label",SectionHeader:"heading",ImgSectionHeader:"heading",CheckboxItem:"checkbox",Slider:"slider",ComboBoxItem:"combobox",SelectItem:"listbox",Window:"dialog",Toolbar:"toolbar",TabBar:"tablist",PaneContainer:"tabpanel",ImgTab:"tab",EdgedCanvas:"presentation",BackMask:"presentation"}
-for(var _2 in _1){var _3=isc.ClassFactory.getClass(_2);if(_3)_3.addProperties({waiRole:_1[_2]})}})();if(isc.ListGrid!=null){isc.ClassFactory.defineClass("DataSourceEditor","VLayout");isc.A=isc.DataSourceEditor.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.overflow="visible";isc.A.mainEditorDefaults={_constructor:"ComponentEditor",autoDraw:false,numCols:8,overflow:"visible",backgroundColor:"black",dataSource:"DataSource",fields:[{name:"ID",title:"ID",required:true},{name:"dropExtraFields"},{name:"autoDeriveSchema"},{type:"section",defaultValue:"XPath Binding",showIf:"values.dataFormat != 'iscServer'",itemIds:["dataURL","selectBy","recordXPath","recordName"]},{name:"dataURL",showIf:"values.dataFormat != 'iscServer'"},{name:"selectBy",title:"Select Records By",shouldSaveValue:false,valueMap:{tagName:"Tag Name",xpath:"XPath Expression"},defaultValue:"xpath",redrawOnChange:true,showIf:"values.dataFormat == 'xml'"},{name:"recordXPath",showIf:"values.dataFormat != 'iscServer' && form.getItem('selectBy').getValue() == 'xpath'"},{name:"recordName",showIf:"values.dataFormat == 'xml' && values.selectBy == 'tagName'"},{type:"section",defaultValue:"SQL Binding",showIf:"values.serverType == 'sql' || values.serverType == 'hibernate'",itemIds:["dbName","schemaName","tableName"]},{name:"dbName",showIf:"values.serverType == 'sql'"},{name:"schema",showIf:"values.serverType == 'sql'"},{name:"tableName",showIf:"values.serverType == 'sql' || values.serverType == 'hibernate'"},{name:"beanClassName",showIf:"values.serverType == 'sql' || values.serverType == 'hibernate'"},{type:"section",defaultValue:"Record Titles",sectionExpanded:false,itemIds:["title","pluralTitle","titleField"]},{name:"title"},{name:"pluralTitle"},{name:"titleField"}]};isc.A.fieldEditorDefaults={_constructor:"ListEditor",autoDraw:false,inlineEdit:true,dataSource:"DataSourceField",saveLocally:true,gridButtonsOrientation:"right",backgroundColor:"white",fields:[{name:"name",treeField:true},{name:"title"},{name:"type",width:60},{name:"required",title:"Req.",width:40,canToggle:true},{name:"hidden",width:40},{name:"length",width:60},{name:"primaryKey",title:"is PK",width:40}],formConstructor:isc.ComponentEditor,formProperties:{numCols:4,initialGroups:10},formFields:[{name:"name",canEdit:false},{name:"type"},{name:"title"},{name:"primaryKey"},{name:"valueXPath",colSpan:2,showIf:function(){var _1=this.form.creator,_2=_1?_1.creator.mainEditor:null;return(_2&&_2.getValues().dataFormat!='iscServer')}},{type:"section",defaultValue:"Value Constraints",itemIds:["required","length","valueMap"]},{name:"valueMap",rowSpan:2},{name:"required"},{name:"length"},{type:"section",defaultValue:"Component Binding",itemIds:["hidden","detail","canEdit"]},{name:"canEdit"},{name:"hidden"},{name:"detail"},{type:"section",defaultValue:"Relations",sectionExpanded:false,itemIds:["foreignKey","rootValue"]},{name:"foreignKey"},{name:"rootValue",showTitle:false,colSpan:4}],gridDefaults:{editEvent:"click",listEndEditAction:"next",autoParent:"gridLayout",selectionType:isc.Selection.SINGLE,recordClick:"this.creator.recordClick(record)",modalEditing:true,editorEnter:"if (this.creator.moreButton) this.creator.moreButton.enable()",selectionChanged:function(){if(this.anySelected()&&this.creator.moreButton){this.creator.moreButton.enable()}},contextMenu:{data:[{title:"Remove",click:"target.creator.removeRecord()"}]},styleName:"rightBorderOnly",validateByCell:true,leaveScrollbarGap:false,alternateRecordStyles:true,canRemoveRecords:true,canEdit:true,canEditCell:function(_1,_2){var _3=this.getRecord(_1),_4=this.getField(_2),_5=_4[this.fieldIdProperty],_6=(_5=="name"||_5=="title");if(isc.isA.TreeGrid(this)){if(_3.isFolder&&!(_6||_5=="required"||_5=="hidden")){return false}}
+);isc.B._maxIndex=isc.C+2;isc.A=isc.MenuButton.getPrototype();isc.A.ariaRole="button";isc.A.ariaState={haspopup:true};isc.A=isc.MenuBar.getPrototype();isc.A.ariaRole="menubar"}
+(function(){var _1={Button:"button",StretchImgButton:"button",ImgButton:"button",Label:"label",SectionHeader:"heading",ImgSectionHeader:"heading",CheckboxItem:"checkbox",Slider:"slider",TextItem:"textbox",TextAreaItem:"textbox",Window:"dialog",Toolbar:"toolbar",HTMLFlow:"article",HTMLPane:"article",TabBar:"tablist",PaneContainer:"tabpanel",ImgTab:"tab",EdgedCanvas:"presentation",BackMask:"presentation"}
+for(var _2 in _1){var _3=isc.ClassFactory.getClass(_2);if(_3)_3.addProperties({ariaRole:_1[_2]})}})();if(isc.ListGrid!=null){isc.ClassFactory.defineClass("DataSourceEditor","VLayout");isc.A=isc.DataSourceEditor.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.overflow="visible";isc.A.mainEditorDefaults={_constructor:"ComponentEditor",autoDraw:false,numCols:8,overflow:"visible",backgroundColor:"black",dataSource:"DataSource",fields:[{name:"ID",title:"ID",required:true},{name:"dropExtraFields"},{name:"autoDeriveSchema"},{type:"section",defaultValue:"XPath Binding",showIf:"values.dataFormat != 'iscServer'",itemIds:["dataURL","selectBy","recordXPath","recordName"]},{name:"dataURL",showIf:"values.dataFormat != 'iscServer'"},{name:"selectBy",title:"Select Records By",shouldSaveValue:false,valueMap:{tagName:"Tag Name",xpath:"XPath Expression"},defaultValue:"xpath",redrawOnChange:true,showIf:"values.dataFormat == 'xml'"},{name:"recordXPath",showIf:"values.dataFormat != 'iscServer' && form.getItem('selectBy').getValue() == 'xpath'"},{name:"recordName",showIf:"values.dataFormat == 'xml' && values.selectBy == 'tagName'"},{type:"section",defaultValue:"SQL Binding",showIf:"values.serverType == 'sql' || values.serverType == 'hibernate'",itemIds:["dbName","schemaName","tableName"]},{name:"dbName",showIf:"values.serverType == 'sql'"},{name:"schema",showIf:"values.serverType == 'sql'"},{name:"tableName",showIf:"values.serverType == 'sql' || values.serverType == 'hibernate'"},{name:"beanClassName",showIf:"values.serverType == 'sql' || values.serverType == 'hibernate'"},{type:"section",defaultValue:"Record Titles",sectionExpanded:false,itemIds:["title","pluralTitle","titleField"]},{name:"title"},{name:"pluralTitle"},{name:"titleField"}]};isc.A.fieldEditorDefaults={_constructor:"ListEditor",autoDraw:false,inlineEdit:true,dataSource:"DataSourceField",saveLocally:true,gridButtonsOrientation:"right",backgroundColor:"white",fields:[{name:"name",treeField:true},{name:"title"},{name:"type",width:60},{name:"required",title:"Req.",width:40,canToggle:true},{name:"hidden",width:40},{name:"length",width:60},{name:"primaryKey",title:"is PK",width:40}],formConstructor:isc.ComponentEditor,formProperties:{numCols:4,initialGroups:10},formFields:[{name:"name",canEdit:false},{name:"type"},{name:"title"},{name:"primaryKey"},{name:"valueXPath",colSpan:2,showIf:function(){var _1=this.form.creator,_2=_1?_1.creator.mainEditor:null;return(_2&&_2.getValues().dataFormat!='iscServer')}},{type:"section",defaultValue:"Value Constraints",itemIds:["required","length","valueMap"]},{name:"valueMap",rowSpan:2},{name:"required"},{name:"length"},{type:"section",defaultValue:"Component Binding",itemIds:["hidden","detail","canEdit"]},{name:"canEdit"},{name:"hidden"},{name:"detail"},{type:"section",defaultValue:"Relations",sectionExpanded:false,itemIds:["foreignKey","rootValue"]},{name:"foreignKey"},{name:"rootValue",showTitle:false,colSpan:4}],gridDefaults:{editEvent:"click",listEndEditAction:"next",autoParent:"gridLayout",selectionType:isc.Selection.SINGLE,recordClick:"this.creator.recordClick(record)",modalEditing:true,editorEnter:"if (this.creator.moreButton) this.creator.moreButton.enable()",selectionChanged:function(){if(this.anySelected()&&this.creator.moreButton){this.creator.moreButton.enable()}},contextMenu:{data:[{title:"Remove",click:"target.creator.removeRecord()"}]},styleName:"rightBorderOnly",validateByCell:true,leaveScrollbarGap:false,alternateRecordStyles:true,canRemoveRecords:true,canEdit:true,canEditCell:function(_1,_2){var _3=this.getRecord(_1),_4=this.getField(_2),_5=_4[this.fieldIdProperty],_6=(_5=="name"||_5=="title");if(isc.isA.TreeGrid(this)){if(_3.isFolder&&!(_6||_5=="required"||_5=="hidden")){return false}}
 else{if(this.getDataSource().fieldIsComplexType(_4)&&!_6)
 return false}
 return this.Super('canEditCell',arguments)}},newRecord:function(){if(this.creator.canEditChildSchema){var _1=this.grid,_2=_1.data,_3=this.getSelectedNode();if(!_3)_3=_2.root;var _4=_2.getParent(_3)
@@ -16486,7 +16537,7 @@
 isc._moduleEnd=isc._DataBinding_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('DataBinding module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'DataBinding'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-06-02 (2011-06-02)
+ * Version SC_SNAPSHOT-2011-06-06 (2011-06-06)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -16497,7 +16548,7 @@
 
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-06-02 (2011-06-02)
+ * Version SC_SNAPSHOT-2011-06-06 (2011-06-06)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -16720,7 +16771,7 @@
 );isc.B._maxIndex=isc.C+6;isc._moduleEnd=isc._RichTextEditor_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('RichTextEditor module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'RichTextEditor'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-06-02 (2011-06-02)
+ * Version SC_SNAPSHOT-2011-06-06 (2011-06-06)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
--- a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_History.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_History.js	Wed Jun 15 04:53:52 2011 +0000
@@ -1,6 +1,6 @@
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-06-02 (2011-06-02)
+ * Version SC_SNAPSHOT-2011-06-06 (2011-06-06)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -12,7 +12,7 @@
 var isc = window.isc ? window.isc : {};if(window.isc&&!window.isc.module_History){isc.module_History=1;isc._moduleStart=isc._History_start=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc._moduleEnd&&(!isc.Log||(isc.Log && isc.Log.logIsDebugEnabled('loadTime')))){isc._pTM={ message:'History load/parse time: ' + (isc._moduleStart-isc._moduleEnd) + 'ms', category:'loadTime'};
 if(isc.Log && isc.Log.logDebug)isc.Log.logDebug(isc._pTM.message,'loadTime')
 else if(isc._preLog)isc._preLog[isc._preLog.length]=isc._pTM
-else isc._preLog=[isc._pTM]}isc.definingFramework=true;var isc=window.isc?window.isc:{};isc.$d=new Date().getTime();isc.version="SC_SNAPSHOT-2011-06-02/LGPL Deployment";isc.versionNumber="SC_SNAPSHOT-2011-06-02";isc.buildDate="2011-06-02";isc.expirationDate="";isc.licenseType="LGPL";isc.licenseCompany="Isomorphic Software";isc.licenseSerialNumber="ISC_LGPL_NIGHTLY";isc.licensingPage="http://smartclient.com/product/";isc.$41r={SCServer:{present:"false",name:"SmartClient Server",serverOnly:true,isPro:true},Drawing:{present:"false",name:"Drawing Module"},PluginBridges:{present:"true",name:"PluginBridges Module"},RichTextEditor:{present:"true",name:"RichTextEditor Module"},Calendar:{present:"true",name:"Calendar Module"},Analytics:{present:"false",name:"Analytics Module"},Tools:{present:"${includeTools}",name:"Portal and Tools Module"},NetworkPerformance:{present:"false",name:"Network Performance Module"},FileLoader:{present:"false",name:"Network Performance Module"},RealtimeMessaging:{present:"false",name:"RealtimeMessaging Module"},serverCriteria:{present:"false",name:"Server Advanced Filtering",serverOnly:true,isFeature:true},customSQL:{present:"false",name:"SQL Templating",serverOnly:true,isFeature:true},chaining:{present:"false",name:"Transaction Chaining",serverOnly:true,isFeature:true},batchDSGenerator:{present:"false",name:"Batch DS-Generator",serverOnly:true,isFeature:true},batchUploader:{present:"false",name:"Batch Uploader",serverOnly:true,isFeature:true},transactions:{present:"false",name:"Automatic Transaction Management",serverOnly:true,isFeature:true}};isc.canonicalizeModules=function(_1){if(!_1)return null;if(isc.isA.String(_1)){if(_1.indexOf(",")!=-1){_1=_1.split(",");var _2=/^\s+/,_3=/\s+$/;for(var i=0;i<_1.length;i++){_1[i]=_1[i].replace(_2,"").replace(_3,"")}}else _1=[_1]}
+else isc._preLog=[isc._pTM]}isc.definingFramework=true;var isc=window.isc?window.isc:{};isc.$d=new Date().getTime();isc.version="SC_SNAPSHOT-2011-06-06/LGPL Deployment";isc.versionNumber="SC_SNAPSHOT-2011-06-06";isc.buildDate="2011-06-06";isc.expirationDate="";isc.licenseType="LGPL";isc.licenseCompany="Isomorphic Software";isc.licenseSerialNumber="ISC_LGPL_NIGHTLY";isc.licensingPage="http://smartclient.com/product/";isc.$41r={SCServer:{present:"false",name:"SmartClient Server",serverOnly:true,isPro:true},Drawing:{present:"false",name:"Drawing Module"},PluginBridges:{present:"true",name:"PluginBridges Module"},RichTextEditor:{present:"true",name:"RichTextEditor Module"},Calendar:{present:"true",name:"Calendar Module"},Analytics:{present:"false",name:"Analytics Module"},Tools:{present:"${includeTools}",name:"Portal and Tools Module"},NetworkPerformance:{present:"false",name:"Network Performance Module"},FileLoader:{present:"false",name:"Network Performance Module"},RealtimeMessaging:{present:"false",name:"RealtimeMessaging Module"},serverCriteria:{present:"false",name:"Server Advanced Filtering",serverOnly:true,isFeature:true},customSQL:{present:"false",name:"SQL Templating",serverOnly:true,isFeature:true},chaining:{present:"false",name:"Transaction Chaining",serverOnly:true,isFeature:true},batchDSGenerator:{present:"false",name:"Batch DS-Generator",serverOnly:true,isFeature:true},batchUploader:{present:"false",name:"Batch Uploader",serverOnly:true,isFeature:true},transactions:{present:"false",name:"Automatic Transaction Management",serverOnly:true,isFeature:true}};isc.canonicalizeModules=function(_1){if(!_1)return null;if(isc.isA.String(_1)){if(_1.indexOf(",")!=-1){_1=_1.split(",");var _2=/^\s+/,_3=/\s+$/;for(var i=0;i<_1.length;i++){_1[i]=_1[i].replace(_2,"").replace(_3,"")}}else _1=[_1]}
 return _1};isc.hasOptionalModules=function(_1){if(!_1)return true;_1=isc.canonicalizeModules(_1);for(var i=0;i<_1.length;i++)if(!isc.hasOptionalModule(_1[i]))return false;return true};isc.getMissingModules=function(_1){var _2=[];_1=isc.canonicalizeModules(_1);for(var i=0;i<_1.length;i++){var _4=_1[i];if(!isc.hasOptionalModule(_4))_2.add(isc.$41r[_4])}
 return _2};isc.hasOptionalModule=function(_1){var v=isc.$41r[_1];if(!v){if(isc.Log)isc.Log.logWarn("isc.hasOptionalModule - unknown module: "+_1);return false}
 return v.present=="true"||v.present.charAt(0)=="$"};isc.getOptionalModule=function(_1){return isc.$41r[_1]};isc.$a=window.isc_useSimpleNames;if(isc.$a==null)isc.$a=true;if(window.OpenAjax){isc.$b=isc.versionNumber.replace(/[a-zA-Z_]+/,".0");OpenAjax.registerLibrary("SmartClient","http://smartclient.com/SmartClient",isc.$b,{namespacedMode:!isc.$a,iscVersion:isc.version,buildDate:isc.buildDate,licenseType:isc.licenseType,licenseCompany:isc.licenseCompany,licenseSerialNumber:isc.licenseSerialNumber});OpenAjax.registerGlobals("SmartClient",["isc"])}
@@ -57,7 +57,7 @@
 this.$ab=_1;this.logDebug("history callback: "+_1);if(isc.Class&&this.isAString(_2)){isc.Class.fireCallback(_2,["id","data"],[_1,_3])}else{_2=isc.addProperties({},_2);_2.args=[_1,_3];this.fireSimpleCallback(_2)}}});isc.History.$z();isc._moduleEnd=isc._History_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('History module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'History'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-06-02 (2011-06-02)
+ * Version SC_SNAPSHOT-2011-06-06 (2011-06-06)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
--- a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Wed Jun 15 04:53:52 2011 +0000
@@ -307,6 +307,9 @@
   }
 });
 
+//Prevent errors in smartclient for screenreader, is quite new and unstable for now
+isc.screenReader = false;
+
 // uncomment this code and put a breakpoint to get a better control
 // on from where async operations are started
 //isc.Class._fireOnPause = isc.Class.fireOnPause;
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <NAME><![CDATA[Standard Roles]]></NAME>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.12729]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.12774]]></VERSION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <DESCRIPTION><![CDATA[Pre-configured collection of standard ERP roles]]></DESCRIPTION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HELP><![CDATA[This dataset contains the following roles with their access to corresponding Openbravo entities - windows, reports, actions.
 * Employee - Any person of the enterprise
@@ -27,7 +27,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61--></AD_MODULE>
 
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--30F966407A6F4E15965821BAEE34D25B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.12729]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.12774]]></STARTVERSION>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <NAME><![CDATA[Openbravo 3.0 Framework]]></NAME>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.12729]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.12774]]></VERSION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <DESCRIPTION><![CDATA[Openbravo 3.0 Framework]]></DESCRIPTION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HELP><![CDATA[Contains all the components required to run the Openbravo 3.0 framework]]></HELP>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravov30framework]]></URL>
@@ -24,7 +24,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <UPDATEINFO><![CDATA[minor bugfix release to include latest client.application 2.0.1, client.myob 2.0.2 and client.kernel 2.0.1]]></UPDATEINFO>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989--></AD_MODULE>
 
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--025B181F63CA47B48A920F6983242390-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--025B181F63CA47B48A920F6983242390-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_DEPENDENT_MODULE_ID>
-<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.12729]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.12774]]></STARTVERSION>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDANT_MODULE_NAME><![CDATA[Query/List Widget]]></DEPENDANT_MODULE_NAME>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--5B72D24032DD4879A950194139D961B6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--5B72D24032DD4879A950194139D961B6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_DEPENDENT_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_DEPENDENT_MODULE_ID>
-<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.12729]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.12774]]></STARTVERSION>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDANT_MODULE_NAME><![CDATA[HTML Widget]]></DEPENDANT_MODULE_NAME>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.12729]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.12774]]></STARTVERSION>
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_DEPENDENT_MODULE_ID>
-<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.12729]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.12774]]></STARTVERSION>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDANT_MODULE_NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></DEPENDANT_MODULE_NAME>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -133,7 +133,7 @@
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -147,7 +147,7 @@
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.12729]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.12774]]></STARTVERSION>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -161,7 +161,7 @@
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.12729]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.12774]]></STARTVERSION>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3/src-db/database/configScript.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.v3/src-db/database/configScript.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
   <vector>
-    <versionInfo version="3.0.12565"/>
+    <versionInfo version="3.0.12729"/>
     <columnDataChange tablename="AD_PROCESS" columnname="ISACTIVE" pkRow="800026">
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
@@ -65,10 +65,6 @@
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
     </columnDataChange>
-    <columnDataChange tablename="AD_TAB" columnname="ISACTIVE" pkRow="800074">
-      <oldValue><![CDATA[Y]]></oldValue>
-      <newValue><![CDATA[N]]></newValue>
-    </columnDataChange>
     <columnDataChange tablename="AD_TAB" columnname="ISACTIVE" pkRow="800075">
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -6,7 +6,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <NAME><![CDATA[Openbravo 3.0]]></NAME>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.12729]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.12774]]></VERSION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <DESCRIPTION><![CDATA[Openbravo 3.0 distribution template]]></DESCRIPTION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HELP><![CDATA[Openbravo 3.0 is a collection (distribution) of modules. This template is a container of all the modules and configuration changes that compose Openbravo 3.0.]]></HELP>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <URL><![CDATA[http://forge.openbravo.com/projects/vthree]]></URL>
@@ -20,7 +20,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[MP0]]></VERSION_LABEL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0138E7A89B5E4DC3932462252801FFBC--></AD_MODULE>
 
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -7,7 +7,7 @@
 <!--4D11E3A70650475381139522373CD191-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4D11E3A70650475381139522373CD191-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--4D11E3A70650475381139522373CD191-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.12729]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.12774]]></STARTVERSION>
 <!--4D11E3A70650475381139522373CD191-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_DEPENDENT_MODULE_ID>
-<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDANT_MODULE_NAME><![CDATA[Payment Report]]></DEPENDANT_MODULE_NAME>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--60834727BB114764ACEF019F40A34562-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.12729]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.12774]]></STARTVERSION>
 <!--60834727BB114764ACEF019F40A34562-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--8418885E97D643138B6D907671351E3D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_DEPENDENT_MODULE_ID>
-<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--8418885E97D643138B6D907671351E3D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDANT_MODULE_NAME><![CDATA[Standard Roles]]></DEPENDANT_MODULE_NAME>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MINOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.12729]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.12774]]></STARTVERSION>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.12729]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.12774]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/src-db/database/model/tables/FIN_PAYMENT.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/src-db/database/model/tables/FIN_PAYMENT.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -133,7 +133,7 @@
         <default><![CDATA[1]]></default>
         <onCreateDefault><![CDATA[1]]></onCreateDefault>
       </column>
-      <column name="FINACC_TXN_AMOUNT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
+      <column name="FINACC_TXN_AMOUNT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
         <default/>
         <onCreateDefault><![CDATA[AMOUNT]]></onCreateDefault>
       </column>
--- a/src-db/database/model/tables/FIN_PAYMENT_PROPOSAL.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/src-db/database/model/tables/FIN_PAYMENT_PROPOSAL.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -101,8 +101,8 @@
         <default><![CDATA[1]]></default>
         <onCreateDefault><![CDATA[1]]></onCreateDefault>
       </column>
-      <column name="FINACC_TXN_AMOUNT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
-        <default/>
+      <column name="FINACC_TXN_AMOUNT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default><![CDATA[0]]></default>
         <onCreateDefault><![CDATA[AMOUNT]]></onCreateDefault>
       </column>
       <foreign-key foreignTable="AD_CLIENT" name="FIN_AD_CLIENT_YMENT_PROPOSAL">
--- a/src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
   <database name="VIEW FIN_PAYMENT_DETAIL_V">
-    <view name="FIN_PAYMENT_DETAIL_V"><![CDATA[SELECT psd.fin_payment_scheduledetail_id AS fin_payment_detail_v_id, psd.ad_client_id, psd.ad_org_id, psd.isactive, psd.created, psd.createdby, psd.updated, psd.updatedby, psi.fin_payment_sched_inv_v_id, pso.fin_payment_sched_ord_v_id, i.documentno AS invoiceno, o.documentno AS orderno, p.documentno AS paymentno, pd.fin_payment_id, COALESCE(psi.duedate, pso.duedate) AS duedate, COALESCE(i.grandtotal, o.grandtotal) AS invoicedamt, COALESCE(psi.expected, pso.expected) AS expected, psd.amount AS paidamt, p.c_bpartner_id, p.fin_paymentmethod_id, p.fin_financial_account_id, p.c_currency_id, p.paymentdate, gli.name AS glitemname, pd.writeoffamt, fa.c_currency_id AS finacc_currency_id, p.finacc_txn_convert_rate, psd.amount * p.finacc_txn_convert_rate AS paidconverted, COALESCE(psi.expected, pso.expected) * p.finacc_txn_convert_rate AS expectedconverted
+    <view name="FIN_PAYMENT_DETAIL_V"><![CDATA[SELECT psd.fin_payment_scheduledetail_id AS fin_payment_detail_v_id, psd.ad_client_id, psd.ad_org_id, psd.isactive, psd.created, psd.createdby, psd.updated, psd.updatedby, psi.fin_payment_schedule_id AS fin_payment_sched_inv_v_id, pso.fin_payment_schedule_id AS fin_payment_sched_ord_v_id, i.documentno AS invoiceno, o.documentno AS orderno, p.documentno AS paymentno, pd.fin_payment_id, COALESCE(psi.duedate, pso.duedate) AS duedate, COALESCE(i.grandtotal, o.grandtotal) AS invoicedamt, COALESCE(psi.amount, pso.amount) AS expected, psd.amount AS paidamt, p.c_bpartner_id, p.fin_paymentmethod_id, p.fin_financial_account_id, p.c_currency_id, p.paymentdate, gli.name AS glitemname, pd.writeoffamt, fa.c_currency_id AS finacc_currency_id, p.finacc_txn_convert_rate, psd.amount * p.finacc_txn_convert_rate AS paidconverted, COALESCE(psi.amount, pso.amount) * p.finacc_txn_convert_rate AS expectedconverted
 FROM fin_payment p
 LEFT JOIN fin_financial_account fa ON p.fin_financial_account_id = fa.fin_financial_account_id, fin_payment_detail pd
 JOIN fin_payment_scheduledetail psd ON pd.fin_payment_detail_id = psd.fin_payment_detail_id
-LEFT JOIN fin_payment_sched_inv_v psi ON psd.fin_payment_schedule_invoice = psi.fin_payment_sched_inv_v_id
+LEFT JOIN fin_payment_schedule psi ON psd.fin_payment_schedule_invoice = psi.fin_payment_schedule_id
 LEFT JOIN c_invoice i ON psi.c_invoice_id = i.c_invoice_id
-LEFT JOIN fin_payment_sched_ord_v pso ON psd.fin_payment_schedule_order = pso.fin_payment_sched_ord_v_id
+LEFT JOIN fin_payment_schedule pso ON psd.fin_payment_schedule_order = pso.fin_payment_schedule_id
 LEFT JOIN c_order o ON pso.c_order_id = o.c_order_id
 LEFT JOIN c_glitem gli ON pd.c_glitem_id = gli.c_glitem_id
 WHERE p.fin_payment_id = pd.fin_payment_id]]></view>
--- a/src-db/database/sourcedata/AD_CALLOUT.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/src-db/database/sourcedata/AD_CALLOUT.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -785,31 +785,11 @@
 <!--40289C202E28D30F012E29062DCC004E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--40289C202E28D30F012E29062DCC004E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--40289C202E28D30F012E29062DCC004E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--40289C202E28D30F012E29062DCC004E-->  <NAME><![CDATA[SE_Payment_Currency]]></NAME>
-<!--40289C202E28D30F012E29062DCC004E-->  <DESCRIPTION><![CDATA[Updates exchange rate and financial account txn amount based on selected currency]]></DESCRIPTION>
+<!--40289C202E28D30F012E29062DCC004E-->  <NAME><![CDATA[SE_Payment_MultiCurrency]]></NAME>
+<!--40289C202E28D30F012E29062DCC004E-->  <DESCRIPTION><![CDATA[Updates fields affected by multicurrency in Payment In / Out windows.]]></DESCRIPTION>
 <!--40289C202E28D30F012E29062DCC004E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--40289C202E28D30F012E29062DCC004E--></AD_CALLOUT>
 
-<!--40289C202E28D30F012E2906FF350058--><AD_CALLOUT>
-<!--40289C202E28D30F012E2906FF350058-->  <AD_CALLOUT_ID><![CDATA[40289C202E28D30F012E2906FF350058]]></AD_CALLOUT_ID>
-<!--40289C202E28D30F012E2906FF350058-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--40289C202E28D30F012E2906FF350058-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--40289C202E28D30F012E2906FF350058-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--40289C202E28D30F012E2906FF350058-->  <NAME><![CDATA[SE_Payment_AmountOrConvertRate]]></NAME>
-<!--40289C202E28D30F012E2906FF350058-->  <DESCRIPTION><![CDATA[Update converted (financial account) amount based on amount & specified exchange rate]]></DESCRIPTION>
-<!--40289C202E28D30F012E2906FF350058-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--40289C202E28D30F012E2906FF350058--></AD_CALLOUT>
-
-<!--40289C202E28D30F012E2907AA10005D--><AD_CALLOUT>
-<!--40289C202E28D30F012E2907AA10005D-->  <AD_CALLOUT_ID><![CDATA[40289C202E28D30F012E2907AA10005D]]></AD_CALLOUT_ID>
-<!--40289C202E28D30F012E2907AA10005D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--40289C202E28D30F012E2907AA10005D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--40289C202E28D30F012E2907AA10005D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--40289C202E28D30F012E2907AA10005D-->  <NAME><![CDATA[SE_Payment_FinAccTransactionAmount]]></NAME>
-<!--40289C202E28D30F012E2907AA10005D-->  <DESCRIPTION><![CDATA[Update exchange rate based on specified financial account txn amount]]></DESCRIPTION>
-<!--40289C202E28D30F012E2907AA10005D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--40289C202E28D30F012E2907AA10005D--></AD_CALLOUT>
-
 <!--46349B602D1C4132B9405A97647069AA--><AD_CALLOUT>
 <!--46349B602D1C4132B9405A97647069AA-->  <AD_CALLOUT_ID><![CDATA[46349B602D1C4132B9405A97647069AA]]></AD_CALLOUT_ID>
 <!--46349B602D1C4132B9405A97647069AA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -208717,7 +208717,6 @@
 <!--1EAEE8AF503C4348B565DB81325665D2-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--1EAEE8AF503C4348B565DB81325665D2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--1EAEE8AF503C4348B565DB81325665D2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--1EAEE8AF503C4348B565DB81325665D2-->  <AD_CALLOUT_ID><![CDATA[40289C202E28D30F012E2906FF350058]]></AD_CALLOUT_ID>
 <!--1EAEE8AF503C4348B565DB81325665D2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1EAEE8AF503C4348B565DB81325665D2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1EAEE8AF503C4348B565DB81325665D2-->  <POSITION><![CDATA[15]]></POSITION>
@@ -210687,7 +210686,7 @@
 <!--4028C9BC2DA5C491012DA6832A1003A8-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--4028C9BC2DA5C491012DA6832A1003A8-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--4028C9BC2DA5C491012DA6832A1003A8-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--4028C9BC2DA5C491012DA6832A1003A8-->  <AD_CALLOUT_ID><![CDATA[40289C202E28D30F012E2906FF350058]]></AD_CALLOUT_ID>
+<!--4028C9BC2DA5C491012DA6832A1003A8-->  <AD_CALLOUT_ID><![CDATA[40289C202E28D30F012E29062DCC004E]]></AD_CALLOUT_ID>
 <!--4028C9BC2DA5C491012DA6832A1003A8-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--4028C9BC2DA5C491012DA6832A1003A8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4028C9BC2DA5C491012DA6832A1003A8-->  <POSITION><![CDATA[37]]></POSITION>
@@ -210722,7 +210721,7 @@
 <!--4028C9BC2DA5C491012DA689D11F03BD-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--4028C9BC2DA5C491012DA689D11F03BD-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--4028C9BC2DA5C491012DA689D11F03BD-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--4028C9BC2DA5C491012DA689D11F03BD-->  <AD_CALLOUT_ID><![CDATA[40289C202E28D30F012E2907AA10005D]]></AD_CALLOUT_ID>
+<!--4028C9BC2DA5C491012DA689D11F03BD-->  <AD_CALLOUT_ID><![CDATA[40289C202E28D30F012E29062DCC004E]]></AD_CALLOUT_ID>
 <!--4028C9BC2DA5C491012DA689D11F03BD-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--4028C9BC2DA5C491012DA689D11F03BD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4028C9BC2DA5C491012DA689D11F03BD-->  <POSITION><![CDATA[38]]></POSITION>
@@ -233392,7 +233391,7 @@
 <!--7891269C83DD655DE040007F010155CE-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--7891269C83DD655DE040007F010155CE-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--7891269C83DD655DE040007F010155CE-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--7891269C83DD655DE040007F010155CE-->  <AD_CALLOUT_ID><![CDATA[40289C202E28D30F012E2906FF350058]]></AD_CALLOUT_ID>
+<!--7891269C83DD655DE040007F010155CE-->  <AD_CALLOUT_ID><![CDATA[40289C202E28D30F012E29062DCC004E]]></AD_CALLOUT_ID>
 <!--7891269C83DD655DE040007F010155CE-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--7891269C83DD655DE040007F010155CE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7891269C83DD655DE040007F010155CE-->  <POSITION><![CDATA[4]]></POSITION>
@@ -253932,6 +253931,7 @@
 <!--99E6DCF9068E43C7A699FEAECF28DD5C-->  <AD_TABLE_ID><![CDATA[B9437A72163445C59A0A585209C8ECE5]]></AD_TABLE_ID>
 <!--99E6DCF9068E43C7A699FEAECF28DD5C-->  <AD_REFERENCE_ID><![CDATA[800019]]></AD_REFERENCE_ID>
 <!--99E6DCF9068E43C7A699FEAECF28DD5C-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--99E6DCF9068E43C7A699FEAECF28DD5C-->  <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
 <!--99E6DCF9068E43C7A699FEAECF28DD5C-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--99E6DCF9068E43C7A699FEAECF28DD5C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--99E6DCF9068E43C7A699FEAECF28DD5C-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
@@ -253946,7 +253946,6 @@
 <!--99E6DCF9068E43C7A699FEAECF28DD5C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--99E6DCF9068E43C7A699FEAECF28DD5C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--99E6DCF9068E43C7A699FEAECF28DD5C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--99E6DCF9068E43C7A699FEAECF28DD5C-->  <AD_CALLOUT_ID><![CDATA[40289C202E28D30F012E2907AA10005D]]></AD_CALLOUT_ID>
 <!--99E6DCF9068E43C7A699FEAECF28DD5C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--99E6DCF9068E43C7A699FEAECF28DD5C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--99E6DCF9068E43C7A699FEAECF28DD5C-->  <POSITION><![CDATA[29]]></POSITION>
@@ -257928,7 +257927,7 @@
 <!--D7915EA89A2941A39C8D2570B0F56FC4-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--D7915EA89A2941A39C8D2570B0F56FC4-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--D7915EA89A2941A39C8D2570B0F56FC4-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--D7915EA89A2941A39C8D2570B0F56FC4-->  <AD_CALLOUT_ID><![CDATA[40289C202E28D30F012E2906FF350058]]></AD_CALLOUT_ID>
+<!--D7915EA89A2941A39C8D2570B0F56FC4-->  <AD_CALLOUT_ID><![CDATA[40289C202E28D30F012E29062DCC004E]]></AD_CALLOUT_ID>
 <!--D7915EA89A2941A39C8D2570B0F56FC4-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--D7915EA89A2941A39C8D2570B0F56FC4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--D7915EA89A2941A39C8D2570B0F56FC4-->  <POSITION><![CDATA[28]]></POSITION>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Tue Jun 07 03:36:45 2011 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Wed Jun 15 04:53:52 2011 +0000
@@ -123,7 +123,7 @@
 <!--106-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--106-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--106-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--106-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--106-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--106-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--106-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--106-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
@@ -1510,7 +1510,7 @@
 <!--178-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--178-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--178-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--178-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--178-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--178-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--178-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--178-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
@@ -1730,7 +1730,7 @@
 <!--186-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--186-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--186-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--186-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--186-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--186-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--186-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--186-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
@@ -1899,7 +1899,7 @@
 <!--193-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--193-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--193-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--193-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--193-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--193-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--193-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--193-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -2062,7 +2062,7 @@
 <!--202-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--202-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--202-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--202-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--202-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--202-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--202-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--202-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
@@ -3858,7 +3858,7 @@
 <!--298-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--298-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--298-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--298-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--298-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--298-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--298-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--298-->  <GRID_SEQNO><![CDATA[290]]></GRID_SEQNO>
@@ -4265,7 +4265,7 @@
 <!--322-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--322-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--322-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--322-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--322-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--322-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--322-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--322-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
@@ -4887,7 +4887,7 @@
 <!--349-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--349-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--349-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--349-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--349-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--349-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--349-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--349-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -6331,7 +6331,7 @@
 <!--458-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--458-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--458-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--458-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--458-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--458-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--458-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--458-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
@@ -6653,7 +6653,7 @@
 <!--470-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--470-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--470-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--470-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--470-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--470-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--470-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--470-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
@@ -7027,7 +7027,7 @@
 <!--485-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--485-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--485-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--485-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--485-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--485-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--485-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--485-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -7720,7 +7720,7 @@
 <!--539-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--539-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--539-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--539-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--539-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--539-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--539-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--539-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -7963,7 +7963,7 @@
 <!--550-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--550-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--550-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--550-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--550-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--550-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--550-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--550-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
@@ -8246,7 +8246,7 @@
 <!--658-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--658-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--658-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--658-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--658-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--658-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--658-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--658-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
@@ -8539,7 +8539,7 @@
 <!--673-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--673-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--673-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--673-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--673-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--673-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--673-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--673-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
@@ -9496,7 +9496,7 @@
 <!--713-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--713-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--713-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--713-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--713-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--713-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--713-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--713-->  <GRID_SEQNO><![CDATA[160]]></GRID_SEQNO>
@@ -10433,7 +10433,7 @@
 <!--905-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--905-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--905-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--905-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--905-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--905-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--905-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--905-->  <GRID_SEQNO><![CDATA[280]]></GRID_SEQNO>
@@ -10459,7 +10459,7 @@
 <!--906-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--906-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--906-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--906-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--906-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--906-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--906-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--906-->  <GRID_SEQNO><![CDATA[230]]></GRID_SEQNO>
@@ -10486,7 +10486,7 @@
 <!--907-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--907-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--907-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--907-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--907-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--907-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--907-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--907-->  <GRID_SEQNO><![CDATA[220]]></GRID_SEQNO>
@@ -10512,7 +10512,7 @@
 <!--908-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--908-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--908-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--908-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--908-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--908-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--908-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--908-->  <GRID_SEQNO><![CDATA[260]]></GRID_SEQNO>
@@ -10539,7 +10539,7 @@
 <!--909-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--909-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--909-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--909-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--909-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--909-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--909-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--909-->  <GRID_SEQNO><![CDATA[270]]></GRID_SEQNO>
@@ -10568,7 +10568,7 @@
 <!--910-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--910-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--910-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--910-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--910-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--910-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--910-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--910-->  <GRID_SEQNO><![CDATA[250]]></GRID_SEQNO>
@@ -11992,7 +11992,7 @@
 <!--999-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--999-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--999-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--999-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--999-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--999-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--999-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--999-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -14707,7 +14707,7 @@
 <!--1173-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1173-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1173-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1173-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1173-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1173-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1173-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1173-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -16053,7 +16053,7 @@
 <!--1350-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1350-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1350-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1350-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1350-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1350-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1350-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1350-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
@@ -16701,7 +16701,7 @@
 <!--1379-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1379-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1379-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1379-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1379-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1379-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1379-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1379-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -16726,7 +16726,7 @@
 <!--1380-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--1380-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1380-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1380-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1380-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1380-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1380-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1380-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
@@ -17129,7 +17129,7 @@
 <!--1395-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1395-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1395-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1395-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1395-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1395-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1395-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1395-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
@@ -17558,7 +17558,7 @@
 <!--1411-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1411-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1411-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1411-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1411-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1411-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1411-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1411-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
@@ -18484,7 +18484,7 @@
 <!--1458-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1458-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1458-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1458-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1458-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1458-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1458-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1458-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
@@ -19127,7 +19127,7 @@
 <!--1521-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1521-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1521-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1521-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1521-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1521-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1521-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1521-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -23091,9 +23091,10 @@
 <!--2125-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--2125-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2125-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2125-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--2125-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--2125-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2125-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2125-->  <GRID_SEQNO><![CDATA[5]]></GRID_SEQNO>
 <!--2125-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--2125-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--2125-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -23144,7 +23145,7 @@
 <!--2129-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2129-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2129-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2129-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2129-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2129-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2129-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2129-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -23576,7 +23577,7 @@
 <!--2159-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--2159-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2159-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2159-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2159-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2159-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2159-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2159-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -24131,7 +24132,7 @@
 <!--2201-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2201-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2201-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2201-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2201-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2201-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2201-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2201-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -24775,7 +24776,7 @@
 <!--2227-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--2227-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2227-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2227-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2227-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2227-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2227-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2227-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -24829,7 +24830,7 @@
 <!--2229-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2229-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2229-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2229-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2229-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2229-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2229-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2229-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -24854,7 +24855,7 @@
 <!--2230-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2230-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2230-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2230-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2230-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2230-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2230-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2230-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -25780,7 +25781,7 @@
 <!--2278-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2278-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2278-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2278-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2278-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2278-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2278-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2278-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -25961,7 +25962,7 @@
 <!--2299-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2299-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2299-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2299-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2299-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2299-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2299-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2299-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -27089,7 +27090,7 @@
 <!--2369-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2369-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2369-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2369-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2369-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2369-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2369-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2369-->  <GRID_SEQNO><![CDATA[300]]></GRID_SEQNO>
@@ -27194,7 +27195,7 @@
 <!--2387-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2387-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2387-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2387-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2387-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2387-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2387-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2387-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
@@ -27946,7 +27947,7 @@
 <!--2480-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2480-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2480-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2480-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2480-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2480-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2480-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2480-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -28234,7 +28235,7 @@
 <!--2529-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2529-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2529-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2529-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2529-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2529-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2529-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2529-->  <GRID_SEQNO><![CDATA[180]]></GRID_SEQNO>
@@ -28474,7 +28475,7 @@
 <!--2538-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2538-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2538-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2538-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2538-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2538-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2538-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2538-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
@@ -30104,7 +30105,7 @@
 <!--2613-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2613-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2613-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2613-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2613-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2613-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2613-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2613-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -30502,7 +30503,7 @@
 <!--2653-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2653-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2653-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2653-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2653-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2653-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2653-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2653-->  <GRID_SEQNO><![CDATA[350]]></GRID_SEQNO>
@@ -31171,7 +31172,7 @@
 <!--2695-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2695-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2695-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2695-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2695-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2695-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2695-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2695-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
@@ -32514,7 +32515,7 @@
 <!--2757-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2757-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2757-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2757-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2757-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2757-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2757-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2757-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
@@ -33237,7 +33238,7 @@
 <!--2873-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--2873-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2873-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2873-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2873-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2873-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2873-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2873-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -35447,7 +35448,7 @@
 <!--3004-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3004-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3004-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--3004-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3004-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--3004-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3004-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3004-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -35957,7 +35958,7 @@
 <!--3055-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--3055-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3055-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--3055-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3055-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--3055-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3055-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3055-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -36367,7 +36368,7 @@
 <!--3114-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3114-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3114-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--3114-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3114-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--3114-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3114-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3114-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -37937,7 +37938,7 @@
 <!--3277-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3277-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3277-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--3277-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3277-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--3277-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3277-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3277-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -38098,7 +38099,7 @@
 <!--3290-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--3290-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3290-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--3290-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3290-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--3290-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3290-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3290-->  <GRID_SEQNO><![CDATA[260]]></GRID_SEQNO>
@@ -38419,7 +38420,7 @@
 <!--3311-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3311-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3311-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--3311-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3311-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--3311-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3311-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3311-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
@@ -38527,7 +38528,7 @@
 <!--3316-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3316-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3316-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--3316-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3316-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--3316-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3316-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3316-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -40076,7 +40077,7 @@
 <!--3379-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3379-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3379-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--3379-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3379-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--3379-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3379-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3379-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -42299,7 +42300,7 @@
 <!--3471-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3471-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3471-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--3471-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3471-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--3471-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3471-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3471-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -43771,7 +43772,7 @@
 <!--3613-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3613-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3613-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--3613-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3613-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--3613-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3613-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3613-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -46416,7 +46417,7 @@
 <!--3801-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3801-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3801-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--3801-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3801-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--3801-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3801-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3801-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
@@ -46494,7 +46495,7 @@
 <!--3804-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3804-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3804-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--3804-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3804-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--3804-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3804-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3804-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -48002,7 +48003,7 @@
 <!--3905-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3905-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3905-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--3905-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3905-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--3905-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3905-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3905-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
@@ -49567,7 +49568,7 @@
 <!--3995-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--3995-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3995-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--3995-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3995-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--3995-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3995-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3995-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -49856,7 +49857,7 @@
 <!--4007-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4007-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4007-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4007-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4007-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4007-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4007-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4007-->  <GRID_SEQNO><![CDATA[140]]></GRID_SEQNO>
@@ -51530,7 +51531,7 @@
 <!--4180-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4180-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4180-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4180-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4180-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4180-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4180-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4180-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
@@ -51639,7 +51640,7 @@
 <!--4184-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4184-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4184-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4184-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4184-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4184-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4184-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4184-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
@@ -51927,7 +51928,7 @@
 <!--4196-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4196-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4196-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4196-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4196-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4196-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4196-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4196-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
@@ -52036,7 +52037,7 @@
 <!--4200-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4200-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4200-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4200-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4200-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4200-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4200-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4200-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
@@ -52488,7 +52489,7 @@
 <!--4271-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4271-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4271-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4271-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4271-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4271-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4271-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4271-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
@@ -54508,7 +54509,7 @@
 <!--4560-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4560-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4560-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4560-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4560-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4560-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4560-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4560-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
@@ -54587,7 +54588,7 @@
 <!--4563-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4563-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4563-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4563-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4563-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4563-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4563-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4563-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -54749,7 +54750,7 @@
 <!--4569-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4569-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4569-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4569-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4569-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4569-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4569-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4569-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -54994,7 +54995,7 @@
 <!--4582-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4582-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4582-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4582-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4582-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4582-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4582-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4582-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -55045,7 +55046,7 @@
 <!--4584-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4584-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4584-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4584-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4584-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4584-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4584-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4584-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
@@ -55072,7 +55073,7 @@
 <!--4585-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4585-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4585-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4585-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4585-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4585-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4585-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4585-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -55099,7 +55100,7 @@
 <!--4586-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4586-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4586-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4586-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4586-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4586-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4586-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4586-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -55126,7 +55127,7 @@
 <!--4587-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4587-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4587-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4587-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4587-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4587-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4587-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4587-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -55153,7 +55154,7 @@
 <!--4588-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4588-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4588-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4588-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4588-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4588-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4588-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4588-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -55180,7 +55181,7 @@
 <!--4589-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4589-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4589-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4589-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4589-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4589-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4589-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4589-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -55207,7 +55208,7 @@
 <!--4590-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4590-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4590-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4590-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4590-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4590-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4590-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4590-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
@@ -55234,7 +55235,7 @@
 <!--4591-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4591-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4591-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4591-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4591-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4591-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4591-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4591-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
@@ -55261,7 +55262,7 @@
 <!--4592-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4592-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4592-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4592-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4592-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4592-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4592-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4592-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
@@ -55288,7 +55289,7 @@
 <!--4593-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4593-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4593-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4593-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4593-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4593-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4593-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4593-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
@@ -55315,7 +55316,7 @@
 <!--4594-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4594-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4594-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4594-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4594-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4594-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4594-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4594-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
@@ -55342,7 +55343,7 @@
 <!--4595-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4595-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4595-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4595-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4595-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4595-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4595-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4595-->  <GRID_SEQNO><![CDATA[140]]></GRID_SEQNO>
@@ -55369,7 +55370,7 @@
 <!--4596-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4596-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4596-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4596-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4596-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4596-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4596-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4596-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
@@ -55396,7 +55397,7 @@
 <!--4597-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4597-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4597-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4597-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4597-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4597-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4597-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4597-->  <GRID_SEQNO><![CDATA[160]]></GRID_SEQNO>
@@ -55423,7 +55424,7 @@
 <!--4598-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4598-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4598-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4598-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4598-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4598-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4598-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4598-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
@@ -55450,7 +55451,7 @@
 <!--4599-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4599-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4599-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4599-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4599-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4599-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4599-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4599-->  <GRID_SEQNO><![CDATA[180]]></GRID_SEQNO>
@@ -55477,7 +55478,7 @@
 <!--4601-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4601-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4601-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4601-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4601-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4601-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4601-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4601-->  <GRID_SEQNO><![CDATA[190]]></GRID_SEQNO>
@@ -55529,7 +55530,7 @@
 <!--4603-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4603-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4603-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4603-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4603-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4603-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4603-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4603-->  <GRID_SEQNO><![CDATA[200]]></GRID_SEQNO>
@@ -55556,7 +55557,7 @@
 <!--4604-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4604-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4604-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4604-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4604-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4604-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4604-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4604-->  <GRID_SEQNO><![CDATA[210]]></GRID_SEQNO>
@@ -55583,7 +55584,7 @@
 <!--4605-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4605-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4605-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4605-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4605-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4605-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4605-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4605-->  <GRID_SEQNO><![CDATA[220]]></GRID_SEQNO>
@@ -55610,7 +55611,7 @@
 <!--4606-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4606-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4606-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4606-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4606-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4606-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4606-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4606-->  <GRID_SEQNO><![CDATA[230]]></GRID_SEQNO>
@@ -55639,7 +55640,7 @@
 <!--4607-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4607-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4607-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4607-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4607-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4607-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4607-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4607-->  <GRID_SEQNO><![CDATA[240]]></GRID_SEQNO>
@@ -55691,7 +55692,7 @@
 <!--4609-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4609-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4609-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4609-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4609-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4609-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4609-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4609-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
@@ -55770,7 +55771,7 @@
 <!--4612-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4612-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4612-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4612-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4612-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4612-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4612-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4612-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -56096,7 +56097,7 @@
 <!--4629-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4629-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4629-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4629-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4629-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4629-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4629-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4629-->  <GRID_SEQNO><![CDATA[310]]></GRID_SEQNO>
@@ -56280,7 +56281,7 @@
 <!--4727-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4727-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4727-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4727-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4727-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4727-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4727-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4727-->  <GRID_SEQNO><![CDATA[240]]></GRID_SEQNO>
@@ -56673,7 +56674,7 @@
 <!--4904-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4904-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4904-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4904-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4904-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4904-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4904-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4904-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
@@ -56752,7 +56753,7 @@
 <!--4907-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4907-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4907-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4907-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4907-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4907-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4907-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4907-->  <GRID_SEQNO><![CDATA[160]]></GRID_SEQNO>
@@ -57344,7 +57345,7 @@
 <!--4954-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4954-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4954-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4954-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4954-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4954-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4954-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4954-->  <GRID_SEQNO><![CDATA[250]]></GRID_SEQNO>
@@ -57371,7 +57372,7 @@
 <!--4955-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4955-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4955-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4955-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4955-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4955-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4955-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4955-->  <GRID_SEQNO><![CDATA[260]]></GRID_SEQNO>
@@ -57532,7 +57533,7 @@
 <!--5118-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5118-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5118-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5118-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5118-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5118-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5118-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5118-->  <GRID_SEQNO><![CDATA[140]]></GRID_SEQNO>
@@ -57667,7 +57668,7 @@
 <!--5132-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5132-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5132-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5132-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5132-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5132-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5132-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5132-->  <GRID_SEQNO><![CDATA[190]]></GRID_SEQNO>
@@ -58664,7 +58665,7 @@
 <!--5243-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5243-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5243-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5243-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5243-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5243-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5243-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5243-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
@@ -60443,7 +60444,7 @@
 <!--5332-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5332-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5332-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5332-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5332-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5332-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5332-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5332-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
@@ -60496,7 +60497,7 @@
 <!--5334-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5334-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5334-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5334-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5334-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5334-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5334-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5334-->  <GRID_SEQNO><![CDATA[290]]></GRID_SEQNO>
@@ -61267,7 +61268,7 @@
 <!--5375-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5375-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5375-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5375-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5375-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5375-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5375-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5375-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -67367,7 +67368,7 @@
 <!--5718-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--5718-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5718-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5718-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5718-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5718-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5718-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5718-->  <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO>
@@ -67867,7 +67868,7 @@
 <!--5746-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5746-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5746-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5746-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5746-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5746-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5746-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--5746-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
@@ -68063,7 +68064,7 @@
 <!--5754-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5754-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5754-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5754-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5754-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5754-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5754-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--5754-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
@@ -68140,7 +68141,7 @@
 <!--5826-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5826-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5826-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5826-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5826-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5826-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5826-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5826-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -70028,7 +70029,7 @@
 <!--6297-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--6297-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6297-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6297-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6297-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6297-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6297-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
 <!--6297-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -71019,7 +71020,7 @@
 <!--6374-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6374-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6374-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6374-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6374-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6374-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6374-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6374-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -71367,7 +71368,7 @@
 <!--6387-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6387-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6387-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6387-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6387-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6387-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6387-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6387-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
@@ -72271,7 +72272,7 @@
 <!--6513-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6513-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6513-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6513-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6513-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6513-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6513-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6513-->  <GRID_SEQNO><![CDATA[210]]></GRID_SEQNO>
@@ -72439,7 +72440,7 @@
 <!--6519-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6519-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6519-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6519-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6519-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6519-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6519-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6519-->  <GRID_SEQNO><![CDATA[230]]></GRID_SEQNO>
@@ -72467,7 +72468,7 @@
 <!--6520-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6520-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6520-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6520-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6520-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6520-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6520-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6520-->  <GRID_SEQNO><![CDATA[220]]></GRID_SEQNO>
@@ -72522,7 +72523,7 @@
 <!--6522-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6522-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6522-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6522-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6522-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6522-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6522-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6522-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -73823,7 +73824,7 @@
 <!--6618-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6618-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6618-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6618-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6618-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6618-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6618-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6618-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
@@ -73874,7 +73875,7 @@
 <!--6620-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6620-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6620-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6620-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6620-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6620-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6620-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6620-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
@@ -73900,7 +73901,7 @@
 <!--6621-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6621-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6621-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6621-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6621-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6621-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6621-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6621-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
@@ -73926,7 +73927,7 @@
 <!--6622-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6622-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6622-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6622-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6622-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6622-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6622-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6622-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
@@ -75148,7 +75149,7 @@
 <!--6734-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6734-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6734-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6734-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6734-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6734-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6734-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6734-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
@@ -75174,7 +75175,7 @@
 <!--6735-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6735-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6735-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6735-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6735-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6735-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6735-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6735-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
@@ -75200,7 +75201,7 @@
 <!--6736-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6736-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6736-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6736-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6736-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6736-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6736-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6736-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -75280,7 +75281,7 @@
 <!--6739-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6739-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6739-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6739-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6739-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6739-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6739-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6739-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -75306,7 +75307,7 @@
 <!--6740-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6740-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6740-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6740-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6740-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6740-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6740-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6740-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
@@ -75360,7 +75361,7 @@
 <!--6742-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6742-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6742-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6742-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6742-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6742-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6742-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6742-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -75413,7 +75414,7 @@
 <!--6744-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6744-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6744-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6744-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6744-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6744-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6744-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6744-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -75439,7 +75440,7 @@
 <!--6745-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6745-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6745-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6745-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6745-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6745-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6745-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6745-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
@@ -76779,7 +76780,7 @@
 <!--7015-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--7015-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--7015-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7015-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7015-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--7015-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--7015-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7015-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -82521,7 +82522,7 @@
 <!--7837-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--7837-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--7837-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7837-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7837-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--7837-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--7837-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7837-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
@@ -82812,7 +82813,7 @@
 <!--7849-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--7849-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--7849-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7849-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7849-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--7849-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--7849-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7849-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -83829,7 +83830,7 @@
 <!--7892-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--7892-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--7892-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7892-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7892-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--7892-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--7892-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7892-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -85427,7 +85428,7 @@
 <!--7959-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--7959-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--7959-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7959-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7959-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--7959-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--7959-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7959-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -86250,7 +86251,7 @@
 <!--7993-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--7993-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--7993-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7993-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7993-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--7993-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--7993-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7993-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -86604,7 +86605,7 @@
 <!--8085-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8085-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8085-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8085-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8085-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8085-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8085-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8085-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
@@ -86630,7 +86631,7 @@
 <!--8086-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8086-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8086-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8086-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8086-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8086-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8086-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8086-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
@@ -86656,7 +86657,7 @@
 <!--8087-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8087-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8087-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8087-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8087-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8087-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8087-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8087-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
@@ -86682,7 +86683,7 @@
 <!--8088-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8088-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8088-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8088-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8088-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8088-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8088-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8088-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
@@ -86708,7 +86709,7 @@
 <!--8089-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8089-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8089-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8089-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8089-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8089-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8089-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8089-->  <GRID_SEQNO><![CDATA[140]]></GRID_SEQNO>
@@ -86761,7 +86762,7 @@
 <!--8091-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8091-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8091-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8091-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8091-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8091-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8091-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8091-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
@@ -86787,7 +86788,7 @@
 <!--8092-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8092-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8092-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8092-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8092-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8092-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8092-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8092-->  <GRID_SEQNO><![CDATA[160]]></GRID_SEQNO>
@@ -86813,7 +86814,7 @@
 <!--8093-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8093-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8093-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8093-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8093-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8093-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8093-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8093-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
@@ -86866,7 +86867,7 @@
 <!--8095-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8095-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8095-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8095-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8095-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8095-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8095-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8095-->  <GRID_SEQNO><![CDATA[180]]></GRID_SEQNO>
@@ -86892,7 +86893,7 @@
 <!--8096-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8096-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8096-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8096-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8096-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8096-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8096-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8096-->  <GRID_SEQNO><![CDATA[190]]></GRID_SEQNO>
@@ -86947,7 +86948,7 @@
 <!--8098-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8098-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8098-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8098-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8098-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8098-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8098-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8098-->  <GRID_SEQNO><![CDATA[280]]></GRID_SEQNO>
@@ -86973,7 +86974,7 @@
 <!--8099-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8099-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8099-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8099-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8099-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8099-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8099-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8099-->  <GRID_SEQNO><![CDATA[290]]></GRID_SEQNO>
@@ -86999,7 +87000,7 @@
 <!--8100-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8100-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8100-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8100-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8100-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8100-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8100-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8100-->  <GRID_SEQNO><![CDATA[250]]></GRID_SEQNO>
@@ -87025,7 +87026,7 @@
 <!--8101-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8101-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8101-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8101-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8101-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8101-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8101-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8101-->  <GRID_SEQNO><![CDATA[240]]></GRID_SEQNO>
@@ -87051,7 +87052,7 @@
 <!--8102-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8102-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8102-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8102-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8102-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8102-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8102-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8102-->  <GRID_SEQNO><![CDATA[230]]></GRID_SEQNO>
@@ -87077,7 +87078,7 @@
 <!--8103-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8103-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8103-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8103-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8103-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8103-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8103-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8103-->  <GRID_SEQNO><![CDATA[220]]></GRID_SEQNO>
@@ -87158,7 +87159,7 @@
 <!--8106-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8106-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8106-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8106-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8106-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8106-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8106-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8106-->  <GRID_SEQNO><![CDATA[210]]></GRID_SEQNO>
@@ -87211,7 +87212,7 @@
 <!--8108-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8108-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8108-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8108-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8108-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8108-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8108-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8108-->  <GRID_SEQNO><![CDATA[200]]></GRID_SEQNO>
@@ -87370,7 +87371,7 @@
 <!--8114-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8114-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8114-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8114-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8114-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8114-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8114-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8114-->  <GRID_SEQNO><![CDATA[270]]></GRID_SEQNO>
@@ -87396,7 +87397,7 @@
 <!--8115-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8115-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8115-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8115-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8115-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8115-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8115-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8115-->  <GRID_SEQNO><![CDATA[260]]></GRID_SEQNO>
@@ -87422,7 +87423,7 @@
 <!--8148-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8148-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8148-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8148-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8148-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8148-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8148-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8148-->  <GRID_SEQNO><![CDATA[160]]></GRID_SEQNO>
@@ -87957,7 +87958,7 @@
 <!--8179-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8179-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8179-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8179-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8179-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8179-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8179-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8179-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
@@ -88832,7 +88833,7 @@
 <!--800007-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800007-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800007-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800007-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800007-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800007-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800007-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800007-->  <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO>
@@ -95558,7 +95559,7 @@
 <!--800415-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800415-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800415-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800415-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800415-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800415-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800415-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800415-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
@@ -95851,7 +95852,7 @@
 <!--800430-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800430-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800430-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800430-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800430-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800430-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800430-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800430-->  <GRID_SEQNO><![CDATA[190]]></GRID_SEQNO>
@@ -95929,7 +95930,7 @@
 <!--800433-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800433-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800433-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800433-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800433-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800433-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800433-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800433-->  <GRID_SEQNO><![CDATA[200]]></GRID_SEQNO>
@@ -96336,7 +96337,7 @@
 <!--800449-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800449-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800449-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800449-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800449-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800449-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800449-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800449-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
@@ -96362,7 +96363,7 @@
 <!--800450-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--800450-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800450-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800450-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800450-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800450-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800450-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800450-->  <GRID_SEQNO><![CDATA[160]]></GRID_SEQNO>
@@ -96636,7 +96637,7 @@
 <!--800482-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800482-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800482-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800482-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800482-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800482-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800482-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800482-->  <GRID_SEQNO><![CDATA[240]]></GRID_SEQNO>
@@ -96662,7 +96663,7 @@
 <!--800483-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--800483-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800483-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800483-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800483-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800483-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800483-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800483-->  <GRID_SEQNO><![CDATA[160]]></GRID_SEQNO>
@@ -96740,7 +96741,7 @@
 <!--800487-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800487-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800487-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800487-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800487-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800487-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800487-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800487-->  <GRID_SEQNO><![CDATA[230]]></GRID_SEQNO>
@@ -96846,7 +96847,7 @@
 <!--800491-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--800491-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800491-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800491-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800491-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800491-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800491-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800491-->  <GRID_SEQNO><![CDATA[210]]></GRID_SEQNO>
@@ -96980,7 +96981,7 @@
 <!--800497-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800497-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800497-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800497-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800497-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800497-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800497-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800497-->  <GRID_SEQNO><![CDATA[190]]></GRID_SEQNO>
@@ -97115,7 +97116,7 @@
 <!--800511-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800511-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800511-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800511-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800511-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800511-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800511-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800511-->  <GRID_SEQNO><![CDATA[180]]></GRID_SEQNO>
@@ -97141,7 +97142,7 @@
 <!--800512-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800512-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800512-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800512-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800512-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800512-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800512-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800512-->  <GRID_SEQNO><![CDATA[200]]></GRID_SEQNO>
@@ -97305,7 +97306,7 @@
 <!--800518-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800518-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800518-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800518-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800518-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800518-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800518-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800518-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
@@ -97331,7 +97332,7 @@
 <!--800519-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800519-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800519-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800519-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800519-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800519-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800519-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800519-->  <GRID_SEQNO><![CDATA[190]]></GRID_SEQNO>
@@ -97459,7 +97460,7 @@
 <!--800524-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800524-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800524-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800524-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800524-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800524-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800524-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800524-->  <GRID_SEQNO><![CDATA[160]]></GRID_SEQNO>
@@ -97540,7 +97541,7 @@
 <!--800527-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800527-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800527-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800527-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800527-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800527-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800527-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800527-->  <GRID_SEQNO><![CDATA[200]]></GRID_SEQNO>
@@ -97895,7 +97896,7 @@
 <!--800540-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800540-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800540-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800540-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800540-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800540-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800540-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800540-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
@@ -97921,7 +97922,7 @@
 <!--800541-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800541-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800541-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800541-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800541-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800541-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800541-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800541-->  <GRID_SEQNO><![CDATA[180]]></GRID_SEQNO>
@@ -98081,7 +98082,7 @@
 <!--800548-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800548-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800548-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800548-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800548-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800548-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800548-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800548-->  <GRID_SEQNO><![CDATA[140]]></GRID_SEQNO>
@@ -98107,7 +98108,7 @@
 <!--800549-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800549-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800549-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800549-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800549-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800549-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800549-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800549-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
@@ -98213,7 +98214,7 @@
 <!--800553-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800553-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800553-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800553-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800553-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800553-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800553-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800553-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
@@ -98292,7 +98293,7 @@
 <!--800556-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800556-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800556-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800556-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800556-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800556-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800556-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800556-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
@@ -98400,7 +98401,7 @@
 <!--800560-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800560-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800560-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800560-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800560-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800560-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800560-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800560-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
@@ -98592,7 +98593,7 @@
 <!--800590-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800590-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800590-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800590-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800590-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800590-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800590-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800590-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
@@ -98808,7 +98809,7 @@
 <!--800598-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--800598-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800598-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800598-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800598-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800598-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800598-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800598-->  <GRID_SEQNO><![CDATA[180]]></GRID_SEQNO>
@@ -98861,7 +98862,7 @@
 <!--800600-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800600-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800600-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800600-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800600-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800600-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800600-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800600-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
@@ -98914,7 +98915,7 @@
 <!--800602-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--800602-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800602-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800602-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800602-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800602-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800602-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800602-->  <GRID_SEQNO><![CDATA[160]]></GRID_SEQNO>
@@ -98967,7 +98968,7 @@
 <!--800604-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800604-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800604-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800604-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800604-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800604-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800604-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800604-->  <GRID_SEQNO><![CDATA[190]]></GRID_SEQNO>
@@ -98993,7 +98994,7 @@
 <!--800605-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--800605-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800605-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800605-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800605-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800605-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800605-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800605-->  <GRID_SEQNO><![CDATA[140]]></GRID_SEQNO>
@@ -99071,7 +99072,7 @@
 <!--800608-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800608-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800608-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800608-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800608-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800608-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800608-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800608-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
@@ -99255,7 +99256,7 @@
 <!--800615-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800615-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800615-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800615-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800615-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800615-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800615-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800615-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -100092,7 +100093,7 @@
 <!--800649-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800649-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800649-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800649-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800649-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800649-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800649-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800649-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -100247,7 +100248,7 @@
 <!--800655-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800655-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800655-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800655-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800655-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800655-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800655-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800655-->  <GRID_SEQNO><![CDATA[240]]></GRID_SEQNO>
@@ -100273,7 +100274,7 @@
 <!--800656-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800656-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800656-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800656-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800656-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800656-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800656-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800656-->  <GRID_SEQNO><![CDATA[290]]></GRID_SEQNO>
@@ -100324,7 +100325,7 @@
 <!--800658-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800658-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800658-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800658-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800658-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800658-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800658-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800658-->  <GRID_SEQNO><![CDATA[230]]></GRID_SEQNO>
@@ -100402,7 +100403,7 @@
 <!--800661-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800661-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800661-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800661-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800661-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800661-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--800661-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800661-->  <GRID_SEQNO><![CDATA[280]]></GRID_SEQNO>
@@ -100481,7 +100482,7 @@
 <!--800664-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800664-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800664-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800664-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800664-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800664-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800664-->  <GRID_SEQNO><![CDATA[270]]></GRID_SEQNO>
 <!--800664-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -100823,7 +100824,7 @@
 <!--800677-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800677-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800677-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800677-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800677-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800677-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800677-->  <GRID_SEQNO><![CDATA[260]]></GRID_SEQNO>
 <!--800677-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -100848,7 +100849,7 @@
 <!--800678-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800678-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800678-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--800678-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--800678-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--800678-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800678-->  <GRID_SEQNO><![CDATA[250]]></GRID_SEQNO>
 <!--800678-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -108193,7 +108194,7 @@
 <!--801086-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801086-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801086-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801086-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801086-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801086-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801086-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801086-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -108380,7 +108381,7 @@
 <!--801093-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801093-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801093-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801093-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801093-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801093-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801093-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801093-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -108939,7 +108940,7 @@
 <!--801166-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801166-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801166-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801166-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801166-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801166-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801166-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801166-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -110668,7 +110669,7 @@
 <!--801422-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--801422-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801422-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801422-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801422-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801422-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801422-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801422-->  <GRID_SEQNO><![CDATA[400]]></GRID_SEQNO>
@@ -110722,7 +110723,7 @@
 <!--801424-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801424-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801424-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801424-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801424-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801424-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801424-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801424-->  <GRID_SEQNO><![CDATA[380]]></GRID_SEQNO>
@@ -110749,7 +110750,7 @@
 <!--801425-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801425-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801425-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801425-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801425-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801425-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801425-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801425-->  <GRID_SEQNO><![CDATA[300]]></GRID_SEQNO>
@@ -110776,7 +110777,7 @@
 <!--801426-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--801426-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801426-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801426-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801426-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801426-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801426-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801426-->  <GRID_SEQNO><![CDATA[310]]></GRID_SEQNO>
@@ -110830,7 +110831,7 @@
 <!--801428-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801428-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801428-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801428-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801428-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801428-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801428-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801428-->  <GRID_SEQNO><![CDATA[330]]></GRID_SEQNO>
@@ -110856,7 +110857,7 @@
 <!--801429-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801429-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801429-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801429-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801429-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801429-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801429-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801429-->  <GRID_SEQNO><![CDATA[340]]></GRID_SEQNO>
@@ -110883,7 +110884,7 @@
 <!--801430-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--801430-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801430-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801430-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801430-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801430-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801430-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801430-->  <GRID_SEQNO><![CDATA[350]]></GRID_SEQNO>
@@ -110910,7 +110911,7 @@
 <!--801431-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801431-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801431-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801431-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801431-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801431-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801431-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801431-->  <GRID_SEQNO><![CDATA[360]]></GRID_SEQNO>
@@ -110937,7 +110938,7 @@
 <!--801432-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801432-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801432-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801432-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801432-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801432-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801432-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801432-->  <GRID_SEQNO><![CDATA[370]]></GRID_SEQNO>
@@ -110991,7 +110992,7 @@
 <!--801434-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801434-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801434-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801434-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801434-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801434-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801434-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801434-->  <GRID_SEQNO><![CDATA[390]]></GRID_SEQNO>
@@ -111074,7 +111075,7 @@
 <!--801437-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801437-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801437-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801437-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801437-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801437-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801437-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801437-->  <GRID_SEQNO><![CDATA[420]]></GRID_SEQNO>
@@ -111100,7 +111101,7 @@
 <!--801438-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801438-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801438-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801438-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801438-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801438-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801438-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801438-->  <GRID_SEQNO><![CDATA[410]]></GRID_SEQNO>
@@ -111154,7 +111155,7 @@
 <!--801440-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--801440-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801440-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801440-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801440-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801440-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801440-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801440-->  <GRID_SEQNO><![CDATA[250]]></GRID_SEQNO>
@@ -111235,7 +111236,7 @@
 <!--801443-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--801443-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801443-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801443-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801443-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801443-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801443-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801443-->  <GRID_SEQNO><![CDATA[460]]></GRID_SEQNO>
@@ -111261,7 +111262,7 @@
 <!--801444-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--801444-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801444-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801444-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801444-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801444-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801444-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801444-->  <GRID_SEQNO><![CDATA[240]]></GRID_SEQNO>
@@ -111314,7 +111315,7 @@
 <!--801446-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801446-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801446-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801446-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801446-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801446-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801446-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801446-->  <GRID_SEQNO><![CDATA[470]]></GRID_SEQNO>
@@ -111367,7 +111368,7 @@
 <!--801448-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801448-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801448-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801448-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801448-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801448-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801448-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801448-->  <GRID_SEQNO><![CDATA[260]]></GRID_SEQNO>
@@ -111419,7 +111420,7 @@
 <!--801450-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801450-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801450-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801450-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801450-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801450-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801450-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801450-->  <GRID_SEQNO><![CDATA[270]]></GRID_SEQNO>
@@ -111445,7 +111446,7 @@
 <!--801451-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801451-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801451-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801451-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801451-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801451-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801451-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801451-->  <GRID_SEQNO><![CDATA[280]]></GRID_SEQNO>
@@ -111471,7 +111472,7 @@
 <!--801452-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801452-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801452-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801452-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801452-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801452-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801452-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801452-->  <GRID_SEQNO><![CDATA[290]]></GRID_SEQNO>
@@ -111801,7 +111802,7 @@
 <!--801466-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801466-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801466-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801466-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801466-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801466-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801466-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801466-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
@@ -113180,7 +113181,7 @@
 <!--801536-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--801536-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801536-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801536-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801536-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801536-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801536-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801536-->  <GRID_SEQNO><![CDATA[440]]></GRID_SEQNO>
@@ -113342,7 +113343,7 @@
 <!--801543-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801543-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801543-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801543-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801543-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801543-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801543-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801543-->  <GRID_SEQNO><![CDATA[430]]></GRID_SEQNO>
@@ -113394,7 +113395,7 @@
 <!--801545-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801545-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801545-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--801545-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--801545-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--801545-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--801545-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--801545-->  <GRID_SEQNO><![CDATA[450]]></GRID_SEQNO>
@@ -119011,7 +119012,7 @@
 <!--802377-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--802377-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--802377-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802377-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--802377-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--802377-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--802377-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802377-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -121792,7 +121793,7 @@
 <!--802617-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--802617-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--802617-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802617-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--802617-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--802617-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--802617-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802617-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
@@ -121817,7 +121818,7 @@
 <!--802619-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--802619-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--802619-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802619-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--802619-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--802619-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--802619-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802619-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
@@ -124440,7 +124441,7 @@
 <!--802797-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--802797-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--802797-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802797-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--802797-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--802797-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--802797-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802797-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -124466,7 +124467,7 @@
 <!--802799-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--802799-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--802799-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802799-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--802799-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--802799-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--802799-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802799-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -124492,7 +124493,7 @@
 <!--802800-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--802800-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--802800-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802800-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--802800-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--802800-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--802800-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802800-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -124647,7 +124648,7 @@
 <!--802806-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--802806-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--802806-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802806-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--802806-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--802806-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--802806-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802806-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -124908,7 +124909,7 @@
 <!--802819-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--802819-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--802819-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802819-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--802819-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--802819-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--802819-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802819-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -124934,7 +124935,7 @@
 <!--802821-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--802821-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--802821-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802821-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--802821-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--802821-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--802821-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802821-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -124985,7 +124986,7 @@
 <!--802823-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--802823-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--802823-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802823-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--802823-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--802823-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--802823-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802823-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -125115,7 +125116,7 @@
 <!--802828-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--802828-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--802828-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802828-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--802828-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--802828-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--802828-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802828-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -125639,7 +125640,7 @@
 <!--802850-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--802850-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--802850-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802850-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--802850-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--802850-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--802850-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802850-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -125689,7 +125690,7 @@
 <!--802852-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--802852-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--802852-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802852-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--802852-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--802852-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--802852-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802852-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -126135,7 +126136,7 @@
 <!--802869-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--802869-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--802869-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802869-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--802869-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--802869-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--802869-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802869-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -127709,7 +127710,7 @@
 <!--802955-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--802955-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--802955-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802955-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--802955-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--802955-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--802955-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802955-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
@@ -127792,7 +127793,7 @@
 <!--802958-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--802958-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--802958-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802958-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--802958-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--802958-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--802958-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802958-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
@@ -128472,7 +128473,7 @@
 <!--802997-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--802997-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--802997-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802997-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--802997-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--802997-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--802997-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802997-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -128523,7 +128524,7 @@
 <!--803000-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803000-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803000-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803000-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803000-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803000-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803000-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803000-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -128549,7 +128550,7 @@
 <!--803001-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803001-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803001-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803001-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803001-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803001-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803001-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803001-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -128679,7 +128680,7 @@
 <!--803006-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803006-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803006-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803006-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803006-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803006-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803006-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803006-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -129408,7 +129409,7 @@
 <!--803043-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803043-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803043-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803043-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803043-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803043-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803043-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803043-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -129434,7 +129435,7 @@
 <!--803044-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803044-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803044-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803044-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803044-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803044-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803044-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803044-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -129460,7 +129461,7 @@
 <!--803045-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803045-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803045-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803045-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803045-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803045-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803045-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803045-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -130168,7 +130169,7 @@
 <!--803072-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803072-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803072-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803072-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803072-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803072-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803072-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803072-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
@@ -130328,7 +130329,7 @@
 <!--803078-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803078-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803078-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803078-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803078-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803078-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803078-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803078-->  <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO>
@@ -132199,7 +132200,7 @@
 <!--803176-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803176-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803176-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803176-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803176-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803176-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803176-->  <GRID_SEQNO><![CDATA[200]]></GRID_SEQNO>
 <!--803176-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -132224,7 +132225,7 @@
 <!--803177-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--803177-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803177-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803177-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803177-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803177-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803177-->  <GRID_SEQNO><![CDATA[190]]></GRID_SEQNO>
 <!--803177-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -132634,7 +132635,7 @@
 <!--803240-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803240-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803240-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803240-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803240-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803240-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803240-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
 <!--803240-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -132739,7 +132740,7 @@
 <!--803244-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803244-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803244-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803244-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803244-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803244-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803244-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803244-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
@@ -133215,7 +133216,7 @@
 <!--803269-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803269-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803269-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803269-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803269-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803269-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803269-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803269-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -133242,7 +133243,7 @@
 <!--803270-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803270-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803270-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803270-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803270-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803270-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803270-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803270-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -133269,7 +133270,7 @@
 <!--803271-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803271-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803271-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803271-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803271-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803271-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803271-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803271-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
@@ -135224,7 +135225,7 @@
 <!--803348-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803348-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803348-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803348-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803348-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803348-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803348-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
 <!--803348-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -135249,7 +135250,7 @@
 <!--803349-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803349-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803349-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803349-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803349-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803349-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803349-->  <GRID_SEQNO><![CDATA[180]]></GRID_SEQNO>
 <!--803349-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -135274,7 +135275,7 @@
 <!--803350-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803350-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803350-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803350-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803350-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803350-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803350-->  <GRID_SEQNO><![CDATA[250]]></GRID_SEQNO>
 <!--803350-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -136446,7 +136447,7 @@
 <!--803395-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803395-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803395-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803395-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803395-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803395-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803395-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803395-->  <GRID_SEQNO><![CDATA[230]]></GRID_SEQNO>
@@ -136497,7 +136498,7 @@
 <!--803397-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803397-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803397-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803397-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803397-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803397-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803397-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803397-->  <GRID_SEQNO><![CDATA[210]]></GRID_SEQNO>
@@ -136633,7 +136634,7 @@
 <!--803402-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803402-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803402-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803402-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803402-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803402-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803402-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803402-->  <GRID_SEQNO><![CDATA[200]]></GRID_SEQNO>
@@ -136742,7 +136743,7 @@
 <!--803406-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803406-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803406-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803406-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803406-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803406-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803406-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803406-->  <GRID_SEQNO><![CDATA[190]]></GRID_SEQNO>
@@ -136768,7 +136769,7 @@
 <!--803407-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803407-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803407-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803407-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803407-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803407-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803407-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803407-->  <GRID_SEQNO><![CDATA[180]]></GRID_SEQNO>
@@ -136824,7 +136825,7 @@
 <!--803409-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803409-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803409-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803409-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803409-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803409-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803409-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803409-->  <GRID_SEQNO><![CDATA[240]]></GRID_SEQNO>
@@ -136905,7 +136906,7 @@
 <!--803412-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803412-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803412-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803412-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803412-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803412-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803412-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803412-->  <GRID_SEQNO><![CDATA[220]]></GRID_SEQNO>
@@ -136983,7 +136984,7 @@
 <!--803415-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803415-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803415-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803415-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803415-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803415-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803415-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803415-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
@@ -137197,7 +137198,7 @@
 <!--803423-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803423-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803423-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803423-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803423-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803423-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803423-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803423-->  <GRID_SEQNO><![CDATA[230]]></GRID_SEQNO>
@@ -137248,7 +137249,7 @@
 <!--803425-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803425-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803425-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803425-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803425-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803425-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803425-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803425-->  <GRID_SEQNO><![CDATA[240]]></GRID_SEQNO>
@@ -137384,7 +137385,7 @@
 <!--803430-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803430-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803430-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803430-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803430-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803430-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803430-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803430-->  <GRID_SEQNO><![CDATA[220]]></GRID_SEQNO>
@@ -137493,7 +137494,7 @@
 <!--803434-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803434-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803434-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803434-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803434-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803434-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803434-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803434-->  <GRID_SEQNO><![CDATA[210]]></GRID_SEQNO>
@@ -137519,7 +137520,7 @@
 <!--803435-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803435-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803435-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803435-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803435-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803435-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803435-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803435-->  <GRID_SEQNO><![CDATA[200]]></GRID_SEQNO>
@@ -137575,7 +137576,7 @@
 <!--803437-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803437-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803437-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803437-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803437-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803437-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803437-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803437-->  <GRID_SEQNO><![CDATA[190]]></GRID_SEQNO>
@@ -137656,7 +137657,7 @@
 <!--803440-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803440-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803440-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803440-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803440-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803440-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803440-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803440-->  <GRID_SEQNO><![CDATA[180]]></GRID_SEQNO>
@@ -137734,7 +137735,7 @@
 <!--803443-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803443-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803443-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803443-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803443-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803443-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803443-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803443-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
@@ -139145,7 +139146,7 @@
 <!--803501-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803501-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803501-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803501-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803501-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803501-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803501-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803501-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
@@ -141355,7 +141356,7 @@
 <!--803602-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803602-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803602-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803602-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803602-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803602-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803602-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803602-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
@@ -141381,7 +141382,7 @@
 <!--803603-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803603-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803603-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803603-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803603-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803603-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803603-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803603-->  <GRID_SEQNO><![CDATA[140]]></GRID_SEQNO>
@@ -141407,7 +141408,7 @@
 <!--803604-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803604-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803604-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803604-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803604-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803604-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803604-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803604-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
@@ -141903,7 +141904,7 @@
 <!--803623-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803623-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803623-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803623-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803623-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803623-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803623-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803623-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
@@ -142266,7 +142267,7 @@
 <!--803637-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803637-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803637-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803637-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803637-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803637-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803637-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803637-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
@@ -143528,7 +143529,7 @@
 <!--803691-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--803691-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--803691-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--803691-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--803691-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--803691-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--803691-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803691-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -148716,7 +148717,7 @@
 <!--804070-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--804070-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--804070-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--804070-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--804070-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--804070-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--804070-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804070-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
@@ -148974,7 +148975,7 @@
 <!--804080-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--804080-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--804080-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--804080-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--804080-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--804080-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--804080-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804080-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
@@ -149339,7 +149340,7 @@
 <!--804132-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--804132-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--804132-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--804132-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--804132-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--804132-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--804132-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804132-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -150397,7 +150398,7 @@
 <!--804173-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--804173-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--804173-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--804173-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--804173-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--804173-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--804173-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804173-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -151506,7 +151507,7 @@
 <!--1000100002-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1000100002-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1000100002-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1000100002-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1000100002-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1000100002-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1000100002-->  <GRID_SEQNO><![CDATA[340]]></GRID_SEQNO>
 <!--1000100002-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -151531,7 +151532,7 @@
 <!--1000100003-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--1000100003-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1000100003-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1000100003-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1000100003-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1000100003-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1000100003-->  <GRID_SEQNO><![CDATA[330]]></GRID_SEQNO>
 <!--1000100003-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -151556,7 +151557,7 @@
 <!--1000100004-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1000100004-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1000100004-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1000100004-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1000100004-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1000100004-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1000100004-->  <GRID_SEQNO><![CDATA[360]]></GRID_SEQNO>
 <!--1000100004-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -151605,7 +151606,7 @@
 <!--1000100007-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1000100007-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1000100007-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1000100007-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1000100007-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1000100007-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1000100007-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
 <!--1000100007-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -151720,7 +151721,7 @@
 <!--1000300000-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1000300000-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1000300000-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1000300000-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1000300000-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1000300000-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1000300000-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1000300000-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
@@ -151825,7 +151826,7 @@
 <!--1000500004-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1000500004-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1000500004-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1000500004-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1000500004-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1000500004-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1000500004-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1000500004-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
@@ -152619,7 +152620,7 @@
 <!--1001300002-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1001300002-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1001300002-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1001300002-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1001300002-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1001300002-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1001300002-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1001300002-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
@@ -152752,7 +152753,7 @@
 <!--1002100003-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1002100003-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1002100003-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1002100003-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1002100003-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1002100003-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1002100003-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
 <!--1002100003-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -152777,7 +152778,7 @@
 <!--1002100004-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1002100004-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1002100004-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1002100004-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1002100004-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1002100004-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1002100004-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
 <!--1002100004-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -152829,7 +152830,7 @@
 <!--1002100006-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--1002100006-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1002100006-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1002100006-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1002100006-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1002100006-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1002100006-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
 <!--1002100006-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -153529,7 +153530,7 @@
 <!--1002100037-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1002100037-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1002100037-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1002100037-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1002100037-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1002100037-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1002100037-->  <GRID_SEQNO><![CDATA[220]]></GRID_SEQNO>
 <!--1002100037-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -153554,7 +153555,7 @@
 <!--1002100038-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1002100038-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1002100038-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1002100038-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1002100038-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1002100038-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1002100038-->  <GRID_SEQNO><![CDATA[210]]></GRID_SEQNO>
 <!--1002100038-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -153605,7 +153606,7 @@
 <!--1002100040-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1002100040-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1002100040-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1002100040-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1002100040-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1002100040-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1002100040-->  <GRID_SEQNO><![CDATA[200]]></GRID_SEQNO>
 <!--1002100040-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -153628,7 +153629,7 @@
 <!--1002100041-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1002100041-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1002100041-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1002100041-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1002100041-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1002100041-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1002100041-->  <GRID_SEQNO><![CDATA[190]]></GRID_SEQNO>
 <!--1002100041-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -153653,7 +153654,7 @@
 <!--1002100042-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1002100042-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1002100042-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1002100042-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1002100042-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1002100042-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1002100042-->  <GRID_SEQNO><![CDATA[180]]></GRID_SEQNO>
 <!--1002100042-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -153678,7 +153679,7 @@
 <!--1002100043-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1002100043-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1002100043-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1002100043-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1002100043-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1002100043-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1002100043-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
 <!--1002100043-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -153805,7 +153806,7 @@
 <!--1002100048-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1002100048-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1002100048-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1002100048-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1002100048-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1002100048-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1002100048-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
 <!--1002100048-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -153830,7 +153831,7 @@
 <!--1002100049-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1002100049-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1002100049-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1002100049-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1002100049-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1002100049-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1002100049-->  <GRID_SEQNO><![CDATA[140]]></GRID_SEQNO>
 <!--1002100049-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -153881,7 +153882,7 @@
 <!--100210005