Merge back from main
authorJuan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com>
Tue, 21 Jun 2011 09:25:30 +0200
changeset 12914 ae387ec20eae
parent 12911 195b478bc8df (diff)
parent 12913 89db801d7177 (current diff)
child 12915 a205312e847b
Merge back from main
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
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.kernel/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MODULE.xml
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java
--- a/config/log4j.lcf.template	Wed Jun 15 07:49:58 2011 +0200
+++ b/config/log4j.lcf.template	Tue Jun 21 09:25:30 2011 +0200
@@ -28,7 +28,7 @@
 
 # R uses PatternLayout.
 log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%d{HH:mm:ss} [%t] %-5p %c - %m%n
+log4j.appender.R.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c - %m%n
 
 # Keep one backup file
 log4j.appender.R.MaxBackupIndex=1
@@ -52,7 +52,7 @@
 
 # R uses PatternLayout.
 log4j.appender.HB.layout=org.apache.log4j.PatternLayout
-log4j.appender.HB.layout.ConversionPattern=%d{HH:mm:ss} [%t] %-5p %c - %m%n
+log4j.appender.HB.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c - %m%n
 
 # Keep one backup file
 log4j.appender.HB.MaxBackupIndex=1
--- a/modules/org.openbravo.advpaymentmngt/build.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/build.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-
-<project name="APRMJUnit" default="all" basedir="../../.">
+<!--
+*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SLU
+* All portions are Copyright (C) 2010-2011 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************
+-->
+<project name="APRMJUnit" default="aprm.run.all.tests" basedir="../../.">
 
   <property name="build" location="build/classes" />
   <property name="base.modules" location="modules" />
@@ -19,9 +36,12 @@
     </dirset>
   </path>
   
-  <target name="all" depends="PaymentMethodTest, FinancialAccountTest,
-                              PaymentTest_01, PaymentTest_02, PaymentTest_03,
-                              PaymentTest_04, PaymentTest_05, PaymentTest_06">
+  <target name="aprm.run.all.tests">
+    <junit printsummary="yes" haltonfailure="yes">
+      <classpath refid="project.class.path" />
+      <formatter type="plain" usefile="no"/>
+      <test name="org.openbravo.advpaymentmngt.test.draft.AllTests" haltonfailure="true"/>
+    </junit>
   </target>
 
   <target name="PaymentMethodTest">
@@ -81,11 +101,51 @@
   </target>
   
   <target name="PaymentTest_06">
-      <junit printsummary="yes" haltonfailure="no" >
-        <classpath refid="project.class.path" />
-        <formatter type="xml" />
-        <test name="org.openbravo.advpaymentmngt.test.draft.PaymentTest_06" haltonfailure="true" outfile="PaymentTest_06" />
-      </junit>
-    </target>
+    <junit printsummary="yes" haltonfailure="no" >
+      <classpath refid="project.class.path" />
+      <formatter type="xml" />
+      <test name="org.openbravo.advpaymentmngt.test.draft.PaymentTest_06" haltonfailure="true" outfile="PaymentTest_06" />
+    </junit>
+  </target>
+  
+  <target name="PaymentTest_07">
+    <junit printsummary="yes" haltonfailure="no" >
+      <classpath refid="project.class.path" />
+      <formatter type="xml" />
+      <test name="org.openbravo.advpaymentmngt.test.draft.PaymentTest_07" haltonfailure="true" outfile="PaymentTest_07" />
+    </junit>
+  </target>
+  
+  <target name="PaymentTest_08">
+    <junit printsummary="yes" haltonfailure="no" >
+      <classpath refid="project.class.path" />
+      <formatter type="xml" />
+      <test name="org.openbravo.advpaymentmngt.test.draft.PaymentTest_08" haltonfailure="true" outfile="PaymentTest_08" />
+    </junit>
+  </target>
 
-</project>
\ No newline at end of file
+  <target name="PaymentTest_09">
+    <junit printsummary="yes" haltonfailure="no" >
+      <classpath refid="project.class.path" />
+      <formatter type="xml" />
+      <test name="org.openbravo.advpaymentmngt.test.draft.PaymentTest_09" haltonfailure="true" outfile="PaymentTest_09" />
+    </junit>
+  </target>
+
+  <target name="PaymentTest_10">
+    <junit printsummary="yes" haltonfailure="no" >
+      <classpath refid="project.class.path" />
+      <formatter type="xml" />
+      <test name="org.openbravo.advpaymentmngt.test.draft.PaymentTest_10" haltonfailure="true" outfile="PaymentTest_10" />
+    </junit>
+  </target>
+
+  <target name="PaymentTest_11">
+    <junit printsummary="yes" haltonfailure="no" >
+      <classpath refid="project.class.path" />
+      <formatter type="xml" />
+      <test name="org.openbravo.advpaymentmngt.test.draft.PaymentTest_11" haltonfailure="true" outfile="PaymentTest_11" />
+    </junit>
+  </target>
+
+</project>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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, finacc_txn_amount, 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, 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/model/triggers/APRM_FIN_FINACC_ACCT_CHECK_TRG.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_FINACC_ACCT_CHECK_TRG.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -15,7 +15,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2010 Openbravo SLU
+* All portions are Copyright (C) 2010-2011 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 *************************************************************************/
@@ -33,7 +33,7 @@
       SELECT TYPE INTO v_Type FROM FIN_FINANCIAL_ACCOUNT WHERE FIN_FINANCIAL_ACCOUNT_ID = :NEW.FIN_FINANCIAL_ACCOUNT_ID;
 
       IF (v_Type='B') THEN
-        RAISE NO_DATA_FOUND;
+        RAISE_APPLICATION_ERROR(-20000, '@APRM_GainLossFeeAccountsError@');
       END IF;
     END IF;
   END IF;
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -15,7 +15,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2010 Openbravo SLU
+* All portions are Copyright (C) 2010-2011 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 *************************************************************************/
@@ -32,11 +32,18 @@
       OR(COALESCE(:OLD.DOCUMENTNO, '0') <> COALESCE(:NEW.DOCUMENTNO, '0'))
       OR(COALESCE(:OLD.C_CURRENCY_ID, '0') <> COALESCE(:NEW.C_CURRENCY_ID, '0'))
       OR(COALESCE(:OLD.C_BPARTNER_ID, '0') <> COALESCE(:NEW.C_BPARTNER_ID, '0'))
-      OR(COALESCE(:OLD.FIN_PAYMENTMETHOD_ID, '0') <> COALESCE(:NEW.FIN_PAYMENTMETHOD_ID, '0'))
-      OR(COALESCE(:OLD.FIN_FINANCIAL_ACCOUNT_ID, '0') <> COALESCE(:NEW.FIN_FINANCIAL_ACCOUNT_ID, '0'))
+      OR(COALESCE(:OLD.FIN_PAYMENTMETHOD_ID, '0') <> COALESCE(:NEW.FIN_PAYMENTMETHOD_ID, '0')
+         AND COALESCE(:OLD.STATUS, '0') <> TO_CHAR('RPAE'))
+      OR(COALESCE(:OLD.FIN_FINANCIAL_ACCOUNT_ID, '0') <> COALESCE(:NEW.FIN_FINANCIAL_ACCOUNT_ID, '0')
+         AND COALESCE(:OLD.STATUS, '0') <> TO_CHAR('RPAE'))
       OR(COALESCE(:OLD.AMOUNT, 0) <> COALESCE(:NEW.AMOUNT, 0))
       OR(COALESCE(:OLD.WRITEOFFAMT, 0) <> COALESCE(:NEW.WRITEOFFAMT, 0))
-      OR(COALESCE(:OLD.PAYMENTDATE, v_DateNull) <> COALESCE(:NEW.PAYMENTDATE, v_DateNull)))) THEN
+      OR(COALESCE(:OLD.Finacc_Txn_Amount, 0) <> COALESCE(:NEW.Finacc_Txn_Amount, 0)
+         AND COALESCE(:OLD.STATUS, '0') <> TO_CHAR('RPAE'))
+      OR(COALESCE(:OLD.Finacc_Txn_Convert_Rate, 0) <> COALESCE(:NEW.Finacc_Txn_Convert_Rate, 0)
+         AND COALESCE(:OLD.STATUS, '0') <> TO_CHAR('RPAE'))
+      OR(COALESCE(:OLD.PAYMENTDATE, v_DateNull) <> COALESCE(:NEW.PAYMENTDATE, v_DateNull)
+         AND COALESCE(:OLD.STATUS, '0') <> TO_CHAR('RPAE')))) THEN
       RAISE_APPLICATION_ERROR(-20000, '@20501@');
     END IF;
   END IF;
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -715,4 +715,15 @@
 <!--FF8080812F967128012F969D366A0046-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--FF8080812F967128012F969D366A0046--></AD_MESSAGE>
 
+<!--FF80808130AC08E60130AC5B1B7F0055--><AD_MESSAGE>
+<!--FF80808130AC08E60130AC5B1B7F0055-->  <AD_MESSAGE_ID><![CDATA[FF80808130AC08E60130AC5B1B7F0055]]></AD_MESSAGE_ID>
+<!--FF80808130AC08E60130AC5B1B7F0055-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF80808130AC08E60130AC5B1B7F0055-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF80808130AC08E60130AC5B1B7F0055-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF80808130AC08E60130AC5B1B7F0055-->  <VALUE><![CDATA[APRM_GainLossFeeAccountsError]]></VALUE>
+<!--FF80808130AC08E60130AC5B1B7F0055-->  <MSGTEXT><![CDATA[Bank Revaluation Gain, Bank Revaluation Loss and Bank Fee Accounts must be filled in.]]></MSGTEXT>
+<!--FF80808130AC08E60130AC5B1B7F0055-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--FF80808130AC08E60130AC5B1B7F0055-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--FF80808130AC08E60130AC5B1B7F0055--></AD_MESSAGE>
+
 </data>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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>
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/AllTests.java	Tue Jun 21 09:25:30 2011 +0200
@@ -0,0 +1,52 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License. 
+ * The Original Code is Openbravo ERP. 
+ * The Initial Developer of the Original Code is Openbravo SLU 
+ * All portions are Copyright (C) 2011 Openbravo SLU 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+package org.openbravo.advpaymentmngt.test.draft;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+
+  public static Test suite() {
+    final TestSuite suite = new TestSuite("Test for org.openbravo.advpaymentmngt");
+    // $JUnit-BEGIN$
+
+    // Master Data Configuration
+    suite.addTestSuite(FinancialAccountTest.class);
+    suite.addTestSuite(PaymentMethodTest.class);
+
+    // Payment scenarios
+    suite.addTestSuite(PaymentTest_01.class);
+    suite.addTestSuite(PaymentTest_02.class);
+    suite.addTestSuite(PaymentTest_03.class);
+    suite.addTestSuite(PaymentTest_04.class);
+    suite.addTestSuite(PaymentTest_05.class);
+    suite.addTestSuite(PaymentTest_06.class);
+    suite.addTestSuite(PaymentTest_07.class);
+    suite.addTestSuite(PaymentTest_08.class);
+    suite.addTestSuite(PaymentTest_09.class);
+    suite.addTestSuite(PaymentTest_10.class);
+    suite.addTestSuite(PaymentTest_11.class);
+
+    // $JUnit-END$
+    return suite;
+  }
+
+}
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java	Tue Jun 21 09:25:30 2011 +0200
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -86,7 +86,6 @@
         .add(Restrictions.eq(FIN_FinancialAccount.PROPERTY_DESCRIPTION, STANDARD_DESCRIPTION));
     final List<FIN_FinancialAccount> finAccs = obCriteria.list();
     for (FIN_FinancialAccount fa : finAccs) {
-      System.out.println("Removing payment method: " + fa.getName());
       OBDal.getInstance().remove(fa);
     }
   }
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentMethodTest.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentMethodTest.java	Tue Jun 21 09:25:30 2011 +0200
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -88,7 +88,6 @@
     obCriteria.add(Restrictions.eq(FIN_PaymentMethod.PROPERTY_DESCRIPTION, STANDARD_DESCRIPTION));
     final List<FIN_PaymentMethod> paymentMethods = obCriteria.list();
     for (FIN_PaymentMethod pm : paymentMethods) {
-      System.out.println("Removing payment method: " + pm.getName());
       OBDal.getInstance().remove(pm);
     }
   }
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_01.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_01.java	Tue Jun 21 09:25:30 2011 +0200
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_02.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_02.java	Tue Jun 21 09:25:30 2011 +0200
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -99,8 +99,10 @@
             new Value(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE, invoice
                 .getFINPaymentScheduleList().get(0)));
 
-        assertTrue("Payment Schedule Outstanding Amount != 0", invoice.getFINPaymentScheduleList()
-            .get(0).getOutstandingAmount().compareTo(psd.getAmount()) == 0);
+        assertTrue("Payment Schedule Outstanding Amount ("
+            + invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount().toPlainString()
+            + ") != " + paymentAmount.toPlainString(), invoice.getFINPaymentScheduleList().get(0)
+            .getOutstandingAmount().compareTo(paymentAmount) == 0);
 
         assertTrue("Payment Schedule Received Amount != Total Amount", invoice
             .getGrandTotalAmount().compareTo(
@@ -171,9 +173,9 @@
     String taxId = "1FE610D3A8844F85B17CA32525C15353"; // NY Sales Tax
     String docTypeId = "C99C4AE941E1460B91BC97665BE5D141"; // AR Invoice
     BigDecimal invoicedQuantity = new BigDecimal("5");
-    BigDecimal netUnitPrice = new BigDecimal("2.04");
-    BigDecimal netListPrice = new BigDecimal("2.04");
-    BigDecimal lineNetAmount = new BigDecimal("10.20");
+    BigDecimal netUnitPrice = new BigDecimal("2");
+    BigDecimal netListPrice = new BigDecimal("2");
+    BigDecimal lineNetAmount = new BigDecimal("1");
     BigDecimal priceLimit = new BigDecimal("1");
 
     PriceList testPriceList = OBDal.getInstance().get(PriceList.class, priceListId);
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_03.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_03.java	Tue Jun 21 09:25:30 2011 +0200
@@ -1,3 +1,22 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ *************************************************************************
+ */
+
 package org.openbravo.advpaymentmngt.test.draft;
 
 import java.math.BigDecimal;
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_04.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_04.java	Tue Jun 21 09:25:30 2011 +0200
@@ -1,3 +1,22 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ *************************************************************************
+ */
+
 package org.openbravo.advpaymentmngt.test.draft;
 
 import java.math.BigDecimal;
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_05.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_05.java	Tue Jun 21 09:25:30 2011 +0200
@@ -1,3 +1,22 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ *************************************************************************
+ */
+
 package org.openbravo.advpaymentmngt.test.draft;
 
 import java.math.BigDecimal;
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_06.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_06.java	Tue Jun 21 09:25:30 2011 +0200
@@ -1,3 +1,22 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ *************************************************************************
+ */
+
 package org.openbravo.advpaymentmngt.test.draft;
 
 import java.math.BigDecimal;
@@ -77,13 +96,15 @@
             new Value(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE, invoice
                 .getFINPaymentScheduleList().get(0)));
 
-        assertTrue("Payment Schedule Outstanding Amount != 0", BigDecimal.ZERO.compareTo(invoice
-            .getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
-        assertTrue("Payment Schedule Received Amount != Total Amount", invoice
+        assertTrue("Payment Schedule Outstanding Amount ("
+            + invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount().toPlainString()
+            + ") != Total Amount (" + invoice.getGrandTotalAmount().toPlainString() + ")", invoice
             .getGrandTotalAmount().compareTo(
-                invoice.getFINPaymentScheduleList().get(0).getPaidAmount()) == 0);
+                invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
+        assertTrue("Payment Schedule Received Amount != 0", BigDecimal.ZERO.compareTo(invoice
+            .getFINPaymentScheduleList().get(0).getPaidAmount()) == 0);
 
-        assertTrue("Payment Schedule Deatail Amount != Total Amount", invoice.getGrandTotalAmount()
+        assertTrue("Payment Schedule Detail Amount != Total Amount", invoice.getGrandTotalAmount()
             .compareTo(psd.getAmount()) == 0);
         assertTrue("Payment Schedule Detail Write-off Amount != 0", BigDecimal.ZERO.compareTo(psd
             .getWriteoffAmount()) == 0);
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_07.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_07.java	Tue Jun 21 09:25:30 2011 +0200
@@ -71,6 +71,7 @@
   private static final String DEPOSIT_ACCOUNT = "DEP";
   private static final String CASH = "C";
   private static final String STANDARD_DESCRIPTION = "JUnit Test Payment_07";
+  private static final String SIMPLE_EXECUTION_PROCESS = "717D521D5F454FAD9199B831001BB4E0";
 
   private String financialAccountId;
 
@@ -90,23 +91,31 @@
       try {
         // DATA SETUP
         Invoice invoice = dataSetup();
-        FIN_Payment payment = invoice.getFINPaymentScheduleList().get(0)
-            .getFINPaymentScheduleDetailInvoicePaymentScheduleList().get(0).getPaymentDetails()
-            .getFinPayment();
+        FIN_Payment payment = null;
+        for (FIN_PaymentScheduleDetail psd : invoice.getFINPaymentScheduleList().get(0)
+            .getFINPaymentScheduleDetailInvoicePaymentScheduleList()) {
+          if ("RPAE".equals(psd.getPaymentDetails().getFinPayment().getStatus())) {
+            payment = psd.getPaymentDetails().getFinPayment();
+          }
+        }
         FIN_ExecutePayment executePayment = new FIN_ExecutePayment();
         List<FIN_Payment> payments = new ArrayList<FIN_Payment>();
         payments.add(payment);
-        executePayment.init("OTHER", payment.getPaymentMethod().getPayinExecutionProcess(),
-            payments, null, payment.getOrganization());
+        executePayment.init("OTHER", OBDal.getInstance().get(PaymentExecutionProcess.class,
+            SIMPLE_EXECUTION_PROCESS), payments, null, payment.getOrganization());
         OBError result = executePayment.execute();
         // CHECK PAYMENT EXECUTION
         assertTrue("Payment error while executing", !"Error".equals(result.getType()));
 
         Order order = invoice.getSalesOrder();
         // CHECK OUTPUT DATA ORDER
-        assertTrue("Order Payment Schedule Outstanding Amount != 0", BigDecimal.ZERO
-            .compareTo(order.getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
-        assertTrue("Order Payment Schedule Received Amount != Total Amount", order
+        assertTrue("Order Payment Schedule Outstanding Amount ("
+            + order.getFINPaymentScheduleList().get(0).getOutstandingAmount() + ") != 0",
+            BigDecimal.ZERO.compareTo(order.getFINPaymentScheduleList().get(0)
+                .getOutstandingAmount()) == 0);
+        assertTrue("Order Payment Schedule Received Amount ("
+            + getPaidAmount(order.getFINPaymentScheduleList()).toPlainString()
+            + ") != Total Amount (" + order.getGrandTotalAmount().toPlainString(), order
             .getGrandTotalAmount().compareTo(getPaidAmount(order.getFINPaymentScheduleList())) == 0);
         assertTrue("Status != Payment Received", "RPR".equals(payment.getStatus()));
         // CHECK OUTPUT DATA INVOICE
@@ -145,7 +154,7 @@
     String docTypeId = "40EE9B1CD3B345FABEFDA62B407B407F"; // AR Invoice
     String orderDocTypeId = "CB6EEA256BBC41109911215C5A14D39B"; // Standard Order
     String warehouseId = "71B43F2AAE3641CA849B131960BCEFF4";
-    final String SIMPLE_EXECUTION_PROCESS = "717D521D5F454FAD9199B831001BB4E0"; // Simple Execution
+
     // Process
     BigDecimal quantity = new BigDecimal("10");
     BigDecimal invoicedQuantity = new BigDecimal("10");
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_09.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_09.java	Tue Jun 21 09:25:30 2011 +0200
@@ -74,6 +74,7 @@
   private static final String DEPOSIT_ACCOUNT = "DEP";
   private static final String CASH = "C";
   private static final String STANDARD_DESCRIPTION = "JUnit Test Payment_09";
+  private static final String SIMPLE_EXECUTION_PROCESS = "717D521D5F454FAD9199B831001BB4E0";
 
   private String financialAccountId;
 
@@ -93,24 +94,33 @@
       try {
         // DATA SETUP
         Invoice invoice = dataSetup();
-        FIN_Payment payment = invoice.getFINPaymentScheduleList().get(0)
-            .getFINPaymentScheduleDetailInvoicePaymentScheduleList().get(0).getPaymentDetails()
-            .getFinPayment();
+        FIN_Payment payment = null;
+        for (FIN_PaymentScheduleDetail psd : invoice.getFINPaymentScheduleList().get(0)
+            .getFINPaymentScheduleDetailInvoicePaymentScheduleList()) {
+          if ("RPAE".equals(psd.getPaymentDetails().getFinPayment().getStatus())) {
+            payment = psd.getPaymentDetails().getFinPayment();
+          }
+        }
         FIN_ExecutePayment executePayment = new FIN_ExecutePayment();
         List<FIN_Payment> payments = new ArrayList<FIN_Payment>();
         payments.add(payment);
-        executePayment.init("OTHER", payment.getPaymentMethod().getPayinExecutionProcess(),
-            payments, null, payment.getOrganization());
+        executePayment.init("OTHER", OBDal.getInstance().get(PaymentExecutionProcess.class,
+            SIMPLE_EXECUTION_PROCESS), payments, null, payment.getOrganization());
         OBError result = executePayment.execute();
+
         // CHECK PAYMENT EXECUTION
         assertTrue("Payment error while executing", !"Error".equals(result.getType()));
         Order order = invoice.getSalesOrder();
         // CHECK OUTPUT DATA ORDER
-        assertTrue("Order Payment Schedule Outstanding Amount != 0", BigDecimal.ZERO
-            .compareTo(order.getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
+        assertTrue("Order Payment Schedule Outstanding Amount ("
+            + order.getFINPaymentScheduleList().get(0).getOutstandingAmount() + ")!= 0",
+            BigDecimal.ZERO.compareTo(order.getFINPaymentScheduleList().get(0)
+                .getOutstandingAmount()) == 0);
         // CHECK OUTPUT DATA INVOICE
-        assertTrue("Invoice Payment Schedule Outstanding Amount != 0", BigDecimal.ZERO
-            .compareTo(invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
+        assertTrue("Invoice Payment Schedule Outstanding Amount ("
+            + invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount() + ") != 0",
+            BigDecimal.ZERO.compareTo(invoice.getFINPaymentScheduleList().get(0)
+                .getOutstandingAmount()) == 0);
         assertTrue("Invoice remains not paid", invoice.isPaymentComplete());
         assertTrue("Invoice Payment Schedule Received Amount != Total Amount",
             invoice.getGrandTotalAmount().compareTo(
@@ -145,7 +155,7 @@
     String orderDocTypeId = "CB6EEA256BBC41109911215C5A14D39B"; // Standard Order
     String warehouseId = "71B43F2AAE3641CA849B131960BCEFF4";
     String discountId = "831A7639FBE348B1A06EA3C0B0616B75"; // Descuento 10%
-    final String SIMPLE_EXECUTION_PROCESS = "717D521D5F454FAD9199B831001BB4E0"; // Simple Execution
+
     // Process
     BigDecimal quantity = new BigDecimal("10");
     BigDecimal invoicedQuantity = new BigDecimal("10");
@@ -252,7 +262,6 @@
     TestUtility.processPayment(payment, "P");
     payment = OBDal.getInstance().get(FIN_Payment.class, payment.getId());
     order = OBDal.getInstance().get(Order.class, order.getId());
-
     // CHECK OUTPUT DATA FOR ORDER
     OBContext.setAdminMode();
     try {
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_10.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_10.java	Tue Jun 21 09:25:30 2011 +0200
@@ -74,6 +74,7 @@
   private static final String DEPOSIT_ACCOUNT = "DEP";
   private static final String CASH = "C";
   private static final String STANDARD_DESCRIPTION = "JUnit Test Payment_10";
+  private static final String SIMPLE_EXECUTION_PROCESS = "717D521D5F454FAD9199B831001BB4E0";
 
   private String financialAccountId;
 
@@ -93,14 +94,19 @@
       try {
         // DATA SETUP
         Invoice invoice = dataSetup();
-        FIN_Payment payment = invoice.getFINPaymentScheduleList().get(0)
-            .getFINPaymentScheduleDetailInvoicePaymentScheduleList().get(0).getPaymentDetails()
-            .getFinPayment();
+        FIN_Payment payment = null;
+        for (FIN_PaymentScheduleDetail psd : invoice.getFINPaymentScheduleList().get(0)
+            .getFINPaymentScheduleDetailInvoicePaymentScheduleList()) {
+          if ("RPAE".equals(psd.getPaymentDetails().getFinPayment().getStatus())) {
+            payment = psd.getPaymentDetails().getFinPayment();
+          }
+        }
+
         FIN_ExecutePayment executePayment = new FIN_ExecutePayment();
         List<FIN_Payment> payments = new ArrayList<FIN_Payment>();
         payments.add(payment);
-        executePayment.init("OTHER", payment.getPaymentMethod().getPayinExecutionProcess(),
-            payments, null, payment.getOrganization());
+        executePayment.init("OTHER", OBDal.getInstance().get(PaymentExecutionProcess.class,
+            SIMPLE_EXECUTION_PROCESS), payments, null, payment.getOrganization());
         OBError result = executePayment.execute();
         // CHECK PAYMENT EXECUTION
         assertTrue("Payment error while executing", !"Error".equals(result.getType()));
@@ -109,7 +115,10 @@
         // CHECK OUTPUT DATA ORDER
         assertTrue("Order Payment Schedule Outstanding Amount != 0", BigDecimal.ZERO
             .compareTo(order.getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
-        assertTrue("Order Payment Schedule Received Amount != Total Amount", order
+        assertTrue("Invoice: " + invoice.getDocumentNo()
+            + " Order Payment Schedule Received Amount ("
+            + order.getGrandTotalAmount().toPlainString() + ") != Total Amount ("
+            + getPaidAmount(order.getFINPaymentScheduleList()).toPlainString() + ")", order
             .getGrandTotalAmount().compareTo(getPaidAmount(order.getFINPaymentScheduleList())) == 0);
         assertTrue("Status != Payment Received", "RPR".equals(payment.getStatus()));
         // CHECK OUTPUT DATA INVOICE
@@ -149,7 +158,7 @@
     String orderDocTypeId = "CB6EEA256BBC41109911215C5A14D39B"; // Standard Order
     String warehouseId = "71B43F2AAE3641CA849B131960BCEFF4";
     String discountId = "831A7639FBE348B1A06EA3C0B0616B75"; // Descuento 10%
-    final String SIMPLE_EXECUTION_PROCESS = "717D521D5F454FAD9199B831001BB4E0"; // Simple Execution
+
     // Process
     BigDecimal quantity = new BigDecimal("10");
     BigDecimal invoicedQuantity = new BigDecimal("10");
@@ -300,6 +309,7 @@
 
     TestUtility.processInvoice(invoice);
     invoice = OBDal.getInstance().get(Invoice.class, invoice.getId());
+
     return invoice;
   }
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_11.java	Tue Jun 21 09:25:30 2011 +0200
@@ -0,0 +1,289 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2011 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ *************************************************************************
+ */
+
+package org.openbravo.advpaymentmngt.test.draft;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.openbravo.advpaymentmngt.utility.FIN_Utility;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.common.businesspartner.BusinessPartner;
+import org.openbravo.model.common.businesspartner.Location;
+import org.openbravo.model.common.currency.Currency;
+import org.openbravo.model.common.enterprise.DocumentType;
+import org.openbravo.model.common.enterprise.Warehouse;
+import org.openbravo.model.common.invoice.Invoice;
+import org.openbravo.model.common.invoice.InvoiceLine;
+import org.openbravo.model.common.order.Order;
+import org.openbravo.model.common.plm.Product;
+import org.openbravo.model.common.uom.UOM;
+import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
+import org.openbravo.model.financialmgmt.payment.FIN_Payment;
+import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod;
+import org.openbravo.model.financialmgmt.payment.FIN_PaymentSchedule;
+import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
+import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod;
+import org.openbravo.model.financialmgmt.payment.PaymentTerm;
+import org.openbravo.model.financialmgmt.tax.TaxRate;
+import org.openbravo.model.pricing.pricelist.PriceList;
+import org.openbravo.test.base.BaseTest;
+
+public class PaymentTest_11 extends BaseTest {
+
+  // 1) Create an order without discount
+  // 2) Invoice the complete order (without discount)
+  // 3) Review payment plan info
+  // 4) Receive and process a payment against the invoice for the full amount
+  // 5) Review payment info
+
+  private static final Logger log = Logger.getLogger(PaymentTest_10.class);
+
+  private static final String MANUAL_EXECUTION = "M";
+  private static final String CLEARED_ACCOUNT = "CLE";
+  private static final String IN_TRANSIT_ACCOUNT = "INT";
+  private static final String WITHDRAWN_ACCOUNT = "WIT";
+  private static final String DEPOSIT_ACCOUNT = "DEP";
+  private static final String CASH = "C";
+  private static final String STANDARD_DESCRIPTION = "JUnit Test Payment_10";
+
+  private String financialAccountId;
+
+  /**
+   * Initial Set up.
+   */
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    TestUtility.setTestContextSpain();
+  }
+
+  public void testRunPayment_11() {
+    boolean exception = false;
+    FIN_Payment payment = null;
+    try {
+      OBContext.setAdminMode();
+      try {
+        // DATA SETUP
+        Invoice invoice = dataSetup();
+        Order order = invoice.getSalesOrder();
+
+        // CHECK OUTPUT DATA ORDER
+        assertTrue("Order Payment Schedule Outstanding Amount ("
+            + order.getFINPaymentScheduleList().get(0).getOutstandingAmount().toPlainString()
+            + ") != Total Amount (" + order.getGrandTotalAmount().toPlainString() + ")", order
+            .getGrandTotalAmount().compareTo(
+                order.getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
+        assertTrue("Order Payment Schedule Received Amount ("
+            + getPaidAmount(order.getFINPaymentScheduleList()).toPlainString() + ") != 0",
+            BigDecimal.ZERO.compareTo(getPaidAmount(order.getFINPaymentScheduleList())) == 0);
+
+        // CHECK OUTPUT DATA INVOICE
+        assertTrue("Invoice Payment Schedule Outstanding Amount ("
+            + invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount().toPlainString()
+            + ") != Total Amount (" + invoice.getGrandTotalAmount().toPlainString() + ")", invoice
+            .getGrandTotalAmount().compareTo(
+                invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
+        assertTrue("Invoice is paid", !invoice.isPaymentComplete());
+        assertTrue("Invoice Payment Schedule Received Amount "
+            + getPaidAmount(invoice.getFINPaymentScheduleList()) + " != 0", BigDecimal.ZERO
+            .compareTo(getPaidAmount(invoice.getFINPaymentScheduleList())) == 0);
+
+        payment = TestUtility.addPaymentFromInvoice(invoice, OBDal.getInstance().get(
+            FIN_FinancialAccount.class, financialAccountId), invoice.getGrandTotalAmount(), false);
+        TestUtility.processPayment(payment, "P");
+
+        // CHECK OUTPUT DATA PAYMENT
+        OBContext.setAdminMode();
+        try {
+          FIN_PaymentScheduleDetail psd = TestUtility.getOneInstance(
+              FIN_PaymentScheduleDetail.class, new Value(
+                  FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE, invoice
+                      .getFINPaymentScheduleList().get(0)));
+
+          assertTrue("Payment Schedule Outstanding Amount ("
+              + invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount().toPlainString()
+              + ") != 0", BigDecimal.ZERO.compareTo(invoice.getFINPaymentScheduleList().get(0)
+              .getOutstandingAmount()) == 0);
+
+          assertTrue("Payment Schedule Received Amount ("
+              + invoice.getFINPaymentScheduleList().get(0).getPaidAmount().toPlainString()
+              + ") != Total Amount (" + invoice.getGrandTotalAmount().toPlainString() + ")",
+              invoice.getGrandTotalAmount().compareTo(
+                  invoice.getFINPaymentScheduleList().get(0).getPaidAmount()) == 0);
+
+          assertTrue("Payment Schedule Detail Amount (" + psd.getAmount().toPlainString()
+              + ") != Total Amount (" + invoice.getGrandTotalAmount().toPlainString() + ")",
+              invoice.getGrandTotalAmount().compareTo(psd.getAmount()) == 0);
+
+          assertTrue("Payment Schedule Detail Write-off Amount ("
+              + psd.getWriteoffAmount().toPlainString() + ") != 0", BigDecimal.ZERO.compareTo(psd
+              .getWriteoffAmount()) == 0);
+
+          assertTrue("Payment Amount (" + payment.getAmount().toPlainString()
+              + ") != Total Amount (" + invoice.getGrandTotalAmount().toPlainString() + ")",
+              invoice.getGrandTotalAmount().compareTo(payment.getAmount()) == 0);
+
+          assertTrue("Status (" + payment.getStatus() + ") != Payment Received", "RPR"
+              .equals(payment.getStatus()));
+
+        } finally {
+          OBContext.restorePreviousMode();
+        }
+
+      } finally {
+        OBContext.restorePreviousMode();
+      }
+
+    } catch (Exception e) {
+      e.printStackTrace();
+      log.error(FIN_Utility.getExceptionMessage(e));
+      exception = true;
+    }
+
+    assertFalse(exception);
+
+  }
+
+  private Invoice dataSetup() throws Exception {
+
+    // DATA SETUP
+    String bpartnerId = "8A64B71A2B0B2946012B0FE1E86301FA"; // Hoteles Buenas Noches, S.A.
+    String priceListId = "8A64B71A2B0B2946012B0BD97324018A"; // Precios de Venta
+    String paymentTermId = "3F22D83730EE4FD5AE42542A2839DAC4"; // 30 days
+    String currencyId = "102"; // EUR
+    String productId = "8A64B71A2B0B2946012B0BC438410118"; // Vino Tinto 0,75L
+    String taxId = "F27A37C66749487A876F4DA0EF7467E3"; // Ventas Exentas
+    String docTypeId = "40EE9B1CD3B345FABEFDA62B407B407F"; // AR Invoice
+    String orderDocTypeId = "CB6EEA256BBC41109911215C5A14D39B"; // Standard Order
+    String warehouseId = "71B43F2AAE3641CA849B131960BCEFF4";
+    // Process
+    BigDecimal quantity = new BigDecimal("10");
+    BigDecimal invoicedQuantity = new BigDecimal("10");
+    BigDecimal netUnitPrice = new BigDecimal("10");
+    BigDecimal netListPrice = new BigDecimal("10");
+    BigDecimal lineNetAmount = new BigDecimal("100");
+    BigDecimal invoiceLineNetAmount = new BigDecimal("100");
+    BigDecimal priceLimit = new BigDecimal("10");
+
+    PriceList testPriceList = OBDal.getInstance().get(PriceList.class, priceListId);
+    BusinessPartner testBusinessPartner = OBDal.getInstance()
+        .get(BusinessPartner.class, bpartnerId);
+    Location location = TestUtility.getOneInstance(Location.class, new Value(
+        Location.PROPERTY_BUSINESSPARTNER, testBusinessPartner));
+    PaymentTerm testPaymentTerm = OBDal.getInstance().get(PaymentTerm.class, paymentTermId);
+    Currency testCurrency = OBDal.getInstance().get(Currency.class, currencyId);
+    Product testProduct = OBDal.getInstance().get(Product.class, productId);
+    UOM uom = TestUtility.getOneInstance(UOM.class, new Value(UOM.PROPERTY_NAME, testProduct
+        .getUOM().getName()));
+    TaxRate testTaxRate = OBDal.getInstance().get(TaxRate.class, taxId);
+    DocumentType testDocumentType = OBDal.getInstance().get(DocumentType.class, docTypeId);
+    DocumentType testOrderDocumentType = OBDal.getInstance()
+        .get(DocumentType.class, orderDocTypeId);
+    FIN_FinancialAccount testAccount = TestUtility.insertFinancialAccount("APRM_FINACC_PAYMENT_11",
+        STANDARD_DESCRIPTION, testCurrency, CASH, false,
+        getOneInstance(org.openbravo.model.common.geography.Location.class), null, null, null,
+        null, null, null, null, null, null, null, BigDecimal.ZERO, BigDecimal.ZERO, null, true,
+        true);
+
+    FIN_PaymentMethod testPaymentMethod = TestUtility.insertPaymentMethod("APRM_PM_PAYMENT_11",
+        STANDARD_DESCRIPTION, true, false, false, MANUAL_EXECUTION, null, false,
+        IN_TRANSIT_ACCOUNT, DEPOSIT_ACCOUNT, CLEARED_ACCOUNT, true, false, false, MANUAL_EXECUTION,
+        null, false, IN_TRANSIT_ACCOUNT, WITHDRAWN_ACCOUNT, CLEARED_ACCOUNT, true, true);
+
+    FinAccPaymentMethod existAssociation = TestUtility.getOneInstance(FinAccPaymentMethod.class,
+        new Value(FinAccPaymentMethod.PROPERTY_ACCOUNT, testAccount), new Value(
+            FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, testPaymentMethod));
+
+    if (existAssociation == null)
+      TestUtility.associatePaymentMethod(testAccount, testPaymentMethod);
+    this.financialAccountId = testAccount.getId();
+
+    Warehouse warehouse = OBDal.getInstance().get(Warehouse.class, warehouseId);
+    Order order = TestUtility.createNewOrder(OBContext.getOBContext().getCurrentClient(), OBContext
+        .getOBContext().getCurrentOrganization(), new Date(), new Date(), new Date(),
+        testOrderDocumentType, testBusinessPartner, location, warehouse, "I", testPriceList,
+        testCurrency, testPaymentMethod, testPaymentTerm, testProduct, uom, quantity, netUnitPrice,
+        netListPrice, priceLimit, testTaxRate, lineNetAmount, true);
+
+    TestUtility.processOrder(order);
+    order = OBDal.getInstance().get(Order.class, order.getId());
+
+    // CHECK OUTPUT DATA FOR ORDER
+    OBContext.setAdminMode();
+    try {
+      FIN_PaymentScheduleDetail psd = TestUtility.getOneInstance(FIN_PaymentScheduleDetail.class,
+          new Value(FIN_PaymentScheduleDetail.PROPERTY_ORDERPAYMENTSCHEDULE, order
+              .getFINPaymentScheduleList().get(0)));
+
+      assertTrue("Payment Schedule Outstanding Amount == Order amount", order.getGrandTotalAmount()
+          .compareTo(order.getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
+      assertTrue("Payment Schedule Received Amount == 0", BigDecimal.ZERO.compareTo(order
+          .getFINPaymentScheduleList().get(0).getPaidAmount()) == 0);
+
+      assertTrue("Payment Schedule Deatail Amount == Total Amount", order.getGrandTotalAmount()
+          .compareTo(psd.getAmount()) == 0);
+      assertTrue("Payment Schedule Detail Write-off Amount == 0", BigDecimal.ZERO.compareTo(psd
+          .getWriteoffAmount()) == 0);
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+
+    // This created order is invoiced
+    Invoice invoice = TestUtility.createNewInvoice(OBContext.getOBContext().getCurrentClient(),
+        OBContext.getOBContext().getCurrentOrganization(), new Date(), new Date(), new Date(),
+        testDocumentType, testBusinessPartner, location, testPriceList, testCurrency,
+        testPaymentMethod, testPaymentTerm, testProduct, uom, invoicedQuantity, netUnitPrice,
+        netListPrice, priceLimit, testTaxRate, invoiceLineNetAmount, true);
+    OBDal.getInstance().refresh(invoice);
+    // Order is associated both to header and lines
+    InvoiceLine invoiceLine = invoice.getInvoiceLineList().get(0);
+    invoiceLine.setSalesOrderLine(order.getOrderLineList().get(0));
+
+    OBDal.getInstance().save(invoiceLine);
+
+    invoice.setSalesOrder(order);
+
+    OBDal.getInstance().save(invoice);
+
+    TestUtility.processInvoice(invoice);
+    invoice = OBDal.getInstance().get(Invoice.class, invoice.getId());
+    return invoice;
+  }
+
+  BigDecimal getPaidAmount(List<FIN_PaymentSchedule> finPaymentScheduleList) {
+    BigDecimal amount = BigDecimal.ZERO;
+    for (FIN_PaymentSchedule ps : finPaymentScheduleList) {
+      boolean isInvoice = ps.getInvoice() != null;
+      for (FIN_PaymentScheduleDetail psd : isInvoice ? ps
+          .getFINPaymentScheduleDetailInvoicePaymentScheduleList() : ps
+          .getFINPaymentScheduleDetailOrderPaymentScheduleList()) {
+        if (psd.getPaymentDetails() != null
+            && psd.getPaymentDetails().getFinPayment().isProcessed()
+            && !"RPAE".equals(psd.getPaymentDetails().getFinPayment().getStatus())) {
+          amount = amount.add(psd.getAmount());
+        }
+      }
+    }
+    return amount;
+  }
+}
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java	Tue Jun 21 09:25:30 2011 +0200
@@ -195,7 +195,7 @@
       // force dal commit to throw exception
       OBDal.getInstance().flush();
       OBDal.getInstance().commitAndClose();
-    } catch (org.hibernate.exception.GenericJDBCException e) {
+    } catch (Exception e) {
       log.error(e);
       exception = true;
       OBDal.getInstance().rollbackAndClose();
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java	Tue Jun 21 09:25:30 2011 +0200
@@ -285,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();
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Tue Jun 21 09:25:30 2011 +0200
@@ -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));
@@ -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	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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/org/openbravo/client/application/ApplicationComponentProvider.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java	Tue Jun 21 09:25:30 2011 +0200
@@ -105,6 +105,8 @@
     globalResources.add(createStaticResource(
         "web/org.openbravo.client.application/js/form/formitem/ob-formitem-link.js", true));
     globalResources.add(createStaticResource(
+        "web/org.openbravo.client.application/js/form/formitem/ob-formitem-linkbutton.js", true));
+    globalResources.add(createStaticResource(
         "web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js", true));
     globalResources.add(createStaticResource(
         "web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js", true));
@@ -196,8 +198,6 @@
     globalResources.add(createStaticResource(
         "web/org.openbravo.client.application/js/utilities/ob-recent-utilities.js", false));
     globalResources.add(createStaticResource(
-        "web/org.openbravo.client.application/js/alert-management/ob-alert-manager.js", false));
-    globalResources.add(createStaticResource(
         "web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js", false));
     globalResources.add(createStaticResource(
         "web/org.openbravo.client.application/js/navbar/ob-help-about-widget.js", false));
@@ -210,6 +210,15 @@
     globalResources.add(createStaticResource(
         "web/org.openbravo.client.application/js/toolbar/ob-clone-order.js", false));
 
+    // Alert Management
+    globalResources.add(createStaticResource(
+        "web/org.openbravo.client.application/js/alert-management/ob-alert-manager.js", false));
+    globalResources.add(createStaticResource(
+        "web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js", false));
+    globalResources.add(createStaticResource(
+        "web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js",
+        false));
+
     // Styling
     globalResources.add(createStyleSheetResource(
         "web/org.openbravo.userinterface.smartclient/openbravo/skins/"
@@ -313,13 +322,6 @@
     globalResources.add(createStaticResource(
         "web/org.openbravo.client.application/js/utilities/ob-history-manager.js", false));
 
-    // Alert Management
-    globalResources.add(createStaticResource(
-        "web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js", false));
-    globalResources.add(createStaticResource(
-        "web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js",
-        false));
-
     return globalResources;
   }
 
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java	Tue Jun 21 09:25:30 2011 +0200
@@ -1,3 +1,21 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License. 
+ * The Original Code is Openbravo ERP. 
+ * The Initial Developer of the Original Code is Openbravo SLU 
+ * All portions are Copyright (C) 2011 Openbravo SLU 
+ * All Rights Reserved. 
+ * Contributor(s):  Mallikarjun M
+ ************************************************************************
+ */
 package org.openbravo.client.application.businesslogic;
 
 import java.math.BigDecimal;
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickCreateComponent.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickCreateComponent.java	Tue Jun 21 09:25:30 2011 +0200
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -57,8 +57,8 @@
     return "UINAVBA_CREATE_NEW";
   }
 
-  public String getIcon() {
-    return "[SKINIMG]../../org.openbravo.client.application/images/navbar/ico-asterisk.gif";
+  public String getButtonType() {
+    return "createNew";
   }
 
   public String getRecentPropertyName() {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchComponent.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchComponent.java	Tue Jun 21 09:25:30 2011 +0200
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -57,8 +57,8 @@
     return "UINAVBA_QUICK_LAUNCH";
   }
 
-  public String getIcon() {
-    return "[SKINIMG]../../org.openbravo.client.application/images/navbar/ico-forward.gif";
+  public String getButtonType() {
+    return "quickLaunch";
   }
 
   public String getRecentPropertyName() {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl	Tue Jun 21 09:25:30 2011 +0200
@@ -67,7 +67,6 @@
     <#list menuOption.parameters as parameter>
         , '${parameter.name?js_string}': '${parameter.parameterValue?js_string}'        
     </#list>
-    , '_baseStyle': 'OBNavBarComponentMenuItemCell'
     <#if menuOption.children?size &gt; 0>
     , type: 'folder'
     , submenu: [
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/quick-launch.js.ftl	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/quick-launch.js.ftl	Tue Jun 21 09:25:30 2011 +0200
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -21,11 +21,17 @@
 isc.OBQuickLaunch.create(OB.QuickLaunchNavbarComponentStylingProperties, {
      title: '',
      prompt: OB.I18N.getLabel('${data.label}'),
-     src: '${data.icon}',
+     buttonType: '${data.buttonType}',
      prefixLabel: '${data.prefixRecent}',
      keyboardShortcutId : '${data.keyboardShortcutId}',
      recentPropertyName: '${data.recentPropertyName}',
      titleLabel: '${data.label}',
      dataSourceId: '${data.dataSourceId}',
-     command: '${data.command}'
+     command: '${data.command}',
+     initWidget: function(){
+       if (this.initWidgetStyle) {
+         this.initWidgetStyle();
+       }
+       this.Super('initWidget', arguments);
+     }
 })
\ No newline at end of file
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl	Tue Jun 21 09:25:30 2011 +0200
@@ -112,7 +112,7 @@
 OB.Layout.addMember(OB.TopLayout);
 
 // create some vertical space
-OB.Layout.addMember(isc.LayoutSpacer.create({height: 10}));
+OB.Layout.addMember(isc.HLayout.create({}, OB.MainLayoutStylingProperties.TopLayoutSpacer));
 
 OB.MainView = isc.VLayout.create({
   width: '100%',
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js	Tue Jun 21 09:25:30 2011 +0200
@@ -181,13 +181,13 @@
   }
 });
 
-isc.ClassFactory.defineClass('OBAlertSectionStackControl', isc.OBSectionItemControlLink);
+isc.ClassFactory.defineClass('OBAlertSectionStackControl', isc.OBLinkButtonItem);
 isc.OBAlertSectionStackControl.addProperties({
   newStatus: null,
   currentStatus: null,
   
   initWidget: function () {
-    this.setContents(OB.I18N.getLabel('OBUIAPP_MoveSelectedToStatus', [OB.AlertManagement.translatedStatus[this.newStatus]]));
+    this.setTitle(OB.I18N.getLabel('OBUIAPP_MoveSelectedToStatus', [OB.AlertManagement.translatedStatus[this.newStatus]]));
     this.Super('initWidget', arguments);
   },
   
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-checkbox.js	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-checkbox.js	Tue Jun 21 09:25:30 2011 +0200
@@ -22,13 +22,7 @@
 isc.ClassFactory.defineClass('OBCheckboxItem', CheckboxItem);
 
 isc.OBCheckboxItem.addProperties({
-  operator: 'equals',
+  operator: 'equals'
   // no validation on change or exit here
-  textBoxStyle: 'OBFormFieldLabel',
-  showValueIconOver: true,
-  showValueIconFocused: true,
-  defaultValue: false,
-  checkedImage: '[SKIN]/../../org.openbravo.client.application/images/form/checked.png',
-  uncheckedImage: '[SKIN]/../../org.openbravo.client.application/images/form/unchecked.png'
 });
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-linkbutton.js	Tue Jun 21 09:25:30 2011 +0200
@@ -0,0 +1,22 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use. this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2011 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+//== OBLinkButtonItem ==
+//Button to emulate a standard html link.
+isc.ClassFactory.defineClass('OBLinkButtonItem', Button);
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js	Tue Jun 21 09:25:30 2011 +0200
@@ -202,8 +202,8 @@
     }
     this.addMember(hLayout);
     var me = this;
-    var addButton = isc.OBSectionItemControlLink.create({
-      contents: '[ '+OB.I18N.getLabel('OBUIAPP_AttachmentAdd')+' ]',
+    var addButton = isc.OBLinkButtonItem.create({
+      title: '[ '+OB.I18N.getLabel('OBUIAPP_AttachmentAdd')+' ]',
       width: '30px',
       canvas: me,
 	    action: function(){
@@ -241,7 +241,7 @@
                 contents: fileName
               });
               var uploading = isc.Label.create({
-                 className: 'OBSectionItemControlLinkUploading',
+                 className: 'OBLinkButtonItemFocused',
                  contents: '    '+OB.I18N.getLabel('OBUIAPP_AttachmentUploading')
               });
               hTempLayout.addMember(uploadingFile);
@@ -302,8 +302,8 @@
     this.getForm().view.attachmentExists = true;
     this.getForm().view.toolBar.updateButtonState();
     isc_OBAttachmentsSectionItem_0.setValue(OB.I18N.getLabel('OBUIAPP_AttachmentTitle')+" ("+attachments.length+")");
-    var downloadAllButton = isc.OBSectionItemControlLink.create({
-      contents: '[ '+OB.I18N.getLabel('OBUIAPP_AttachmentDownloadAll')+' ]',
+    var downloadAllButton = isc.OBLinkButtonItem.create({
+      title: '[ '+OB.I18N.getLabel('OBUIAPP_AttachmentDownloadAll')+' ]',
       width: '30px',
       canvas: this,
       action: function(){
@@ -320,8 +320,8 @@
         });
       }
     });
-    var removeAllButton = isc.OBSectionItemControlLink.create({
-      contents: '[ '+OB.I18N.getLabel('OBUIAPP_AttachmentRemoveAll')+' ]',
+    var removeAllButton = isc.OBLinkButtonItem.create({
+      title: '[ '+OB.I18N.getLabel('OBUIAPP_AttachmentRemoveAll')+' ]',
       width: '30px',
       canvas: me,
       action: function(){
@@ -388,16 +388,16 @@
         width: '200px',
         contents: creationDate+" "+OB.I18N.getLabel('OBUIAPP_AttachmentBy')+" "+attachment.createdby
       });
-      var downloadAttachment = isc.OBSectionItemControlLink.create({
-        contents: '[ '+OB.I18N.getLabel('OBUIAPP_AttachmentDownload')+' ]',
+      var downloadAttachment = isc.OBLinkButtonItem.create({
+        title: '[ '+OB.I18N.getLabel('OBUIAPP_AttachmentDownload')+' ]',
         width: '30px',
         attachmentName: attachment.name,
         attachId: attachment.id,
         action: downloadActions
       });
       downloadAttachment.height=0;
-      var removeAttachment = isc.OBSectionItemControlLink.create({
-        contents: '[ '+OB.I18N.getLabel('OBUIAPP_AttachmentRemove')+' ]',
+      var removeAttachment = isc.OBLinkButtonItem.create({
+        title: '[ '+OB.I18N.getLabel('OBUIAPP_AttachmentRemove')+' ]',
         width: '30px',
         attachmentName: attachment.name,
         attachmentId: attachment.id,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Tue Jun 21 09:25:30 2011 +0200
@@ -103,7 +103,10 @@
         break;
       }
     }
-    
+    if (!this.firstFocusedField) {
+      this.firstFocusedField = this.getItem(0).name;
+    }
+
     delete this._preventFocusChanges;
   },
 
@@ -400,6 +403,7 @@
       item = this.getItem(this.firstFocusedField);
       if(item) {
         this.setFocusItem(item);
+        this.parentElement.delayCall('scrollTo', [null, this.getTop()], 100);
         return;
       }
     }
@@ -673,13 +677,13 @@
 
     this.markForRedraw();
 
+    delete this.inFicCall;
     this.view.toolBar.updateButtonState(true);
     if (request.params.MODE === 'EDIT') {
       this.view.statusBar.mode = 'VIEW';
       this.view.statusBar.setContentLabel(null, null, this.getStatusBarFields());
     }
 
-    delete this.inFicCall;
     if (this.callSaveAfterFICReturn) {
       delete this.callSaveAfterFICReturn;
       this.saveRow(true);
@@ -987,6 +991,7 @@
 
       me.processFICReturn(response, data, request, editValues, editRow);
     });
+    this.view.toolBar.updateButtonState(true);
   },
   
   itemChanged: function(item, newValue){
@@ -1063,7 +1068,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();
@@ -1179,6 +1184,10 @@
 
       form.isSaving = false;
       view.toolBar.updateButtonState(true);
+      if (form.isVisible() && saveFocusItem) {
+        this.setFocusItem(saveFocusItem);
+        saveFocusItem.focusInItem();
+      }
       return false;
     };
     
@@ -1392,9 +1401,8 @@
       this.getFocusItem && this.getFocusItem().titleClick) {
       this.getFocusItem().titleClick(this, this.getFocusItem());
       return false;
-    } else {
-      return true;
     }
+    return this.Super('keyDown', arguments);
   }
 
 };
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Tue Jun 21 09:25:30 2011 +0200
@@ -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() &&
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Tue Jun 21 09:25:30 2011 +0200
@@ -16,6 +16,18 @@
  * Contributor(s):  ______________________________________.
  ************************************************************************
  */
+
+
+isc.ClassFactory.defineClass('OBFormContainerLayout', isc.VLayout);
+
+isc.OBFormContainerLayout.addProperties({
+  canFocus: true,
+  width: '100%',
+  height: '*',
+  overflow: 'auto'
+});
+
+
 // = OBStandardView =
 //
 // An OBStandardView represents a single Openbravo tab. An OBStandardView consists
@@ -417,12 +429,7 @@
       });
       
       // to make sure that the form gets the correct scrollbars
-      this.formContainerLayout = isc.VLayout.create({
-        canFocus: true,
-        width: '100%',
-        height: '*',
-        overflow: 'auto'
-      });
+      this.formContainerLayout = isc.OBFormContainerLayout.create({});
       this.formContainerLayout.addMember(this.viewForm);
       
       this.statusBarFormLayout.addMember(this.statusBar);
@@ -620,7 +627,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){
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js	Tue Jun 21 09:25:30 2011 +0200
@@ -248,7 +248,7 @@
       for (recentIndex = 0; recentIndex < recent.length; recentIndex++) {
         var recentEntry = recent[recentIndex];
         if (recentEntry) {
-          recentEntries[recentIndex] = {title: recentEntry.tabTitle, recentObject: recentEntry, type: recentEntry.type/*, _baseStyle: 'OBNavBarComponentMenuItemCell'*/};
+          recentEntries[recentIndex] = {title: recentEntry.tabTitle, recentObject: recentEntry, type: recentEntry.type};
         }
       }
       recentEntries[recent.length] = {isSeparator: true};
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js	Tue Jun 21 09:25:30 2011 +0200
@@ -45,7 +45,7 @@
   iconWidth: 10,
   iconSpacing: 10,
   icon: {
-    src: '[SKINIMG]../../org.openbravo.client.application/images/navbar/ico-green-arrow-down.gif'
+    src: '[SKINIMG]../../org.openbravo.client.application/images/navbar/ico-green-arrow-down.png'
   },
   iconOrientation: 'right',
   
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Tue Jun 21 09:25:30 2011 +0200
@@ -355,7 +355,7 @@
         } else if (view.isEditingGrid && grid.getEditForm().isNew) {
           disabled = true;
         } else if ((selectedRecords && selectedRecords.length > 1) || 
-                  (selectedRecords && selectedRecords.lenght === 1 && selectedRecords[0].updated && selectedRecords[0].creationDate && selectedRecords[0].updated.getTime() === selectedRecords[0].creationDate.getTime())) {
+                  (selectedRecords && selectedRecords.length === 1 && selectedRecords[0].updated && selectedRecords[0].creationDate && selectedRecords[0].updated.getTime() === selectedRecords[0].creationDate.getTime())) {
           disabled = true;
         }
         this.setDisabled(disabled);
@@ -960,14 +960,15 @@
   // Refreshes all the custom buttons in the toolbar based on current record selection
   //
   refreshCustomButtons: function(noSetSession){
-    var selectedRecords, multipleSelectedRowIds, allProperties;
+    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 = [];
@@ -1101,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] = [];
@@ -1128,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;
@@ -1284,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-utilities.js	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js	Tue Jun 21 09:25:30 2011 +0200
@@ -789,7 +789,7 @@
   if (!url) {
     return false;
   }
-  return (/^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i).test(url);
+  return (/^(https?|ftp|file):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i).test(url);
 };
 
 // ** {{{ applicationUrl(path) }}} **
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/bg-statusbar.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/bg-tab-green.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/bg-tab-green_end.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/bg-tab-green_stretch.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/bg-tab-plus.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/bg-tableheader.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/bg-topnavbar.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/bt-close-alert.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/bt-orange-cancel.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/bt-orange-save.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/ico-doc.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/ico-green-square.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/ico-open-tab.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/ico-open-tab_Over.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/ico-page.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/ico-pdf.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/ico-red-triangle-bgwhite.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/ico-red-triangle.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/ico-reddot.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/ico-triangle-green-closed.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/ico-triangle-green.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/iconAlert.disabled.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/iconAlert.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/iconAlertActive.disabled.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/iconAlertActive.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/logo-cliente.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/logo-openbravo.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/logout.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/openbravo-logo.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/openbravo-logo_other.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/orange-border.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/sn-close.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/your-company.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/_deprecated/yourcompany.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/application-menu/menuSeparator.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/application-menu/menuSeparator.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/date_control_small.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/date_control_small_Disabled.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/date_control_small_Down.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/date_control_small_Over.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/date_picker.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/date_picker_Disabled.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/date_picker_Down.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/date_picker_Normal.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/date_picker_Over.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/ico-to-new-tab.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_sortAscending.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_sortAscending.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_sortDescending.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_sortDescending.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/navbar/ico-asterisk.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/navbar/ico-asterisk.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/navbar/ico-forward.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/navbar/ico-forward.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/navbar/ico-green-arrow-down.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/navbar/ico-green-arrow-down.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/navbar/navbar-right-border.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/navbar/navbar-right-border.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/navbar/navbar-separator.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/navbar/navbar-separator.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonChild_Selected.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonChild_Selected.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonChild_Selected_Inactive.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonChild_Selected_Inactive.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonChild_Selected_Inactive_Over.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonChild_Selected_Inactive_Over.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonChild_Selected_Over.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonChild_Selected_Over.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonChild_Unselected.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonChild_Unselected.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonChild_Unselected_Over.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonChild_Unselected_Over.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonMain_Selected.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonMain_Selected.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonMain_Selected_Inactive.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonMain_Selected_Inactive.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonMain_Selected_Inactive_Over.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonMain_Selected_Inactive_Over.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonMain_Selected_Over.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonMain_Selected_Over.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonMain_Unselected.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonMain_Unselected.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonMain_Unselected_Over.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarButtonMain_Unselected_Over.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarChild_bg.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarChild_bg.png has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarMain_bg.gif has changed
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/tab/tabBarMain_bg.png has changed
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-menu-styles.css	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-menu-styles.css	Tue Jun 21 09:25:30 2011 +0200
@@ -80,7 +80,7 @@
 .OBApplicationMenuTreeItemCellIconFieldSelectedOver,
 .OBApplicationMenuTreeItemCellIconFieldDisabled {
   padding: 0px 4px 0px 5px;
-  border-right: 1px #cfe6b2 solid;
+  border-right: 1px #CDD7BB solid;
 }
 
 .OBApplicationMenuTreeItemCellIconFieldOver,
@@ -105,7 +105,7 @@
   border-right: none;
   background-position: left center;
   background-repeat: repeat-x;
-  background-image: url(./images/application-menu/menuSeparator.gif);
+  background-image: url(./images/application-menu/menuSeparator.png);
 }
 
 .OBApplicationMenuTreeItemCellIconFieldDisabled nobr hr {
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-menu-styles.js	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-menu-styles.js	Tue Jun 21 09:25:30 2011 +0200
@@ -69,7 +69,7 @@
     View: '[SKINIMG]../../org.openbravo.client.application/images/application-menu/iconForm.png'
   },
   icon: {
-    src: '[SKINIMG]../../org.openbravo.client.application/images/navbar/ico-green-arrow-down.gif'
+    src: '[SKINIMG]../../org.openbravo.client.application/images/navbar/ico-green-arrow-down.png'
   },
   showMenuStyle: function() {
     this.parentElement.setStyleName('OBNavBarComponentSelected');
--- a/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 07:49:58 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	Tue Jun 21 09:25:30 2011 +0200
@@ -55,6 +55,22 @@
 }
 
 /*============================================================
+ Top Layout
+ ============================================================*/
+
+.OBTopLayout {
+  background-color: #FFFFFF;
+}
+
+/*============================================================
+ Top Layout Spacer
+ ============================================================*/
+
+.OBTopLayoutSpacer {
+  background-color: #FFFFFF;
+}
+
+/*============================================================
  Active view
  ============================================================*/
 .OBViewActive {
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js	Tue Jun 21 09:25:30 2011 +0200
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -38,7 +38,7 @@
   defaultLayoutAlign: 'center',
   styleName: 'OBNavBarToolStrip',
   width: 1,
-  layoutLeftMargin: 2,
+  layoutLeftMargin: 1,
   separatorSize: 0,
   height: 28
 };
@@ -47,10 +47,18 @@
 OB.MainLayoutStylingProperties.TopLayout = {
   width: '100%',
   height: '1',
+  styleName: 'OBTopLayout',
   overflow: 'visible',
   layoutTopMargin: 4
 };
 
+  // Styling of the main layout spacer, between toplayout and tabs
+OB.MainLayoutStylingProperties.TopLayoutSpacer = {
+  height: '10',
+  styleName: 'OBTopLayoutSpacer'
+};
+
+
 // Properties for the custom company image
 OB.MainLayoutStylingProperties.CompanyImageLogo = {
   width: 122,
@@ -87,7 +95,7 @@
   iconWidth: 10,
   iconSpacing: 10,
   icon: {
-    src: '[SKINIMG]../../org.openbravo.client.application/images/navbar/ico-green-arrow-down.gif'
+    src: '[SKINIMG]../../org.openbravo.client.application/images/navbar/ico-green-arrow-down.png'
   },
   iconOrientation: 'right'
 });
@@ -117,6 +125,16 @@
   layoutProperties: {
     width: 250,
     membersMargin: 10
+  },
+
+  initWidgetStyle: function() {
+    if (this.buttonType) {
+      if (this.buttonType === 'createNew') {
+        this.setSrc('[SKINIMG]../../org.openbravo.client.application/images/navbar/ico-asterisk.png');
+      } else if (this.buttonType === 'quickLaunch') {
+        this.setSrc('[SKINIMG]../../org.openbravo.client.application/images/navbar/ico-forward.png');
+      }
+    }
   }
 };
 
@@ -156,8 +174,9 @@
 isc._original_confirm = isc.confirm;
 isc.confirm = function (message, callback, properties) {
   // override to set the styling
+  var i;
   if (properties && properties.buttons) {
-    for (var i = 0; i < properties.buttons.length; i++) {
+    for (i = 0; i < properties.buttons.length; i++) {
       properties.buttons[i].baseStyle = 'OBFormButton';
       properties.buttons[i].titleStyle = 'OBFormButtonTitle';
       properties.buttons[i].buttonConstructor = isc.OBFormButton;
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css	Tue Jun 21 09:25:30 2011 +0200
@@ -23,8 +23,10 @@
  * Form Fields/Items
  * Date Picker
  * Form Buttons
+ * LinkButton Item
  * SectionItem Button
  * Dialog
+ * Note section
 =======================================================================*/
 
 /*=======================================================================
@@ -36,6 +38,10 @@
   padding: 0px 0px 20px 0px;
 }
 
+.OBFormContainerLayout {
+  background-color: #FFFFFF;
+}
+
 /*=======================================================================
  * Form Field Styles 
 =======================================================================*/
@@ -308,6 +314,7 @@
 .OBFormFieldNumberInputSelectedFocused {
   -moz-outline-offset: -1;
   outline-offset: -1;
+  outline: none;
   border: 1px solid #fa962f;
 }
 
@@ -710,6 +717,43 @@
 }
 
 /*=======================================================================
+ * LinkButton Item
+=======================================================================*/
+
+.OBLinkButtonItem,
+.OBLinkButtonItemOver,
+.OBLinkButtonItemDown,
+.OBLinkButtonItemFocused,
+.OBLinkButtonItemFocusedOver,
+.OBLinkButtonItemFocusedDown {
+  font-family: 'lucida sans', sans-serif;
+  font-size: 12px;
+  vertical-align: middle;
+  background: transparent;
+  padding: 5px 5px 5px 5px;
+}
+
+.OBLinkButtonItem,
+.OBLinkButtonItemOver {
+  color: #58A618;
+}
+
+.OBLinkButtonItemDown {
+  color: #004E27;
+}
+
+.OBLinkButtonItemFocused,
+.OBLinkButtonItemFocusedOver,
+.OBLinkButtonItemFocusedDown {
+  color: #fa962f;
+}
+
+.OBLinkButtonItemOver,
+.OBLinkButtonItemFocusedOver {
+  text-decoration: underline;
+}
+
+/*=======================================================================
  * SectionItem Button
 =======================================================================*/
 
@@ -725,46 +769,6 @@
 }
 
 /*=======================================================================
- * SectionItem Control Link
-=======================================================================*/
-.OBSectionItemControlLink,
-.OBSectionItemControlLinkOver,
-.OBSectionItemControlLinkDown,
-.OBSectionItemControlLinkFocused,
-.OBSectionItemControlLinkFocusedOver,
-.OBSectionItemControlLinkFocusedDown ,
-.OBSectionItemControlLinkUploading {
-  font-family: 'lucida sans', sans-serif;
-  font-size: 12px;
-  vertical-align: middle;
-  background: transparent;
-  text-align: right;
-  cursor: pointer;
-  padding-right: 5px;
-  padding:5px; 
-}
-
-.OBSectionItemControlLink,
-.OBSectionItemControlLinkFocused {
-  color: #58A618;
-}
-
-.OBSectionItemControlLinkOver {
-  color: #58A618;
-  text-decoration: underline;
-}
-
-.OBSectionItemControlLinkDown,
-.OBSectionItemControlLinkFocusedOver,
-.OBSectionItemControlLinkFocusedDown {
-  color: #004E27;
-  text-decoration: underline;
-}
-.OBSectionItemControlLinkUploading {
-  color: #FA962F;
-}
-
-/*=======================================================================
  * Used in the label of a foreign key field, for link image 
 =======================================================================*/
 
--- a/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 07:49:58 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	Tue Jun 21 09:25:30 2011 +0200
@@ -34,6 +34,10 @@
   cellPadding: 0
 });
 
+isc.OBFormContainerLayout.addProperties({
+  styleName: 'OBFormContainerLayout'
+});
+
 isc.OBFormButton.addProperties({
   baseStyle: 'OBFormButton',
   titleStyle: 'OBFormButtonTitle'
@@ -128,6 +132,15 @@
 
 isc.OBYesNoItem.addProperties(isc.addProperties({}, OB.DefaultPickListStyleProperties));
 
+isc.OBCheckboxItem.addProperties({
+  textBoxStyle: 'OBFormFieldLabel',
+  showValueIconOver: true,
+  showValueIconFocused: true,
+  defaultValue: false,
+  checkedImage: '[SKIN]/../../org.openbravo.client.application/images/form/checked.png',
+  uncheckedImage: '[SKIN]/../../org.openbravo.client.application/images/form/unchecked.png'
+});
+
 
 isc.OBSearchItem.addProperties({
   cellStyle: 'OBFormField',
@@ -167,6 +180,16 @@
   newTabIconSize: 8
 });
 
+isc.OBLinkButtonItem.addProperties({
+  baseStyle: 'OBLinkButtonItem',
+  showDown: true,
+  showFocused: true,
+  showFocusedAsOver: false,
+  showRollOver: true,
+  autoFit: true,
+  height: 1,
+  overflow: 'visible'
+});
 
 isc.OBDateChooser.addProperties({
   headerStyle: 'OBDateChooserButton',
@@ -495,16 +518,3 @@
     this.Super("focusChanged", arguments);
   }
 });
-
-isc.ClassFactory.defineClass('OBSectionItemControlLink', isc.Label);
-isc.OBSectionItemControlLink.addProperties({
-  className: 'OBSectionItemControlLink',
-  showDown: true,
-  showFocused: true,
-  showFocusedAsOver: true,
-  showRollOver: true,
-  height: 20,
-  wrap: false,
-  width: '*'
-});
-
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.css	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.css	Tue Jun 21 09:25:30 2011 +0200
@@ -25,6 +25,10 @@
 .OBGridToolStripIcon {
 }
 
+.OBGridBody {
+  background-color: #FFFFFF;
+}
+
 .OBGridCell,
 .OBGridCellOver,
 .OBGridCellDark,
@@ -173,14 +177,14 @@
 }
 
 .OBGridFilterFunnelBackground {
-  background-color: #c9d6ba;
+  background-color: #CDD7BB;
 }
 
 .OBGridFilterFunnelIconDown,
 .OBGridFilterFunnelIconSelected,
 .OBGridFilterFunnelIconFocused,
 .OBGridFilterFunnelIcon {
-  background-color: #c9d6ba;
+  background-color: #CDD7BB;
   cursor: 'pointer';
 }
 
@@ -270,19 +274,22 @@
 }
 
 .OBGridLinkButton,
-.OBGridLinkButtonFocused {
-  color: #00A651;
+.OBGridLinkButtonOver {
+  color: #58A618;
 }
 
-.OBGridLinkButtonOver {
-  color: #00A651;
-  text-decoration: underline;
+.OBGridLinkButtonDown {
+  color: #004E27;
 }
 
-.OBGridLinkButtonDown,
+.OBGridLinkButtonFocused,
 .OBGridLinkButtonFocusedOver,
 .OBGridLinkButtonFocusedDown {
-  color: #004E27;
+  color: #fa962f;
+}
+
+.OBGridLinkButtonOver,
+.OBGridLinkButtonFocusedOver {
   text-decoration: underline;
 }
 
@@ -315,3 +322,17 @@
   text-decoration: underline;
   background-color: #e1e1e1;
 }
+
+/******************************/
+
+.OBViewGridBody {
+  background-color: #FFFFFF;
+}
+
+/******************************/
+
+.OBAlertGridBody {
+  background-color: #FFFFFF;
+}
+
+/******************************/
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js	Tue Jun 21 09:25:30 2011 +0200
@@ -21,6 +21,7 @@
 isc.OBGrid.addProperties({
   editFailedBaseStyle: null, // is done through the additional csstext
   editFailedCSSText: 'background-color: red; border-right-color: red; border-bottom-color: red;',
+  bodyStyleName: 'OBGridBody',
   baseStyle: 'OBGridCell',
   baseStyleEdit: 'OBGridCellEdit', // for use in ob-view-grid.js while editing a cell
   recordStyleError: 'OBGridCellError',
@@ -30,8 +31,8 @@
   headerTitleStyle: 'OBGridHeaderCellTitle',
   cellPadding: 0, /* Set in the CSS */
   cellAlign: 'center',
-  sortAscendingImage:{src:'[SKIN]/../../../org.openbravo.client.application/images/grid/gridHeader_sortAscending.gif', width:7, height:11},
-  sortDescendingImage:{src:'[SKIN]/../../../org.openbravo.client.application/images/grid/gridHeader_sortDescending.gif', width:7, height:11},
+  sortAscendingImage:{src:'[SKIN]/../../../org.openbravo.client.application/images/grid/gridHeader_sortAscending.png', width:7, height:11},
+  sortDescendingImage:{src:'[SKIN]/../../../org.openbravo.client.application/images/grid/gridHeader_sortDescending.png', width:7, height:11},
   headerMenuButtonConstructor: 'OBGridHeaderImgButton',
   headerMenuButtonWidth: 17,
   headerMenuButtonSrc: '[SKIN]/../../org.openbravo.client.application/images/grid/gridHeaderMenuButton.png',
@@ -94,16 +95,9 @@
   src: '[SKIN]/../../org.openbravo.client.application/images/grid/gridHeader_bg.png'
 });
 
-isc.OBViewGrid.addProperties({
-  // note should be the same as the height of the OBGridButtonsComponent
-  recordComponentHeight: 21,
-  cellHeight: 25
-});
-
 isc.OBGrid.changeDefaults('headerMenuButtonDefaults', {
   showDown: false,
-  showTitle: true,
-  baseStyle: 'pepe'
+  showTitle: true
   //src: '[SKIN]/../../org.openbravo.client.application/images/grid/gridHeader_bg.png'
 });
 
@@ -165,4 +159,21 @@
   autoFit: true,
   height: 1,
   overflow: 'visible'
-});
\ No newline at end of file
+});
+
+/******************************/
+
+isc.OBViewGrid.addProperties({
+  // note should be the same as the height of the OBGridButtonsComponent
+  recordComponentHeight: 21,
+  cellHeight: 25,
+  bodyStyleName: 'OBViewGridBody'
+});
+
+/******************************/
+
+isc.OBAlertGrid.addProperties({
+  bodyStyleName: 'OBAlertGridBody'
+});
+
+/******************************/
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-main-content-styles.css	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-main-content-styles.css	Tue Jun 21 09:25:30 2011 +0200
@@ -35,7 +35,7 @@
 }
 
 .OBSeparator {
-    background-image: url(./images/navbar/navbar-separator.gif);
+    background-image: url(./images/navbar/navbar-separator.png);
     background-position: 'center';
     background-repeat: no-repeat;
 }
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-navigation-bar-styles.css	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-navigation-bar-styles.css	Tue Jun 21 09:25:30 2011 +0200
@@ -21,6 +21,7 @@
   The main navbar
 ============================================================*/
 .OBNavBarToolStrip {
+  margin-left: 4px;
   height: 26px;
   background-color: #FFFFFF;
 }
@@ -77,13 +78,13 @@
 ============================================================*/
 
 .OBNavBarComponent {
-  background: #FFFFFF;
+  background-color: #FFFFFF;
   color: #000000;
   cursor: pointer;
   
-  border-top: 1px solid #fff;
+  border-top: 1px solid #FFFFFF;
   
-  background-image: url(./images/navbar/navbar-separator.gif);
+  background-image: url(./images/navbar/navbar-separator.png);
   background-position: right;
   background-repeat: no-repeat;
   margin: 0px;
@@ -98,7 +99,7 @@
 
   margin-left: -1px;
 
-  background-image: url(./images/navbar/navbar-right-border.gif);
+  background-image: url(./images/navbar/navbar-right-border.png);
   background-position: right;
   background-repeat: repeat-y;
 }
@@ -116,7 +117,7 @@
 
   margin-left: -1px;
 
-  background-image: url(./images/navbar/navbar-right-border.gif);
+  background-image: url(./images/navbar/navbar-right-border.png);
   background-position: right;
   background-repeat: repeat-y;
 }
@@ -168,108 +169,6 @@
   padding-left: 10px;
   padding-right: 10px;
 }
-        
-/*============================================================
-  Application Menu Styling
-============================================================*/
-
-.OBNavBarComponentMenuBody .menuTable {
-  background: #fff;
-}
-
-.OBNavBarComponentMenu {
-  background-color: #fff;
-  border: 1px solid #72ab10;
-  font-size: 11px;
-  font-family: 'lucida sans', sans-serif;
-}
-
-.OBNavBarComponentMenuBody {
-  font-size: 11px;
-  font-family: 'lucida sans', sans-serif;
-}
-
-.OBNavBarComponentMenuItemCell,
-.OBNavBarComponentMenuItemCellSelected,
-.OBNavBarComponentMenuItemCellOver,
-.OBNavBarComponentMenuItemCellSelectedOver,
-.OBNavBarComponentMenuItemCellDisabled,
-.OBNavBarComponentMenuItemCellTitleField,
-.OBNavBarComponentMenuItemCellTitleFieldSelected,
-.OBNavBarComponentMenuItemCellTitleFieldOver,
-.OBNavBarComponentMenuItemCellTitleFieldSelectedOver,
-.OBNavBarComponentMenuItemCellTitleFieldDisabled {
-  font-size: 11px;
-  font-family: 'lucida sans', sans-serif;
-  cursor: pointer;
-}
-
-.OBNavBarComponentMenuItemCell,
-.OBNavBarComponentMenuItemCellSelected {
-}
-
-.OBNavBarComponentMenuItemCellOver,
-.OBNavBarComponentMenuItemCellSelectedOver,
-.OBNavBarComponentMenuItemCellSubmenuFieldOver,
-.OBNavBarComponentMenuItemCellSubmenuFieldSelectedOver,
-.OBNavBarComponentMenuItemCellKeysFieldOver,
-.OBNavBarComponentMenuItemCellKeysFieldSelectedOver,
-.OBNavBarComponentMenuItemCellTitleFieldOver,
-.OBNavBarComponentMenuItemCellTitleFieldSelectedOver {
-  color: #5b890d;
-  background-color: #f5f7f1;
-}
-
-.OBNavBarComponentMenuItemCellTitleField,
-.OBNavBarComponentMenuItemCellTitleFieldSelected,
-.OBNavBarComponentMenuItemCellTitleFieldOver,
-.OBNavBarComponentMenuItemCellTitleFieldSelectedOver,
-.OBNavBarComponentMenuItemCellTitleFieldDisabled {
-  padding-left: 10px;
-  padding-right: 20px;
-}
-
-.OBNavBarComponentMenuItemCellDisabled ,
-.OBNavBarComponentMenuItemCellTitleFieldDisabled,
-.OBNavBarComponentMenuItemCellIconFieldDisabled {
-  color: #AAAAAA;
-}
-
-.OBNavBarComponentMenuBody .menuTable {
-  background: #fff; border-color: #fff;
-}
-
-.OBNavBarComponentMenuBody .menuTable img,
-.OBNavBarComponentMenuBodyOver .menuTable img,
-.OBNavBarComponentMenuItemCellTitleField img,
-.OBNavBarComponentMenuItemCellTitleFieldOver img,
-.OBNavBarComponentMenuItemCellSubmenuField img,
-.OBNavBarComponentMenuItemCellSubmenuFieldOver img {
-  display: block;
-}
-
-.OBNavBarComponentMenuItemCellKeysField,
-.OBNavBarComponentMenuItemCellKeysFieldSelected,
-.OBNavBarComponentMenuItemCellKeysFieldOver,
-.OBNavBarComponentMenuItemCellKeysFieldSelectedOver,
-.OBNavBarComponentMenuItemCellKeysFieldDisabled,
-.OBNavBarComponentMenuItemCellSubmenuField,
-.OBNavBarComponentMenuItemCellSubmenuFieldSelected,
-.OBNavBarComponentMenuItemCellSubmenuFieldOver,
-.OBNavBarComponentMenuItemCellSubmenuFieldSelectedOver,
-.OBNavBarComponentMenuItemCellSubmenuFieldDisabled {
-  padding-right: 6px;
-  text-align: right;
-}
-
-.OBNavBarComponentMenuItemCell,
-.OBNavBarComponentMenuItemCellSelected {
-  /*padding-left: 10px;*/
-}
-
-.OBNavBarComponentTest {
-  background: red;
-}
 
 /*============================================================
   Standard flyout styling
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-tab-styles.css	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-tab-styles.css	Tue Jun 21 09:25:30 2011 +0200
@@ -23,7 +23,7 @@
 ============================================================*/
 
 .OBTabBarMain {
-  background: #ffffff url(./images/tab/tabBarMain_bg.gif) repeat-x scroll;
+  background: #FFFFFF url(./images/tab/tabBarMain_bg.png) repeat-x scroll;
   background-position: center top;
 }
 
@@ -65,13 +65,13 @@
 .OBTabBarButtonMainTopSelectedDisabled {
   background-position: center top;
   background-repeat: repeat-x;
-  background-image: url(./images/tab/tabBarButtonMain_Selected.gif);
+  background-image: url(./images/tab/tabBarButtonMain_Selected.png);
 }
 
 .OBTabBarButtonMainTopSelectedOver {
   background-position: center top;
   background-repeat: repeat-x;
-  background-image: url(./images/tab/tabBarButtonMain_Selected_Over.gif);
+  background-image: url(./images/tab/tabBarButtonMain_Selected_Over.png);
 }
 
 .OBTabBarButtonMainTopSelectedInactive,
@@ -82,13 +82,13 @@
 .OBTabBarButtonMainTopSelectedDisabledInactive {
   background-position: center top;
   background-repeat: repeat-x;
-  background-image: url(./images/tab/tabBarButtonMain_Selected_Inactive.gif);
+  background-image: url(./images/tab/tabBarButtonMain_Selected_Inactive.png);
 }
 
 .OBTabBarButtonMainTopSelectedOverInactive {
   background-position: center top;
   background-repeat: repeat-x;
-  background-image: url(./images/tab/tabBarButtonMain_Selected_Inactive_Over.gif);
+  background-image: url(./images/tab/tabBarButtonMain_Selected_Inactive_Over.png);
 }
 
 .OBTabBarButtonMainTop,
@@ -102,7 +102,7 @@
   padding: 0;
   height: 30px;
   color: #000;
-  background-image: url(./images/tab/tabBarButtonMain_Unselected.gif);
+  background-image: url(./images/tab/tabBarButtonMain_Unselected.png);
   background-position: center top;
   background-repeat: repeat-x;
 }
@@ -114,7 +114,7 @@
   padding: 0;
   height: 30px;
   color: #000;
-  background-image: url(./images/tab/tabBarButtonMain_Unselected_Over.gif);
+  background-image: url(./images/tab/tabBarButtonMain_Unselected_Over.png);
   background-position: center top;
   background-repeat: repeat-x;
 }
@@ -186,7 +186,7 @@
 ============================================================*/
 
 .OBTabBarChild {
-  background: #ffffff url(./images/tab/tabBarChild_bg.gif) repeat-x scroll;
+  background: #ffffff url(./images/tab/tabBarChild_bg.png) repeat-x scroll;
   background-position: center top;
 }
 
@@ -228,13 +228,13 @@
 .OBTabBarButtonChildTopSelectedDisabled {
   background-position: center 2px;
   background-repeat: repeat-x;
-  background-image: url(./images/tab/tabBarButtonChild_Selected.gif);
+  background-image: url(./images/tab/tabBarButtonChild_Selected.png);
 }
 
 .OBTabBarButtonChildTopSelectedOver {
   background-position: center 2px;
   background-repeat: repeat-x;
-  background-image: url(./images/tab/tabBarButtonChild_Selected_Over.gif);
+  background-image: url(./images/tab/tabBarButtonChild_Selected_Over.png);
 }
 
 .OBTabBarButtonChildTopSelectedInactive,
@@ -245,13 +245,13 @@
 .OBTabBarButtonChildTopSelectedDisabledInactive {
   background-position: center 2px;
   background-repeat: repeat-x;
-  background-image: url(./images/tab/tabBarButtonChild_Selected_Inactive.gif);
+  background-image: url(./images/tab/tabBarButtonChild_Selected_Inactive.png);
 }
 
 .OBTabBarButtonChildTopSelectedOverInactive {
   background-position: center 2px;
   background-repeat: repeat-x;
-  background-image: url(./images/tab/tabBarButtonChild_Selected_Inactive_Over.gif);
+  background-image: url(./images/tab/tabBarButtonChild_Selected_Inactive_Over.png);
 }
 
 .OBTabBarButtonChildTop,
@@ -265,7 +265,7 @@
   padding: 0;
   height: 38px;
   color: #000;
-  background-image: url(./images/tab/tabBarButtonChild_Unselected.gif);
+  background-image: url(./images/tab/tabBarButtonChild_Unselected.png);
   background-position: center 2px;
   background-repeat: repeat-x;
 }
@@ -277,7 +277,7 @@
   padding: 0;
   height: 38px;
   color: #000;
-  background-image: url(./images/tab/tabBarButtonChild_Unselected_Over.gif);
+  background-image: url(./images/tab/tabBarButtonChild_Unselected_Over.png);
   background-position: center 2px;
   background-repeat: repeat-x;
 }
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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/org/openbravo/client/myob/MyOpenbravoComponentProvider.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponentProvider.java	Tue Jun 21 09:25:30 2011 +0200
@@ -78,11 +78,19 @@
         "web/org.openbravo.userinterface.smartclient/openbravo/skins/"
             + KernelConstants.SKIN_VERSION_PARAMETER
             + "/org.openbravo.client.myob/ob-widget-styles.js", false));
+    globalResources.add(createStaticResource(
+        "web/org.openbravo.userinterface.smartclient/openbravo/skins/"
+            + KernelConstants.SKIN_VERSION_PARAMETER
+            + "/org.openbravo.client.myob/ob-myopenbravo-styles.js", false));
 
     globalResources.add(createStyleSheetResource(
         "web/org.openbravo.userinterface.smartclient/openbravo/skins/"
             + KernelConstants.SKIN_VERSION_PARAMETER
             + "/org.openbravo.client.myob/ob-widget-styles.css", false));
+    globalResources.add(createStyleSheetResource(
+        "web/org.openbravo.userinterface.smartclient/openbravo/skins/"
+            + KernelConstants.SKIN_VERSION_PARAMETER
+            + "/org.openbravo.client.myob/ob-myopenbravo-styles.css", false));
 
     return globalResources;
   }
--- a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/templates/my_ob_js.ftl	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/templates/my_ob_js.ftl	Tue Jun 21 09:25:30 2011 +0200
@@ -16,7 +16,6 @@
  * Contributor(s):  ______________________________________.
  ************************************************************************
 */
-isc.defineClass("OBMyOpenbravoImplementation", OBMyOpenbravo);
 
 isc.OBMyOpenbravoImplementation.addProperties({
   enableAdminMode: ${data.enableAdminMode},
--- a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js	Tue Jun 21 09:25:30 2011 +0200
@@ -836,6 +836,9 @@
   }
 });
 
+
+isc.defineClass('OBMyOpenbravoImplementation', isc.OBMyOpenbravo);
+
 isc.defineClass('OBMyOBDialog', isc.Window).addProperties({
   width: '100%',
   form: null,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.myob/ob-myopenbravo-styles.css	Tue Jun 21 09:25:30 2011 +0200
@@ -0,0 +1,22 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being  the  Mozilla  Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2011 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */ 
+
+.OBMyOpenbravo {
+  background-color: #FFFFFF;
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.myob/ob-myopenbravo-styles.js	Tue Jun 21 09:25:30 2011 +0200
@@ -0,0 +1,22 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2011 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+*/
+
+isc.OBMyOpenbravo.addProperties({
+  styleName: 'OBMyOpenbravo'
+});
\ No newline at end of file
--- a/modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.myob/ob-widget-styles.css	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.myob/ob-widget-styles.css	Tue Jun 21 09:25:30 2011 +0200
@@ -144,13 +144,13 @@
 }
 
 .OBWidgetMenuCellTitleFieldDisabled hr {
-  border: 1px dashed #91B455;
+  border: 1px dashed #A9C787;
   border-width: 1px 0 0;
   margin: 0 6px;
 }
 
 .OBWidgetMenuCellIconFieldDisabled hr {
-  border: 1px dashed #91B455;
+  border: 1px dashed #A9C787;
   border-width: 1px 0 0;
   margin: 0 6px;
 }
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.querylist/ob-querylist-styles.css	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.querylist/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.querylist/ob-querylist-styles.css	Tue Jun 21 09:25:30 2011 +0200
@@ -17,6 +17,14 @@
  ************************************************************************
  */ 
  
+.OBQueryListView {
+  background-color: #FFFFFF;
+}
+
+.OBQueryListGridBody {
+  background-color: #FFFFFF;
+}
+
 /* QueryList */
 .OBQueryListShowAllLabel,
 .OBQueryListShowAllLabelOver,
--- a/modules/org.openbravo.client.querylist/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.querylist/ob-querylist-styles.js	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.querylist/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.querylist/ob-querylist-styles.js	Tue Jun 21 09:25:30 2011 +0200
@@ -18,6 +18,14 @@
 */
 
 
+isc.OBQueryListView.addProperties({
+  styleName: 'OBQueryListView'
+});
+
+isc.OBQueryListGrid.addProperties({
+  bodyStyleName: 'OBQueryListGridBody'
+});
+
 isc.OBQueryListWidget.addProperties({
   OBQueryListShowAllLabelHeight: 20
 });
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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.json/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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>
 
Binary file modules/org.openbravo.userinterface.skin.250to300Comp/web/org.openbravo.userinterface.skin.250to300Comp/skins/250to300Comp/Common/DataGrid/backgroundHeader.normal.png has changed
Binary file modules/org.openbravo.userinterface.skin.250to300Comp/web/org.openbravo.userinterface.skin.250to300Comp/skins/250to300Comp/Common/DataGrid/backgroundHeader.pressed.png has changed
Binary file modules/org.openbravo.userinterface.skin.250to300Comp/web/org.openbravo.userinterface.skin.250to300Comp/skins/250to300Comp/Common/DataGrid/backgroundHeader.rollover.png has changed
Binary file modules/org.openbravo.userinterface.skin.250to300Comp/web/org.openbravo.userinterface.skin.250to300Comp/skins/250to300Comp/Common/DataGrid/backgroundHeader.selected.png has changed
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/web/org.openbravo.userinterface.skin.250to300Comp/skins/250to300Comp/Openbravo_ERP_250.css	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/web/org.openbravo.userinterface.skin.250to300Comp/skins/250to300Comp/Openbravo_ERP_250.css	Tue Jun 21 09:25:30 2011 +0200
@@ -245,27 +245,33 @@
 .ComboKey,
 .Combo,
 .Combo_focus {
+  font-family: arial, sans-serif;
+  font-size: 12px;
+  font-weight: normal;
+  padding: 1px 0px 0px 0px;
+  margin-top: 0px;
+  height: 21px;
+}
+
+.ComboKey,
+.Combo,
+.Combo_focus {
   border: 1px solid #CDD7BB;
   color: #333333;
   background-color: #F5F7F1;
-  font-family: tahoma, arial, helvetica, sans-serif;
-  font-size: 12px;
-  padding: 1px 0px 0px 0px;
-  margin-top: 0px;
-  height: 21px;
 }
 
 .ComboKeyNoUpdatable,
 .ComboNoUpdatable,
 .ComboReadOnly,
 .ComboKeyReadOnly {
-  color: #6D6D6D;
-  font-weight: normal;
-  background-color: #D0D0D0;
+  border: 1px solid #FFFFFF !important;
+  color: #7D7D7D;
+  background-color: #FFFFFF;
 }
 
 .ComboKey {
-  background-color: #FFF6C1;
+  background-color: #FFFFCC;
 }
 
 .Combo_focus {
@@ -315,41 +321,73 @@
 
 tr.DataGrid_Body_Row_focus {
   background-image: none;
-  background-color: #FFBA6E;
+  background-color: #FFE1C0;
   color: #000000;
 }
 
 tr.DataGrid_Body_Row_selected {
   background-image: none;
-  background-color: #B8D587;
+  background-color: #FFE1C0;
   color: #000000;
 }
 
 th.DataGrid_Header_Cell {
-  font-family: arial, sans-serif;
-  font-size: 12px;
+  font-family: 'lucida sans', sans-serif;
+  font-size: 11px;
+  text-align: center;
   border-top: 1px solid #CDD7BB;
-  border-bottom: 1px solid #CDD7BB;
-  border-right: 1px solid #CDD7BB;
-  border-left : 1px solid #CDD7BB;
+  border-bottom: 1px solid #A7ABB4;
+  border-right: 1px solid #BBBFB6;
+  border-left : 1px solid #BBBFB6;
+  background-image: url(Common/DataGrid/backgroundHeader.normal.png);  /** sprite-ref: xxspritexx_V; sprite-alignment-ltr: repeat; sprite-margin-bottom: 30px; */
+  background-color: #ECEEE9;
+  _background-color: #ECEEE9;
 }
 
 th.DataGrid_Header_Cell_Amount {
-  font-family: arial, sans-serif;
-  font-size: 12px;
+  font-family: 'lucida sans', sans-serif;
+  font-size: 11px;
+  text-align: center;
   border-top: 1px solid #CDD7BB;
-  border-bottom: 1px solid #CDD7BB;
-  border-right: 1px solid #CDD7BB;
-  border-left : 1px solid #CDD7BB;
+  border-bottom: 1px solid #A7ABB4;
+  border-right: 1px solid #BBBFB6;
+  border-left : 1px solid #BBBFB6;
+  background-image: url(Common/DataGrid/backgroundHeader.normal.png);  /** sprite-ref: xxspritexx_V; sprite-alignment-ltr: repeat; sprite-margin-bottom: 30px; */
+  background-color: #ECEEE9;
+  _background-color: #ECEEE9;
+}
+
+th.DataGrid_Header_Cell_Inverse {
+  text-align: center !important;
+  padding: 1px 0px 1px 2px !important;
+}
+
+th.DataGrid_Header_Cell_hover {
+  background-image: url(Common/DataGrid/backgroundHeader.rollover.png);  /** sprite-ref: xxspritexx_V; sprite-alignment-ltr: repeat; sprite-margin-bottom: 30px; */
+  background-color: #FFFFFF;
+  _background-color: #FFFFFF;
+}
+
+th.DataGrid_Header_Cell_active {
+  background-image: url(Common/DataGrid/backgroundHeader.pressed.png);  /** sprite-ref: xxspritexx_V; sprite-alignment-ltr: repeat; sprite-margin-bottom: 30px; */
+  background-color: #FFFFFF;
+  _background-color: #FFFFFF;
+}
+
+th.DataGrid_Header_Cell_sorted {
+  background-image: url(Common/DataGrid/backgroundHeader.selected.png);  /** sprite-ref: xxspritexx_V; sprite-alignment-ltr: repeat; sprite-margin-bottom: 30px; */
+  background-color: #FFFFFF;
+  _background-color: #FFFFFF;
 }
 
 th.DataGrid_Header_LineNoCell {
+  text-align: left;
   border-top: 1px solid #000000;
-  border-bottom: 1px solid #000000;
-  border-right: 1px solid #000000;
+  border-bottom: 1px solid #A7ABB4;
+  border-right: 1px solid #A7ABB4;
   border-left: 1px solid #000000;
   background: none !important;
-  background-color : #505050 !important;
+  background-color : #CDD7BB !important;
 }
 
 td.DataGrid_Body_Cell {
@@ -375,16 +413,16 @@
   font-size: 12px !important;
   color: #000000 !important;
   background-image: none;
-  background-color: #FFE1C0;
+  background-color: #E1E1E1;
 }
 
 td.DataGrid_Body_LineNoCell {
-  border-top:  1px solid #000000;
-  border-bottom: 1px solid #000000;
-  border-right: 1px solid #000000;
-  border-left:   1px solid #000000;
-  background-color: #505050;
-  color: #ffffff;
+  border-top:  1px solid #A7ABB4;
+  border-bottom: 1px solid #A7ABB4;
+  border-right: 1px solid #A7ABB4;
+  border-left:   1px solid #A7ABB4;
+  background-color: #CDD7BB;
+  color: #000000;
 }
 
 /*
@@ -540,7 +578,7 @@
 }
 
 a.LabelLink:active {
-  color: #333333;
+  color: #58A618;
   text-decoration: none;
   -moz-outline-style: none;
 }
@@ -549,39 +587,46 @@
   color: #333333;
 }
 
+a.LabelLink:hover {
+  color: #58A618;
+  text-decoration: none;
+}
+
 a.LabelLink_focus {
   background-image: none;
-  color: #333333;
-  border-color: #FA962F;
+  color: #fa962f;
+  border-color: none;
 }
 
 a.LabelLink_noicon {
-  color: #2985BA;
+  color: #58A618;
   text-decoration: none;
 }
 
 a.LabelLink_noicon:active {
-  color: #1d5e84;
+  color: #58A618;
   text-decoration: none;
   -moz-outline-style: none;
 }
 
 a.LabelLink_noicon:visited {
-  color: #2985BA;
+  color: #58A618;
   text-decoration: none;
 }
 
 a.LabelLink_noicon:hover {
+  color: #58A618;
   text-decoration: underline;
 }
 
 a.LabelLink_noicon_focus {
-  padding: 0px 4px 0px 4px;
-  background-color: #C8E9F9 !important;
-  color: #2985BA;
+  padding: 0px 0px 0px 0px;
+  background-color: #FFFFFF !important;
+  color: #fa962f !important;
   border-style: solid;
-  border-width: 2px;
-  border-color: #2985BA;
+  border-width: 0px;
+  border-color: #58A618;
+  border: none;
   outline: none;
 }
 
@@ -885,14 +930,18 @@
 .required,
 .required_focus {
   background-image: none;
-  background-color: #FFF6C1 !important;
+  background-color: #FFFFCC !important;
+}
+
+.readonly {
+  border: 1px solid #FFFFFF !important;
 }
 
 .readonly,
 .readonly_focus {
-  color: #6D6D6D;
+  color: #7D7D7D;
   font-weight: normal;
-  background-color: #D0D0D0 !important;
+  background-color: transparent !important;
 }
 
 .dojoValidateEmpty_focus,
@@ -1085,7 +1134,7 @@
 /*dojoTabcurrent*/
 
 .dojoTabcurrent {
-  font-family: tahoma, arial, helvetica, sans-serif;
+  font-family: arial, sans-serif;
   font-size: 9pt;
   font-weight: bold;
   color: #000000 !important;
@@ -1104,7 +1153,7 @@
 /*dojoTabparent*/
 
 .dojoTabparent {
-  font-family: tahoma, arial, helvetica, sans-serif;
+  font-family: arial, sans-serif;
   font-size: 9pt;
   font-weight: bold;
   color: #333333 !important;
@@ -1123,7 +1172,7 @@
 /*dojoTabcurrent*/
 
 .dojoTabcurrentfirst {
-  font-family: tahoma, arial, helvetica, sans-serif;
+  font-family: arial, sans-serif;
   font-size: 9pt;
   font-weight: bold;
   color: #000000 !important;
@@ -1142,7 +1191,7 @@
 /*dojoTabparent*/
 
 .dojoTabparentfirst {
-  font-family: tahoma, arial, helvetica, sans-serif;
+  font-family: arial, sans-serif;
   font-size: 9pt;
   font-weight: bold;
   color: #333333 !important;
@@ -1162,7 +1211,7 @@
 /*dojoTabcurrent_focus*/
 
 .dojoTabcurrent_focus {
-  font-family: tahoma, arial, helvetica, sans-serif;
+  font-family: arial, sans-serif;
   font-size: 9pt;
   font-weight: bold;
   color: #000000 !important;
@@ -1181,7 +1230,7 @@
 /*dojoTabparent_focus*/
 
 .dojoTabparent_focus {
-  font-family: tahoma, arial, helvetica, sans-serif;
+  font-family: arial, sans-serif;
   font-size: 9pt;
   font-weight: bold;
   color: #333333 !important;
@@ -1200,7 +1249,7 @@
 /*dojoTabcurrent_focus*/
 
 .dojoTabcurrentfirst_focus {
-  font-family: tahoma, arial, helvetica, sans-serif;
+  font-family: arial, sans-serif;
   font-size: 9pt;
   font-weight: bold;
   color: #000000 !important;
@@ -1219,7 +1268,7 @@
 /*dojoTabparent_focus*/
 
 .dojoTabparentfirst_focus {
-  font-family: tahoma, arial, helvetica, sans-serif;
+  font-family: arial, sans-serif;
   font-size: 9pt;
   font-weight: bold;
   color: #333333 !important;
@@ -1500,8 +1549,9 @@
 */
 
 a.Popup_Client_Help_LabelLink_focus {
-  background-color: none !important;
-  border-color: #FA962F;
+  background-color: #FFFFFF !important;
+  color: #FA962F;
+  border-color: #FFFFFF;
 }
 
 /*
@@ -1685,7 +1735,7 @@
     height: 21px !important;
     border: 1px solid #CDD7BB !important;
     background: none !important;
-    background-color: #FFF6C1 !important;
+    background-color: #FFFFCC !important;
     color: #333333 !important;
 }
 
@@ -1693,10 +1743,10 @@
 .selectItemTextDisabled,
 .selectItemTextRequiredDisabled {
     height: 21px !important;
-    border: 1px solid #CDD7BB !important;
-    background: #D0D0D0 !important;
-    color: #6D6D6D !important;
-    background-color: #D0D0D0 !important;
+    border: 1px #FFFFFF !important;
+    background: transparent !important;
+    color: #7D7D7D !important;
+    background-color: transparent !important;
 }
 
 .textItemFocused,
@@ -1754,7 +1804,7 @@
 .cellOver,
 .cellOverDark {
     background: none !important;
-    background-color: #FFE1C0 !important;
+    background-color: #E1E1E1 !important;
 }
 .cellSelected,
 .cellSelectedDark {
@@ -1764,7 +1814,7 @@
 .cellSelectedOver,
 .cellSelectedOverDark {
     background: none !important;
-    background-color: #FFE1C0 !important;
+    background-color: #E1E1E1 !important;
 }
 
 .headerTitle,
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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.framework/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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/src-db/database/model/functions/AD_WINDOW_COPY.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/src-db/database/model/functions/AD_WINDOW_COPY.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -120,7 +120,8 @@
           SEQNO, ISSINGLEROW, ISINFOTAB, ISTRANSLATIONTAB, ISREADONLY,
           AD_COLUMN_ID, HASTREE, WHERECLAUSE, ORDERBYCLAUSE, COMMITWARNING,
           AD_PROCESS_ID, PROCESSING, AD_Module_ID,
-          FilterName
+          FilterName, UIPATTERN, HQLWHERECLAUSE,
+          HQLORDERBYCLAUSE, HQLFILTERCLAUSE, SHOWPARENTBUTTONS
         )
         select
           v_NextNo_T, v_Record_ID,
@@ -129,7 +130,8 @@
           Cur_Tabs.SEQNO, Cur_Tabs.ISSINGLEROW, Cur_Tabs.ISINFOTAB, Cur_Tabs.ISTRANSLATIONTAB, Cur_Tabs.ISREADONLY,
           Cur_Tabs.AD_COLUMN_ID, Cur_Tabs.HASTREE, Cur_Tabs.WHERECLAUSE, Cur_Tabs.ORDERBYCLAUSE, Cur_Tabs.COMMITWARNING,
           Cur_Tabs.AD_PROCESS_ID, Cur_Tabs.PROCESSING, v_dest_ad_module_id, 
-          coalesce(sub.filterName, Cur_Tabs.filterName)
+          coalesce(sub.filterName, Cur_Tabs.filterName), Cur_Tabs.UIPATTERN, Cur_Tabs.HQLWHERECLAUSE,
+          Cur_Tabs.HQLORDERBYCLAUSE, Cur_Tabs.HQLFILTERCLAUSE, Cur_Tabs.SHOWPARENTBUTTONS
          FROM ad_tab s left join 
         (select * from AD_tab_trl where ad_language=v_dest_ad_module_lang and ad_tab_id=Cur_Tabs.ad_tab_id ) sub
          on sub.ad_tab_id=s.ad_tab_id where s.ad_tab_id=Cur_Tabs.ad_tab_id;
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -206624,7 +206624,7 @@
 <!--03276FB53CC54CC1829E0AA6EC0F2EE6-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--03276FB53CC54CC1829E0AA6EC0F2EE6-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--03276FB53CC54CC1829E0AA6EC0F2EE6-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--03276FB53CC54CC1829E0AA6EC0F2EE6-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--03276FB53CC54CC1829E0AA6EC0F2EE6-->  <READONLYLOGIC><![CDATA[@Processed@='Y' & @status@!'RPAE']]></READONLYLOGIC>
 <!--03276FB53CC54CC1829E0AA6EC0F2EE6-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--03276FB53CC54CC1829E0AA6EC0F2EE6-->  <SEQNO><![CDATA[240]]></SEQNO>
 <!--03276FB53CC54CC1829E0AA6EC0F2EE6-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -210779,7 +210779,7 @@
 <!--4028C9BC2DA5C491012DA6832A1003A8-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--4028C9BC2DA5C491012DA6832A1003A8-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--4028C9BC2DA5C491012DA6832A1003A8-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--4028C9BC2DA5C491012DA6832A1003A8-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--4028C9BC2DA5C491012DA6832A1003A8-->  <READONLYLOGIC><![CDATA[@Processed@='Y' & @status@!'RPAE']]></READONLYLOGIC>
 <!--4028C9BC2DA5C491012DA6832A1003A8-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--4028C9BC2DA5C491012DA6832A1003A8-->  <SEQNO><![CDATA[430]]></SEQNO>
 <!--4028C9BC2DA5C491012DA6832A1003A8-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -210814,7 +210814,7 @@
 <!--4028C9BC2DA5C491012DA689D11F03BD-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--4028C9BC2DA5C491012DA689D11F03BD-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--4028C9BC2DA5C491012DA689D11F03BD-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--4028C9BC2DA5C491012DA689D11F03BD-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--4028C9BC2DA5C491012DA689D11F03BD-->  <READONLYLOGIC><![CDATA[@Processed@='Y' & @status@!'RPAE']]></READONLYLOGIC>
 <!--4028C9BC2DA5C491012DA689D11F03BD-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--4028C9BC2DA5C491012DA689D11F03BD-->  <SEQNO><![CDATA[440]]></SEQNO>
 <!--4028C9BC2DA5C491012DA689D11F03BD-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -218708,7 +218708,7 @@
 <!--57C8E0FB140CDE03E040007F01001B6B-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
 <!--57C8E0FB140CDE03E040007F01001B6B-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--57C8E0FB140CDE03E040007F01001B6B-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--57C8E0FB140CDE03E040007F01001B6B-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--57C8E0FB140CDE03E040007F01001B6B-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
 <!--57C8E0FB140CDE03E040007F01001B6B-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--57C8E0FB140CDE03E040007F01001B6B-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
 <!--57C8E0FB140CDE03E040007F01001B6B-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
@@ -218738,7 +218738,8 @@
 <!--57C8E0FB140DDE03E040007F01001B6B-->  <HELP><![CDATA[The Language identifies the language to use for display]]></HELP>
 <!--57C8E0FB140DDE03E040007F01001B6B-->  <COLUMNNAME><![CDATA[AD_Language]]></COLUMNNAME>
 <!--57C8E0FB140DDE03E040007F01001B6B-->  <AD_TABLE_ID><![CDATA[BB497D0047A34E2C89BA8CC23DEE6AD4]]></AD_TABLE_ID>
-<!--57C8E0FB140DDE03E040007F01001B6B-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--57C8E0FB140DDE03E040007F01001B6B-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--57C8E0FB140DDE03E040007F01001B6B-->  <AD_REFERENCE_VALUE_ID><![CDATA[106]]></AD_REFERENCE_VALUE_ID>
 <!--57C8E0FB140DDE03E040007F01001B6B-->  <FIELDLENGTH><![CDATA[6]]></FIELDLENGTH>
 <!--57C8E0FB140DDE03E040007F01001B6B-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--57C8E0FB140DDE03E040007F01001B6B-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -233513,7 +233514,7 @@
 <!--7891269C83DB655DE040007F010155CE-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--7891269C83DB655DE040007F010155CE-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--7891269C83DB655DE040007F010155CE-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--7891269C83DB655DE040007F010155CE-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--7891269C83DB655DE040007F010155CE-->  <READONLYLOGIC><![CDATA[@Processed@='Y' & @status@!'RPAE']]></READONLYLOGIC>
 <!--7891269C83DB655DE040007F010155CE-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
 <!--7891269C83DB655DE040007F010155CE-->  <SEQNO><![CDATA[90]]></SEQNO>
 <!--7891269C83DB655DE040007F010155CE-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -236568,7 +236569,7 @@
 <!--7DC34559B3F1B45BE040007F0100784A-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--7DC34559B3F1B45BE040007F0100784A-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--7DC34559B3F1B45BE040007F0100784A-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--7DC34559B3F1B45BE040007F0100784A-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--7DC34559B3F1B45BE040007F0100784A-->  <READONLYLOGIC><![CDATA[@Processed@='Y' & @status@!'RPAE']]></READONLYLOGIC>
 <!--7DC34559B3F1B45BE040007F0100784A-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--7DC34559B3F1B45BE040007F0100784A-->  <SEQNO><![CDATA[290]]></SEQNO>
 <!--7DC34559B3F1B45BE040007F0100784A-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -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>
@@ -23867,7 +23868,7 @@
 <!--2190-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2190-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2190-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2190-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2190-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2190-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2190-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2190-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -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 @@
 <!--1002100051-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1002100051-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1002100051-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1002100051-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1002100051-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1002100051-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1002100051-->  <GRID_SEQNO><![CDATA[220]]></GRID_SEQNO>
 <!--1002100051-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -157099,7 +157100,7 @@
 <!--1004400046-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1004400046-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1004400046-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1004400046-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1004400046-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1004400046-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1004400046-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1004400046-->  <GRID_SEQNO><![CDATA[200]]></GRID_SEQNO>
@@ -157659,7 +157660,7 @@
 <!--1004400070-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1004400070-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1004400070-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1004400070-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1004400070-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1004400070-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1004400070-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1004400070-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
@@ -158572,7 +158573,7 @@
 <!--1005100003-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005100003-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005100003-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1005100003-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1005100003-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1005100003-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1005100003-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005100003-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -158870,7 +158871,7 @@
 <!--1005400205-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400205-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400205-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1005400205-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1005400205-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1005400205-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005400205-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
 <!--1005400205-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -158897,7 +158898,7 @@
 <!--1005400206-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400206-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400206-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1005400206-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1005400206-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1005400206-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005400206-->  <GRID_SEQNO><![CDATA[140]]></GRID_SEQNO>
 <!--1005400206-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -158977,7 +158978,7 @@
 <!--1005400209-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400209-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400209-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1005400209-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1005400209-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1005400209-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005400209-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
 <!--1005400209-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -159002,7 +159003,7 @@
 <!--1005400210-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400210-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400210-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1005400210-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1005400210-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1005400210-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005400210-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
 <!--1005400210-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -159027,7 +159028,7 @@
 <!--1005400211-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400211-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400211-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1005400211-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1005400211-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1005400211-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005400211-->  <GRID_SEQNO><![CDATA[160]]></GRID_SEQNO>
 <!--1005400211-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -159106,7 +159107,7 @@
 <!--1005400214-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400214-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400214-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1005400214-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1005400214-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1005400214-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005400214-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
 <!--1005400214-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -159131,7 +159132,7 @@
 <!--1005400215-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400215-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400215-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1005400215-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1005400215-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1005400215-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005400215-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
 <!--1005400215-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -159156,7 +159157,7 @@
 <!--1005400216-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400216-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400216-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1005400216-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1005400216-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1005400216-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005400216-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
 <!--1005400216-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -159206,7 +159207,7 @@
 <!--1005400218-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400218-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400218-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1005400218-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1005400218-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1005400218-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005400218-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
 <!--1005400218-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -159231,7 +159232,7 @@
 <!--1005400219-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400219-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400219-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1005400219-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1005400219-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1005400219-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005400219-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
 <!--1005400219-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -159328,7 +159329,7 @@
 <!--1005400223-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400223-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400223-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1005400223-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1005400223-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1005400223-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005400223-->  <GRID_SEQNO><![CDATA[410]]></GRID_SEQNO>
 <!--1005400223-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -159406,7 +159407,7 @@
 <!--1005400226-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005400226-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005400226-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1005400226-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1005400226-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1005400226-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005400226-->  <GRID_SEQNO><![CDATA[420]]></GRID_SEQNO>
 <!--1005400226-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -160306,7 +160307,7 @@
 <!--1005500081-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005500081-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005500081-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1005500081-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1005500081-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1005500081-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005500081-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
 <!--1005500081-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -160437,7 +160438,7 @@
 <!--1005500086-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1005500086-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1005500086-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1005500086-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1005500086-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1005500086-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005500086-->  <GRID_SEQNO><![CDATA[210]]></GRID_SEQNO>
 <!--1005500086-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -161292,7 +161293,7 @@
 <!--1007400007-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1007400007-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1007400007-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1007400007-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1007400007-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--1007400007-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1007400007-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
 <!--1007400007-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -162261,7 +162262,7 @@
 <!--0F03AD35583F4088879709B23FF97E2A-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--0F03AD35583F4088879709B23FF97E2A-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--0F03AD35583F4088879709B23FF97E2A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--0F03AD35583F4088879709B23FF97E2A-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--0F03AD35583F4088879709B23FF97E2A-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--0F03AD35583F4088879709B23FF97E2A-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--0F03AD35583F4088879709B23FF97E2A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--0F03AD35583F4088879709B23FF97E2A-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -162311,7 +162312,7 @@
 <!--0F2E4C76A5E74E4D997AA8A4F472E1C7-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--0F2E4C76A5E74E4D997AA8A4F472E1C7-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--0F2E4C76A5E74E4D997AA8A4F472E1C7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--0F2E4C76A5E74E4D997AA8A4F472E1C7-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--0F2E4C76A5E74E4D997AA8A4F472E1C7-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--0F2E4C76A5E74E4D997AA8A4F472E1C7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--0F2E4C76A5E74E4D997AA8A4F472E1C7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--0F2E4C76A5E74E4D997AA8A4F472E1C7-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
@@ -162837,7 +162838,7 @@
 <!--159B36B1DBBE4138AD078AD02CF6D6CD-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--159B36B1DBBE4138AD078AD02CF6D6CD-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--159B36B1DBBE4138AD078AD02CF6D6CD-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--159B36B1DBBE4138AD078AD02CF6D6CD-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--159B36B1DBBE4138AD078AD02CF6D6CD-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--159B36B1DBBE4138AD078AD02CF6D6CD-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--159B36B1DBBE4138AD078AD02CF6D6CD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--159B36B1DBBE4138AD078AD02CF6D6CD-->  <GRID_SEQNO><![CDATA[180]]></GRID_SEQNO>
@@ -162995,7 +162996,7 @@
 <!--18DA0F94F716487DB3B71E4466231D94-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--18DA0F94F716487DB3B71E4466231D94-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--18DA0F94F716487DB3B71E4466231D94-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--18DA0F94F716487DB3B71E4466231D94-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--18DA0F94F716487DB3B71E4466231D94-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--18DA0F94F716487DB3B71E4466231D94-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--18DA0F94F716487DB3B71E4466231D94-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--18DA0F94F716487DB3B71E4466231D94-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -163024,7 +163025,7 @@
 <!--195CCC8EDC094481AAF5ACA4F6381E09-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--195CCC8EDC094481AAF5ACA4F6381E09-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--195CCC8EDC094481AAF5ACA4F6381E09-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--195CCC8EDC094481AAF5ACA4F6381E09-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--195CCC8EDC094481AAF5ACA4F6381E09-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--195CCC8EDC094481AAF5ACA4F6381E09-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--195CCC8EDC094481AAF5ACA4F6381E09-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--195CCC8EDC094481AAF5ACA4F6381E09-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -165474,7 +165475,7 @@
 <!--521F823118F56C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823118F56C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823118F56C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823118F56C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823118F56C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823118F56C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823118F56C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823118F56C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -165521,7 +165522,7 @@
 <!--521F823118F96C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823118F96C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823118F96C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823118F96C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823118F96C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823118F96C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823118F96C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823118F96C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -165545,7 +165546,7 @@
 <!--521F823118FE6C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823118FE6C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823118FE6C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823118FE6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823118FE6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823118FE6C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823118FE6C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823118FE6C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
@@ -165569,7 +165570,7 @@
 <!--521F823119016C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119016C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119016C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119016C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119016C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119016C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119016C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119016C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -165710,7 +165711,7 @@
 <!--521F8231190B6C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F8231190B6C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F8231190B6C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F8231190B6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F8231190B6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F8231190B6C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F8231190B6C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F8231190B6C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -165734,7 +165735,7 @@
 <!--521F8231190C6C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F8231190C6C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F8231190C6C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F8231190C6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F8231190C6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F8231190C6C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F8231190C6C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F8231190C6C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -165781,7 +165782,7 @@
 <!--521F823119136C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119136C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119136C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119136C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119136C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119136C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119136C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119136C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -165805,7 +165806,7 @@
 <!--521F823119196C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119196C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119196C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119196C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119196C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119196C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119196C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119196C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
@@ -165829,7 +165830,7 @@
 <!--521F8231191C6C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F8231191C6C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F8231191C6C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F8231191C6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F8231191C6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F8231191C6C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F8231191C6C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F8231191C6C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -165853,7 +165854,7 @@
 <!--521F8231191E6C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F8231191E6C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F8231191E6C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F8231191E6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F8231191E6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F8231191E6C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F8231191E6C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F8231191E6C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -165877,7 +165878,7 @@
 <!--521F823119206C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119206C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119206C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119206C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119206C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119206C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119206C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119206C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -165901,7 +165902,7 @@
 <!--521F823119236C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119236C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119236C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119236C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119236C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119236C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119236C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119236C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -165971,7 +165972,7 @@
 <!--521F823119296C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119296C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119296C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119296C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119296C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119296C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119296C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119296C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -166019,7 +166020,7 @@
 <!--521F8231192D6C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F8231192D6C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F8231192D6C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F8231192D6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F8231192D6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F8231192D6C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F8231192D6C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F8231192D6C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -166043,7 +166044,7 @@
 <!--521F8231192F6C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F8231192F6C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F8231192F6C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F8231192F6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F8231192F6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F8231192F6C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F8231192F6C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F8231192F6C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -166067,7 +166068,7 @@
 <!--521F823119326C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119326C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119326C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119326C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119326C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119326C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119326C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119326C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -166137,7 +166138,7 @@
 <!--521F8231193C6C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F8231193C6C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F8231193C6C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F8231193C6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F8231193C6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F8231193C6C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F8231193C6C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F8231193C6C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -166184,7 +166185,7 @@
 <!--521F823119446C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119446C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119446C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119446C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119446C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119446C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119446C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119446C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -166231,7 +166232,7 @@
 <!--521F8231194A6C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F8231194A6C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F8231194A6C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F8231194A6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F8231194A6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F8231194A6C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F8231194A6C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F8231194A6C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -166255,7 +166256,7 @@
 <!--521F8231194E6C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F8231194E6C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F8231194E6C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F8231194E6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F8231194E6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F8231194E6C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F8231194E6C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F8231194E6C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -166279,7 +166280,7 @@
 <!--521F823119516C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119516C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119516C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119516C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119516C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119516C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119516C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119516C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -166303,7 +166304,7 @@
 <!--521F823119536C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119536C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119536C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119536C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119536C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119536C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119536C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119536C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -166327,7 +166328,7 @@
 <!--521F823119586C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119586C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119586C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119586C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119586C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119586C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119586C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119586C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -166375,7 +166376,7 @@
 <!--521F8231195D6C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F8231195D6C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F8231195D6C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F8231195D6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F8231195D6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F8231195D6C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F8231195D6C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F8231195D6C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -166399,7 +166400,7 @@
 <!--521F823119616C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119616C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119616C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119616C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119616C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119616C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119616C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119616C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -166423,7 +166424,7 @@
 <!--521F823119636C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119636C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119636C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119636C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119636C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119636C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119636C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119636C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -166447,7 +166448,7 @@
 <!--521F823119666C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119666C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119666C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119666C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119666C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119666C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119666C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119666C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -166495,7 +166496,7 @@
 <!--521F8231196F6C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F8231196F6C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F8231196F6C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F8231196F6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F8231196F6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F8231196F6C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F8231196F6C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F8231196F6C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
@@ -166519,7 +166520,7 @@
 <!--521F823119716C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119716C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119716C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119716C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119716C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119716C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119716C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119716C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[250]]></GRID_SEQNO>
@@ -166589,7 +166590,7 @@
 <!--521F823119776C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119776C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119776C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119776C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119776C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119776C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119776C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119776C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -166613,7 +166614,7 @@
 <!--521F823119796C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119796C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119796C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119796C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119796C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119796C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119796C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119796C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -166637,7 +166638,7 @@
 <!--521F8231197B6C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F8231197B6C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F8231197B6C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F8231197B6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F8231197B6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F8231197B6C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F8231197B6C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F8231197B6C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -166661,7 +166662,7 @@
 <!--521F8231197D6C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F8231197D6C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F8231197D6C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F8231197D6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F8231197D6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F8231197D6C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F8231197D6C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F8231197D6C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -166708,7 +166709,7 @@
 <!--521F823119806C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119806C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119806C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119806C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119806C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119806C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119806C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119806C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -166780,7 +166781,7 @@
 <!--521F823119846C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F823119846C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F823119846C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F823119846C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F823119846C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F823119846C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F823119846C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F823119846C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -166804,7 +166805,7 @@
 <!--521F8231198D6C29E040007F01001B31-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--521F8231198D6C29E040007F01001B31-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--521F8231198D6C29E040007F01001B31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--521F8231198D6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--521F8231198D6C29E040007F01001B31-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--521F8231198D6C29E040007F01001B31-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--521F8231198D6C29E040007F01001B31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--521F8231198D6C29E040007F01001B31-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -168776,7 +168777,7 @@
 <!--573D4A317DC5FFC9E040007F01012790-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--573D4A317DC5FFC9E040007F01012790-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--573D4A317DC5FFC9E040007F01012790-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--573D4A317DC5FFC9E040007F01012790-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--573D4A317DC5FFC9E040007F01012790-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--573D4A317DC5FFC9E040007F01012790-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--573D4A317DC5FFC9E040007F01012790-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--573D4A317DC5FFC9E040007F01012790-->  <GRID_SEQNO><![CDATA[140]]></GRID_SEQNO>
@@ -168802,7 +168803,7 @@
 <!--573D4A317DC6FFC9E040007F01012790-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--573D4A317DC6FFC9E040007F01012790-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--573D4A317DC6FFC9E040007F01012790-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--573D4A317DC6FFC9E040007F01012790-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--573D4A317DC6FFC9E040007F01012790-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--573D4A317DC6FFC9E040007F01012790-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--573D4A317DC6FFC9E040007F01012790-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--573D4A317DC6FFC9E040007F01012790-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
@@ -169583,7 +169584,7 @@
 <!--579FDE50D9FC0BF7E040007F010132CC-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--579FDE50D9FC0BF7E040007F010132CC-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--579FDE50D9FC0BF7E040007F010132CC-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--579FDE50D9FC0BF7E040007F010132CC-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--579FDE50D9FC0BF7E040007F010132CC-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--579FDE50D9FC0BF7E040007F010132CC-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--579FDE50D9FC0BF7E040007F010132CC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--579FDE50D9FC0BF7E040007F010132CC-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
@@ -169609,7 +169610,7 @@
 <!--579FDE50D9FD0BF7E040007F010132CC-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--579FDE50D9FD0BF7E040007F010132CC-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--579FDE50D9FD0BF7E040007F010132CC-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--579FDE50D9FD0BF7E040007F010132CC-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--579FDE50D9FD0BF7E040007F010132CC-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--579FDE50D9FD0BF7E040007F010132CC-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--579FDE50D9FD0BF7E040007F010132CC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--579FDE50D9FD0BF7E040007F010132CC-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -170374,7 +170375,7 @@
 <!--57B98D879423A967E040007F01013153-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--57B98D879423A967E040007F01013153-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--57B98D879423A967E040007F01013153-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--57B98D879423A967E040007F01013153-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--57B98D879423A967E040007F01013153-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--57B98D879423A967E040007F01013153-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--57B98D879423A967E040007F01013153-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--57B98D879423A967E040007F01013153-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
@@ -170817,7 +170818,7 @@
 <!--580907CD8A6BFD19E040007F010142CF-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--580907CD8A6BFD19E040007F010142CF-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--580907CD8A6BFD19E040007F010142CF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--580907CD8A6BFD19E040007F010142CF-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--580907CD8A6BFD19E040007F010142CF-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--580907CD8A6BFD19E040007F010142CF-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--580907CD8A6BFD19E040007F010142CF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--580907CD8A6BFD19E040007F010142CF-->  <GRID_SEQNO><![CDATA[160]]></GRID_SEQNO>
@@ -171057,7 +171058,7 @@
 <!--58483D9BA18615CEE040007F010156C1-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--58483D9BA18615CEE040007F010156C1-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--58483D9BA18615CEE040007F010156C1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--58483D9BA18615CEE040007F010156C1-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--58483D9BA18615CEE040007F010156C1-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--58483D9BA18615CEE040007F010156C1-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--58483D9BA18615CEE040007F010156C1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--58483D9BA18615CEE040007F010156C1-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
@@ -171136,7 +171137,7 @@
 <!--5882BBA9814FEBACE040007F0101256F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5882BBA9814FEBACE040007F0101256F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5882BBA9814FEBACE040007F0101256F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5882BBA9814FEBACE040007F0101256F-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5882BBA9814FEBACE040007F0101256F-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5882BBA9814FEBACE040007F0101256F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5882BBA9814FEBACE040007F0101256F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5882BBA9814FEBACE040007F0101256F-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
@@ -171189,7 +171190,7 @@
 <!--5886701678ECFA5EE040007F01014095-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5886701678ECFA5EE040007F01014095-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5886701678ECFA5EE040007F01014095-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5886701678ECFA5EE040007F01014095-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5886701678ECFA5EE040007F01014095-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5886701678ECFA5EE040007F01014095-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5886701678ECFA5EE040007F01014095-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5886701678ECFA5EE040007F01014095-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
@@ -172561,7 +172562,7 @@
 <!--59FCCB2CD18F51EFE040007F010056C4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--59FCCB2CD18F51EFE040007F010056C4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--59FCCB2CD18F51EFE040007F010056C4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--59FCCB2CD18F51EFE040007F010056C4-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--59FCCB2CD18F51EFE040007F010056C4-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--59FCCB2CD18F51EFE040007F010056C4-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--59FCCB2CD18F51EFE040007F010056C4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--59FCCB2CD18F51EFE040007F010056C4-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
@@ -172612,7 +172613,7 @@
 <!--59FCCB2CD19151EFE040007F010056C4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--59FCCB2CD19151EFE040007F010056C4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--59FCCB2CD19151EFE040007F010056C4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--59FCCB2CD19151EFE040007F010056C4-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--59FCCB2CD19151EFE040007F010056C4-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--59FCCB2CD19151EFE040007F010056C4-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--59FCCB2CD19151EFE040007F010056C4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--59FCCB2CD19151EFE040007F010056C4-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
@@ -172715,7 +172716,7 @@
 <!--59FCCB2CD19551EFE040007F010056C4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--59FCCB2CD19551EFE040007F010056C4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--59FCCB2CD19551EFE040007F010056C4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--59FCCB2CD19551EFE040007F010056C4-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--59FCCB2CD19551EFE040007F010056C4-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--59FCCB2CD19551EFE040007F010056C4-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--59FCCB2CD19551EFE040007F010056C4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--59FCCB2CD19551EFE040007F010056C4-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
@@ -172741,7 +172742,7 @@
 <!--59FCCB2CD19651EFE040007F010056C4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--59FCCB2CD19651EFE040007F010056C4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--59FCCB2CD19651EFE040007F010056C4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--59FCCB2CD19651EFE040007F010056C4-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--59FCCB2CD19651EFE040007F010056C4-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--59FCCB2CD19651EFE040007F010056C4-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--59FCCB2CD19651EFE040007F010056C4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--59FCCB2CD19651EFE040007F010056C4-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
@@ -172767,7 +172768,7 @@
 <!--59FCCB2CD19A51EFE040007F010056C4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--59FCCB2CD19A51EFE040007F010056C4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--59FCCB2CD19A51EFE040007F010056C4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--59FCCB2CD19A51EFE040007F010056C4-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--59FCCB2CD19A51EFE040007F010056C4-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--59FCCB2CD19A51EFE040007F010056C4-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--59FCCB2CD19A51EFE040007F010056C4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--59FCCB2CD19A51EFE040007F010056C4-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
@@ -173165,7 +173166,7 @@
 <!--59FFF002FF8F3779E040007F01013B24-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--59FFF002FF8F3779E040007F01013B24-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--59FFF002FF8F3779E040007F01013B24-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--59FFF002FF8F3779E040007F01013B24-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--59FFF002FF8F3779E040007F01013B24-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--59FFF002FF8F3779E040007F01013B24-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--59FFF002FF8F3779E040007F01013B24-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--59FFF002FF8F3779E040007F01013B24-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
@@ -173189,7 +173190,7 @@
 <!--59FFF002FF943779E040007F01013B24-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--59FFF002FF943779E040007F01013B24-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--59FFF002FF943779E040007F01013B24-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--59FFF002FF943779E040007F01013B24-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--59FFF002FF943779E040007F01013B24-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--59FFF002FF943779E040007F01013B24-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--59FFF002FF943779E040007F01013B24-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--59FFF002FF943779E040007F01013B24-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
@@ -173737,7 +173738,7 @@
 <!--5BE1B2D550280FD2E040007F01016C74-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5BE1B2D550280FD2E040007F01016C74-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5BE1B2D550280FD2E040007F01016C74-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5BE1B2D550280FD2E040007F01016C74-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5BE1B2D550280FD2E040007F01016C74-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5BE1B2D550280FD2E040007F01016C74-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5BE1B2D550280FD2E040007F01016C74-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5BE1B2D550280FD2E040007F01016C74-->  <GRID_SEQNO><![CDATA[300]]></GRID_SEQNO>
@@ -173762,7 +173763,7 @@
 <!--5BE1B2D550290FD2E040007F01016C74-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5BE1B2D550290FD2E040007F01016C74-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5BE1B2D550290FD2E040007F01016C74-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5BE1B2D550290FD2E040007F01016C74-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5BE1B2D550290FD2E040007F01016C74-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5BE1B2D550290FD2E040007F01016C74-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5BE1B2D550290FD2E040007F01016C74-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5BE1B2D550290FD2E040007F01016C74-->  <GRID_SEQNO><![CDATA[310]]></GRID_SEQNO>
@@ -173816,7 +173817,7 @@
 <!--5BE1B2D5502B0FD2E040007F01016C74-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5BE1B2D5502B0FD2E040007F01016C74-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5BE1B2D5502B0FD2E040007F01016C74-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5BE1B2D5502B0FD2E040007F01016C74-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5BE1B2D5502B0FD2E040007F01016C74-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5BE1B2D5502B0FD2E040007F01016C74-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5BE1B2D5502B0FD2E040007F01016C74-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5BE1B2D5502B0FD2E040007F01016C74-->  <GRID_SEQNO><![CDATA[330]]></GRID_SEQNO>
@@ -173842,7 +173843,7 @@
 <!--5BE1B2D5502C0FD2E040007F01016C74-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5BE1B2D5502C0FD2E040007F01016C74-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5BE1B2D5502C0FD2E040007F01016C74-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5BE1B2D5502C0FD2E040007F01016C74-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5BE1B2D5502C0FD2E040007F01016C74-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5BE1B2D5502C0FD2E040007F01016C74-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5BE1B2D5502C0FD2E040007F01016C74-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5BE1B2D5502C0FD2E040007F01016C74-->  <GRID_SEQNO><![CDATA[340]]></GRID_SEQNO>
@@ -173868,7 +173869,7 @@
 <!--5BE1B2D5502D0FD2E040007F01016C74-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5BE1B2D5502D0FD2E040007F01016C74-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5BE1B2D5502D0FD2E040007F01016C74-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5BE1B2D5502D0FD2E040007F01016C74-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5BE1B2D5502D0FD2E040007F01016C74-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5BE1B2D5502D0FD2E040007F01016C74-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5BE1B2D5502D0FD2E040007F01016C74-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5BE1B2D5502D0FD2E040007F01016C74-->  <GRID_SEQNO><![CDATA[350]]></GRID_SEQNO>
@@ -174006,7 +174007,7 @@
 <!--5BE1B2D550320FD2E040007F01016C74-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5BE1B2D550320FD2E040007F01016C74-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5BE1B2D550320FD2E040007F01016C74-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5BE1B2D550320FD2E040007F01016C74-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5BE1B2D550320FD2E040007F01016C74-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5BE1B2D550320FD2E040007F01016C74-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5BE1B2D550320FD2E040007F01016C74-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5BE1B2D550320FD2E040007F01016C74-->  <GRID_SEQNO><![CDATA[380]]></GRID_SEQNO>
@@ -174031,7 +174032,7 @@
 <!--5BE1B2D550330FD2E040007F01016C74-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5BE1B2D550330FD2E040007F01016C74-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5BE1B2D550330FD2E040007F01016C74-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5BE1B2D550330FD2E040007F01016C74-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5BE1B2D550330FD2E040007F01016C74-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5BE1B2D550330FD2E040007F01016C74-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5BE1B2D550330FD2E040007F01016C74-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5BE1B2D550330FD2E040007F01016C74-->  <GRID_SEQNO><![CDATA[280]]></GRID_SEQNO>
@@ -174708,7 +174709,7 @@
 <!--60FCCD631EC1EDF8E040007F01013AD4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--60FCCD631EC1EDF8E040007F01013AD4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--60FCCD631EC1EDF8E040007F01013AD4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--60FCCD631EC1EDF8E040007F01013AD4-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--60FCCD631EC1EDF8E040007F01013AD4-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--60FCCD631EC1EDF8E040007F01013AD4-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--60FCCD631EC1EDF8E040007F01013AD4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--60FCCD631EC1EDF8E040007F01013AD4-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
@@ -174734,7 +174735,7 @@
 <!--60FCCD631EC2EDF8E040007F01013AD4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--60FCCD631EC2EDF8E040007F01013AD4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--60FCCD631EC2EDF8E040007F01013AD4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--60FCCD631EC2EDF8E040007F01013AD4-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--60FCCD631EC2EDF8E040007F01013AD4-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--60FCCD631EC2EDF8E040007F01013AD4-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--60FCCD631EC2EDF8E040007F01013AD4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--60FCCD631EC2EDF8E040007F01013AD4-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
@@ -174760,7 +174761,7 @@
 <!--60FCCD631EC3EDF8E040007F01013AD4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--60FCCD631EC3EDF8E040007F01013AD4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--60FCCD631EC3EDF8E040007F01013AD4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--60FCCD631EC3EDF8E040007F01013AD4-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--60FCCD631EC3EDF8E040007F01013AD4-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--60FCCD631EC3EDF8E040007F01013AD4-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--60FCCD631EC3EDF8E040007F01013AD4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--60FCCD631EC3EDF8E040007F01013AD4-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -174813,7 +174814,7 @@
 <!--60FCCD631EC5EDF8E040007F01013AD4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--60FCCD631EC5EDF8E040007F01013AD4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--60FCCD631EC5EDF8E040007F01013AD4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--60FCCD631EC5EDF8E040007F01013AD4-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--60FCCD631EC5EDF8E040007F01013AD4-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--60FCCD631EC5EDF8E040007F01013AD4-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--60FCCD631EC5EDF8E040007F01013AD4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--60FCCD631EC5EDF8E040007F01013AD4-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
@@ -174973,7 +174974,7 @@
 <!--61F239DF0C68FB81E040007F010172C7-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--61F239DF0C68FB81E040007F010172C7-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--61F239DF0C68FB81E040007F010172C7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--61F239DF0C68FB81E040007F010172C7-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--61F239DF0C68FB81E040007F010172C7-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--61F239DF0C68FB81E040007F010172C7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--61F239DF0C68FB81E040007F010172C7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--61F239DF0C68FB81E040007F010172C7-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -175106,7 +175107,7 @@
 <!--63491EA8748A4186A1CEB8EEDD13DE53-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--63491EA8748A4186A1CEB8EEDD13DE53-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--63491EA8748A4186A1CEB8EEDD13DE53-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--63491EA8748A4186A1CEB8EEDD13DE53-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--63491EA8748A4186A1CEB8EEDD13DE53-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--63491EA8748A4186A1CEB8EEDD13DE53-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--63491EA8748A4186A1CEB8EEDD13DE53-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--63491EA8748A4186A1CEB8EEDD13DE53-->  <GRID_SEQNO><![CDATA[160]]></GRID_SEQNO>
@@ -176069,7 +176070,7 @@
 <!--6FADAF8F6FAF9F05E040007F01001B9C-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6FADAF8F6FAF9F05E040007F01001B9C-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6FADAF8F6FAF9F05E040007F01001B9C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6FADAF8F6FAF9F05E040007F01001B9C-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6FADAF8F6FAF9F05E040007F01001B9C-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6FADAF8F6FAF9F05E040007F01001B9C-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6FADAF8F6FAF9F05E040007F01001B9C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6FADAF8F6FAF9F05E040007F01001B9C-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -176093,7 +176094,7 @@
 <!--6FD7EA7813C34C0AAC9069D4C28156B4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6FD7EA7813C34C0AAC9069D4C28156B4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6FD7EA7813C34C0AAC9069D4C28156B4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6FD7EA7813C34C0AAC9069D4C28156B4-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--6FD7EA7813C34C0AAC9069D4C28156B4-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--6FD7EA7813C34C0AAC9069D4C28156B4-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6FD7EA7813C34C0AAC9069D4C28156B4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6FD7EA7813C34C0AAC9069D4C28156B4-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
@@ -176119,7 +176120,7 @@
 <!--703CDB256AD143D6AE9EDAA13CC70113-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--703CDB256AD143D6AE9EDAA13CC70113-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--703CDB256AD143D6AE9EDAA13CC70113-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--703CDB256AD143D6AE9EDAA13CC70113-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--703CDB256AD143D6AE9EDAA13CC70113-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--703CDB256AD143D6AE9EDAA13CC70113-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--703CDB256AD143D6AE9EDAA13CC70113-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--703CDB256AD143D6AE9EDAA13CC70113-->  <GRID_SEQNO><![CDATA[180]]></GRID_SEQNO>
@@ -176430,7 +176431,7 @@
 <!--7399EE9782477B10E040007F0101315C-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--7399EE9782477B10E040007F0101315C-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--7399EE9782477B10E040007F0101315C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7399EE9782477B10E040007F0101315C-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7399EE9782477B10E040007F0101315C-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--7399EE9782477B10E040007F0101315C-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--7399EE9782477B10E040007F0101315C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7399EE9782477B10E040007F0101315C-->  <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO>
@@ -176612,7 +176613,7 @@
 <!--73A0528DBCE8F38BE040007F01011E2B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--73A0528DBCE8F38BE040007F01011E2B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--73A0528DBCE8F38BE040007F01011E2B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--73A0528DBCE8F38BE040007F01011E2B-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--73A0528DBCE8F38BE040007F01011E2B-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--73A0528DBCE8F38BE040007F01011E2B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--73A0528DBCE8F38BE040007F01011E2B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--73A0528DBCE8F38BE040007F01011E2B-->  <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO>
@@ -176640,7 +176641,7 @@
 <!--73A0528DBCE9F38BE040007F01011E2B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--73A0528DBCE9F38BE040007F01011E2B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--73A0528DBCE9F38BE040007F01011E2B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--73A0528DBCE9F38BE040007F01011E2B-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--73A0528DBCE9F38BE040007F01011E2B-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--73A0528DBCE9F38BE040007F01011E2B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--73A0528DBCE9F38BE040007F01011E2B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--73A0528DBCE9F38BE040007F01011E2B-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
@@ -176746,7 +176747,7 @@
 <!--755560EC7AB81758E040007F01010B34-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--755560EC7AB81758E040007F01010B34-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--755560EC7AB81758E040007F01010B34-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--755560EC7AB81758E040007F01010B34-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--755560EC7AB81758E040007F01010B34-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--755560EC7AB81758E040007F01010B34-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--755560EC7AB81758E040007F01010B34-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--755560EC7AB81758E040007F01010B34-->  <GRID_SEQNO><![CDATA[320]]></GRID_SEQNO>
@@ -176772,7 +176773,7 @@
 <!--755560EC7ABA1758E040007F01010B34-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--755560EC7ABA1758E040007F01010B34-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--755560EC7ABA1758E040007F01010B34-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--755560EC7ABA1758E040007F01010B34-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--755560EC7ABA1758E040007F01010B34-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--755560EC7ABA1758E040007F01010B34-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--755560EC7ABA1758E040007F01010B34-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--755560EC7ABA1758E040007F01010B34-->  <GRID_SEQNO><![CDATA[370]]></GRID_SEQNO>
@@ -176798,7 +176799,7 @@
 <!--755560EC7ABC1758E040007F01010B34-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--755560EC7ABC1758E040007F01010B34-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--755560EC7ABC1758E040007F01010B34-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--755560EC7ABC1758E040007F01010B34-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--755560EC7ABC1758E040007F01010B34-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--755560EC7ABC1758E040007F01010B34-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--755560EC7ABC1758E040007F01010B34-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--755560EC7ABC1758E040007F01010B34-->  <GRID_SEQNO><![CDATA[290]]></GRID_SEQNO>
@@ -178628,7 +178629,7 @@
 <!--7E4D5EB2C5DF48DB83971B8F46168E6E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--7E4D5EB2C5DF48DB83971B8F46168E6E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--7E4D5EB2C5DF48DB83971B8F46168E6E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7E4D5EB2C5DF48DB83971B8F46168E6E-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7E4D5EB2C5DF48DB83971B8F46168E6E-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--7E4D5EB2C5DF48DB83971B8F46168E6E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--7E4D5EB2C5DF48DB83971B8F46168E6E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7E4D5EB2C5DF48DB83971B8F46168E6E-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
@@ -178964,7 +178965,7 @@
 <!--7E595A11D62B446FE040007F010052E9-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--7E595A11D62B446FE040007F010052E9-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--7E595A11D62B446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7E595A11D62B446FE040007F010052E9-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7E595A11D62B446FE040007F010052E9-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--7E595A11D62B446FE040007F010052E9-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--7E595A11D62B446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7E595A11D62B446FE040007F010052E9-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
@@ -179096,7 +179097,7 @@
 <!--7E595A11D630446FE040007F010052E9-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--7E595A11D630446FE040007F010052E9-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--7E595A11D630446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7E595A11D630446FE040007F010052E9-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7E595A11D630446FE040007F010052E9-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--7E595A11D630446FE040007F010052E9-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--7E595A11D630446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7E595A11D630446FE040007F010052E9-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -179251,7 +179252,7 @@
 <!--7E595A11D63C446FE040007F010052E9-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--7E595A11D63C446FE040007F010052E9-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--7E595A11D63C446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7E595A11D63C446FE040007F010052E9-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7E595A11D63C446FE040007F010052E9-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--7E595A11D63C446FE040007F010052E9-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--7E595A11D63C446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7E595A11D63C446FE040007F010052E9-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
@@ -179385,7 +179386,7 @@
 <!--7E595A11D641446FE040007F010052E9-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--7E595A11D641446FE040007F010052E9-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--7E595A11D641446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7E595A11D641446FE040007F010052E9-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7E595A11D641446FE040007F010052E9-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--7E595A11D641446FE040007F010052E9-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--7E595A11D641446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7E595A11D641446FE040007F010052E9-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -180186,7 +180187,7 @@
 <!--7FF223474901844FE040007F01003861-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--7FF223474901844FE040007F01003861-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--7FF223474901844FE040007F01003861-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7FF223474901844FE040007F01003861-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7FF223474901844FE040007F01003861-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--7FF223474901844FE040007F01003861-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--7FF223474901844FE040007F01003861-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7FF223474901844FE040007F01003861-->  <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO>
@@ -180857,7 +180858,7 @@
 <!--80E4CFBA7924A660E040007F01005D04-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--80E4CFBA7924A660E040007F01005D04-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--80E4CFBA7924A660E040007F01005D04-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--80E4CFBA7924A660E040007F01005D04-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--80E4CFBA7924A660E040007F01005D04-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--80E4CFBA7924A660E040007F01005D04-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--80E4CFBA7924A660E040007F01005D04-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--80E4CFBA7924A660E040007F01005D04-->  <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO>
@@ -181460,7 +181461,7 @@
 <!--82683CB3CF8D18FDE040007F0100573E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--82683CB3CF8D18FDE040007F0100573E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--82683CB3CF8D18FDE040007F0100573E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--82683CB3CF8D18FDE040007F0100573E-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--82683CB3CF8D18FDE040007F0100573E-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--82683CB3CF8D18FDE040007F0100573E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--82683CB3CF8D18FDE040007F0100573E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--82683CB3CF8D18FDE040007F0100573E-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -182746,7 +182747,7 @@
 <!--845FD2B3462D4B84838E1392D7575895-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--845FD2B3462D4B84838E1392D7575895-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--845FD2B3462D4B84838E1392D7575895-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--845FD2B3462D4B84838E1392D7575895-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--845FD2B3462D4B84838E1392D7575895-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--845FD2B3462D4B84838E1392D7575895-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--845FD2B3462D4B84838E1392D7575895-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--845FD2B3462D4B84838E1392D7575895-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
@@ -184130,7 +184131,7 @@
 <!--8AC7C8017CEC4CF7B438DF0D8FB39172-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8AC7C8017CEC4CF7B438DF0D8FB39172-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8AC7C8017CEC4CF7B438DF0D8FB39172-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8AC7C8017CEC4CF7B438DF0D8FB39172-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8AC7C8017CEC4CF7B438DF0D8FB39172-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8AC7C8017CEC4CF7B438DF0D8FB39172-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8AC7C8017CEC4CF7B438DF0D8FB39172-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8AC7C8017CEC4CF7B438DF0D8FB39172-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
@@ -185362,7 +185363,7 @@
 <!--9150A393672DD51CE040007F01006877-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--9150A393672DD51CE040007F01006877-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--9150A393672DD51CE040007F01006877-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--9150A393672DD51CE040007F01006877-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--9150A393672DD51CE040007F01006877-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--9150A393672DD51CE040007F01006877-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--9150A393672DD51CE040007F01006877-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--9150A393672DD51CE040007F01006877-->  <GRID_SEQNO><![CDATA[270]]></GRID_SEQNO>
@@ -185388,7 +185389,7 @@
 <!--9150A393672ED51CE040007F01006877-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--9150A393672ED51CE040007F01006877-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--9150A393672ED51CE040007F01006877-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--9150A393672ED51CE040007F01006877-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--9150A393672ED51CE040007F01006877-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--9150A393672ED51CE040007F01006877-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--9150A393672ED51CE040007F01006877-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--9150A393672ED51CE040007F01006877-->  <GRID_SEQNO><![CDATA[360]]></GRID_SEQNO>
@@ -186546,7 +186547,7 @@
 <!--94C41428B8390680E040007F01001805-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--94C41428B8390680E040007F01001805-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--94C41428B8390680E040007F01001805-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--94C41428B8390680E040007F01001805-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--94C41428B8390680E040007F01001805-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--94C41428B8390680E040007F01001805-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--94C41428B8390680E040007F01001805-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--94C41428B8390680E040007F01001805-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -186572,7 +186573,7 @@
 <!--94C41428B83D0680E040007F01001805-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--94C41428B83D0680E040007F01001805-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--94C41428B83D0680E040007F01001805-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--94C41428B83D0680E040007F01001805-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--94C41428B83D0680E040007F01001805-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--94C41428B83D0680E040007F01001805-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--94C41428B83D0680E040007F01001805-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--94C41428B83D0680E040007F01001805-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
@@ -186833,7 +186834,7 @@
 <!--98B9A86EA9AF411DBD29D820FF30AAC5-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--98B9A86EA9AF411DBD29D820FF30AAC5-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--98B9A86EA9AF411DBD29D820FF30AAC5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--98B9A86EA9AF411DBD29D820FF30AAC5-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--98B9A86EA9AF411DBD29D820FF30AAC5-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--98B9A86EA9AF411DBD29D820FF30AAC5-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--98B9A86EA9AF411DBD29D820FF30AAC5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--98B9A86EA9AF411DBD29D820FF30AAC5-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
@@ -187023,7 +187024,7 @@
 <!--99DA6E867A144E0C95251C9D0F7BCE77-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--99DA6E867A144E0C95251C9D0F7BCE77-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--99DA6E867A144E0C95251C9D0F7BCE77-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--99DA6E867A144E0C95251C9D0F7BCE77-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--99DA6E867A144E0C95251C9D0F7BCE77-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--99DA6E867A144E0C95251C9D0F7BCE77-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--99DA6E867A144E0C95251C9D0F7BCE77-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--99DA6E867A144E0C95251C9D0F7BCE77-->  <GRID_SEQNO><![CDATA[140]]></GRID_SEQNO>
@@ -187177,7 +187178,7 @@
 <!--9D12BC3E180746FEA5FCEAB09414E4D4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--9D12BC3E180746FEA5FCEAB09414E4D4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--9D12BC3E180746FEA5FCEAB09414E4D4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--9D12BC3E180746FEA5FCEAB09414E4D4-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--9D12BC3E180746FEA5FCEAB09414E4D4-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--9D12BC3E180746FEA5FCEAB09414E4D4-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--9D12BC3E180746FEA5FCEAB09414E4D4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--9D12BC3E180746FEA5FCEAB09414E4D4-->  <GRID_SEQNO><![CDATA[160]]></GRID_SEQNO>
@@ -187473,7 +187474,7 @@
 <!--A1D216186A974F0B9C027597595D4F78-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--A1D216186A974F0B9C027597595D4F78-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--A1D216186A974F0B9C027597595D4F78-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--A1D216186A974F0B9C027597595D4F78-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--A1D216186A974F0B9C027597595D4F78-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--A1D216186A974F0B9C027597595D4F78-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--A1D216186A974F0B9C027597595D4F78-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--A1D216186A974F0B9C027597595D4F78-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
@@ -189010,7 +189011,7 @@
 <!--C9F0FE067F9A4D20A0D84D6D43865BC2-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--C9F0FE067F9A4D20A0D84D6D43865BC2-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--C9F0FE067F9A4D20A0D84D6D43865BC2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--C9F0FE067F9A4D20A0D84D6D43865BC2-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--C9F0FE067F9A4D20A0D84D6D43865BC2-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--C9F0FE067F9A4D20A0D84D6D43865BC2-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--C9F0FE067F9A4D20A0D84D6D43865BC2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--C9F0FE067F9A4D20A0D84D6D43865BC2-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -14415,7 +14415,7 @@
 <!--020F6EC9AA674B7A9D785EBEAF51C631-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--020F6EC9AA674B7A9D785EBEAF51C631-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--020F6EC9AA674B7A9D785EBEAF51C631-->  <VALUE><![CDATA[DependencyEnforcement]]></VALUE>
-<!--020F6EC9AA674B7A9D785EBEAF51C631-->  <MSGTEXT><![CDATA[with %0 enforcemwwent.]]></MSGTEXT>
+<!--020F6EC9AA674B7A9D785EBEAF51C631-->  <MSGTEXT><![CDATA[with %0 enforcement.]]></MSGTEXT>
 <!--020F6EC9AA674B7A9D785EBEAF51C631-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--020F6EC9AA674B7A9D785EBEAF51C631-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--020F6EC9AA674B7A9D785EBEAF51C631--></AD_MESSAGE>
@@ -17684,7 +17684,7 @@
 <!--A089F37D301F43C6A4E133F1BEC13706-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A089F37D301F43C6A4E133F1BEC13706-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A089F37D301F43C6A4E133F1BEC13706-->  <VALUE><![CDATA[UpgradeRequiresUpdates]]></VALUE>
-<!--A089F37D301F43C6A4E133F1BEC13706-->  <MSGTEXT><![CDATA[Selected upgrade requires some updates first]]></MSGTEXT>
+<!--A089F37D301F43C6A4E133F1BEC13706-->  <MSGTEXT><![CDATA[Selected installation of a new major release requires some updates first]]></MSGTEXT>
 <!--A089F37D301F43C6A4E133F1BEC13706-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--A089F37D301F43C6A4E133F1BEC13706-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--A089F37D301F43C6A4E133F1BEC13706--></AD_MESSAGE>
--- a/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -22,7 +22,7 @@
 <!--0-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--0-->  <REFERENCEDATAINFO><![CDATA[Standard document types for orders, invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
+<!--0-->  <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
 <!--0-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0--></AD_MODULE>
 
--- a/src-db/database/sourcedata/AD_REF_LIST.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -10760,8 +10760,8 @@
 <!--FF808181304FE89F0130500BEE4E003C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF808181304FE89F0130500BEE4E003C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF808181304FE89F0130500BEE4E003C-->  <VALUE><![CDATA[isUpgrading]]></VALUE>
-<!--FF808181304FE89F0130500BEE4E003C-->  <NAME><![CDATA[Uprgading from 2.50]]></NAME>
-<!--FF808181304FE89F0130500BEE4E003C-->  <DESCRIPTION><![CDATA[The insance is the process of upgrade from 2.50]]></DESCRIPTION>
+<!--FF808181304FE89F0130500BEE4E003C-->  <NAME><![CDATA[Upgrading from 2.50]]></NAME>
+<!--FF808181304FE89F0130500BEE4E003C-->  <DESCRIPTION><![CDATA[The instance is in the process of upgrade from 2.50]]></DESCRIPTION>
 <!--FF808181304FE89F0130500BEE4E003C-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
 <!--FF808181304FE89F0130500BEE4E003C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--FF808181304FE89F0130500BEE4E003C--></AD_REF_LIST>
--- a/src-db/database/sourcedata/AD_TAB.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/src-db/database/sourcedata/AD_TAB.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -11074,13 +11074,11 @@
 <!--47F87F1A284B4A7D9FB6ED2D02C5CDA1-->  <ISTRANSLATIONTAB><![CDATA[Y]]></ISTRANSLATIONTAB>
 <!--47F87F1A284B4A7D9FB6ED2D02C5CDA1-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--47F87F1A284B4A7D9FB6ED2D02C5CDA1-->  <HASTREE><![CDATA[N]]></HASTREE>
-<!--47F87F1A284B4A7D9FB6ED2D02C5CDA1-->  <WHERECLAUSE><![CDATA[AD_Module_Trl.AD_Module_ID = @AD_Module_ID@]]></WHERECLAUSE>
 <!--47F87F1A284B4A7D9FB6ED2D02C5CDA1-->  <PROCESSING><![CDATA[N]]></PROCESSING>
 <!--47F87F1A284B4A7D9FB6ED2D02C5CDA1-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
 <!--47F87F1A284B4A7D9FB6ED2D02C5CDA1-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--47F87F1A284B4A7D9FB6ED2D02C5CDA1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--47F87F1A284B4A7D9FB6ED2D02C5CDA1-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
-<!--47F87F1A284B4A7D9FB6ED2D02C5CDA1-->  <HQLWHERECLAUSE><![CDATA[e.module.id = @ADModule.id@]]></HQLWHERECLAUSE>
 <!--47F87F1A284B4A7D9FB6ED2D02C5CDA1-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
 <!--47F87F1A284B4A7D9FB6ED2D02C5CDA1--></AD_TAB>
 
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -12802,6 +12802,17 @@
 <!--1005900031-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005900031--></AD_TEXTINTERFACES>
 
+<!--006359C02D074CCE8F3770E59CEC20C5--><AD_TEXTINTERFACES>
+<!--006359C02D074CCE8F3770E59CEC20C5-->  <AD_TEXTINTERFACES_ID><![CDATA[006359C02D074CCE8F3770E59CEC20C5]]></AD_TEXTINTERFACES_ID>
+<!--006359C02D074CCE8F3770E59CEC20C5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--006359C02D074CCE8F3770E59CEC20C5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--006359C02D074CCE8F3770E59CEC20C5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--006359C02D074CCE8F3770E59CEC20C5-->  <TEXT><![CDATA[ is the process to install a new minor version of the product (called Maintenance Pack, MP) or newer versions of other modules installed in the instance. Maintenance Packs usually include fixes to product defects or small enhancements and do not require end users to be trained.]]></TEXT>
+<!--006359C02D074CCE8F3770E59CEC20C5-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html]]></FILENAME>
+<!--006359C02D074CCE8F3770E59CEC20C5-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--006359C02D074CCE8F3770E59CEC20C5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--006359C02D074CCE8F3770E59CEC20C5--></AD_TEXTINTERFACES>
+
 <!--00643C93CD244B02B236FA5607258820--><AD_TEXTINTERFACES>
 <!--00643C93CD244B02B236FA5607258820-->  <AD_TEXTINTERFACES_ID><![CDATA[00643C93CD244B02B236FA5607258820]]></AD_TEXTINTERFACES_ID>
 <!--00643C93CD244B02B236FA5607258820-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -13626,17 +13637,6 @@
 <!--39F1C6FF551B4210BE3EC6F1904DE43B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--39F1C6FF551B4210BE3EC6F1904DE43B--></AD_TEXTINTERFACES>
 
-<!--3A860CF7898047AC8AE89539591AD381--><AD_TEXTINTERFACES>
-<!--3A860CF7898047AC8AE89539591AD381-->  <AD_TEXTINTERFACES_ID><![CDATA[3A860CF7898047AC8AE89539591AD381]]></AD_TEXTINTERFACES_ID>
-<!--3A860CF7898047AC8AE89539591AD381-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--3A860CF7898047AC8AE89539591AD381-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--3A860CF7898047AC8AE89539591AD381-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3A860CF7898047AC8AE89539591AD381-->  <TEXT><![CDATA[ installs a higher major version than the one currently installed. It is a major enhancement.]]></TEXT>
-<!--3A860CF7898047AC8AE89539591AD381-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html]]></FILENAME>
-<!--3A860CF7898047AC8AE89539591AD381-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--3A860CF7898047AC8AE89539591AD381-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--3A860CF7898047AC8AE89539591AD381--></AD_TEXTINTERFACES>
-
 <!--3CC1A847C2DF43629F56C6B6EB9F7A0D--><AD_TEXTINTERFACES>
 <!--3CC1A847C2DF43629F56C6B6EB9F7A0D-->  <AD_TEXTINTERFACES_ID><![CDATA[3CC1A847C2DF43629F56C6B6EB9F7A0D]]></AD_TEXTINTERFACES_ID>
 <!--3CC1A847C2DF43629F56C6B6EB9F7A0D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -17399,17 +17399,6 @@
 <!--824818EB1076489EAC986E497180AF22-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--824818EB1076489EAC986E497180AF22--></AD_TEXTINTERFACES>
 
-<!--829DB68C25824AD0BD0E3603DE7A31B9--><AD_TEXTINTERFACES>
-<!--829DB68C25824AD0BD0E3603DE7A31B9-->  <AD_TEXTINTERFACES_ID><![CDATA[829DB68C25824AD0BD0E3603DE7A31B9]]></AD_TEXTINTERFACES_ID>
-<!--829DB68C25824AD0BD0E3603DE7A31B9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--829DB68C25824AD0BD0E3603DE7A31B9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--829DB68C25824AD0BD0E3603DE7A31B9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--829DB68C25824AD0BD0E3603DE7A31B9-->  <TEXT><![CDATA[ installs a minor version of a module but does not upgrade it to the next major version (if one exists).]]></TEXT>
-<!--829DB68C25824AD0BD0E3603DE7A31B9-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html]]></FILENAME>
-<!--829DB68C25824AD0BD0E3603DE7A31B9-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--829DB68C25824AD0BD0E3603DE7A31B9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--829DB68C25824AD0BD0E3603DE7A31B9--></AD_TEXTINTERFACES>
-
 <!--829E2B2EFCBA3DFBE040007F01013C0D--><AD_TEXTINTERFACES>
 <!--829E2B2EFCBA3DFBE040007F01013C0D-->  <AD_TEXTINTERFACES_ID><![CDATA[829E2B2EFCBA3DFBE040007F01013C0D]]></AD_TEXTINTERFACES_ID>
 <!--829E2B2EFCBA3DFBE040007F01013C0D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19344,6 +19333,17 @@
 <!--AECD67A7CDC244E6B79B901B30B824AC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--AECD67A7CDC244E6B79B901B30B824AC--></AD_TEXTINTERFACES>
 
+<!--AF436FF0EAE84FAEA770A1E566638326--><AD_TEXTINTERFACES>
+<!--AF436FF0EAE84FAEA770A1E566638326-->  <AD_TEXTINTERFACES_ID><![CDATA[AF436FF0EAE84FAEA770A1E566638326]]></AD_TEXTINTERFACES_ID>
+<!--AF436FF0EAE84FAEA770A1E566638326-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AF436FF0EAE84FAEA770A1E566638326-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AF436FF0EAE84FAEA770A1E566638326-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AF436FF0EAE84FAEA770A1E566638326-->  <TEXT><![CDATA[ is the process to install a new major version of the product (eg. from version 2.50 to 3.0). Major versions include broad set of new features and usually require to train end users before deploying it into the production environment.]]></TEXT>
+<!--AF436FF0EAE84FAEA770A1E566638326-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html]]></FILENAME>
+<!--AF436FF0EAE84FAEA770A1E566638326-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--AF436FF0EAE84FAEA770A1E566638326-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--AF436FF0EAE84FAEA770A1E566638326--></AD_TEXTINTERFACES>
+
 <!--AF4DC8EC6A654F469E25D9C768923CFF--><AD_TEXTINTERFACES>
 <!--AF4DC8EC6A654F469E25D9C768923CFF-->  <AD_TEXTINTERFACES_ID><![CDATA[AF4DC8EC6A654F469E25D9C768923CFF]]></AD_TEXTINTERFACES_ID>
 <!--AF4DC8EC6A654F469E25D9C768923CFF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-wad/src/org/openbravo/wad/ActionButtonJava_Responser.javaxml	Wed Jun 15 07:49:58 2011 +0200
+++ b/src-wad/src/org/openbravo/wad/ActionButtonJava_Responser.javaxml	Tue Jun 21 09:25:30 2011 +0200
@@ -12,7 +12,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2008-2010 Openbravo SLU 
+ * All portions are Copyright (C) 2008-2011 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -117,30 +117,7 @@
         printPageButton<FIELD_TMP id="ProcessID1">xx</FIELD_TMP>(response, vars, strProcessId<FIELD_TMP id="FieldsLoadName1">, strFields</FIELD_TMP>);
 </FIELDS_TMP>
 <FIELDS_TMP id="sectionActionButtons3">    } else if (vars.commandIn("SAVE_BUTTONActionButton<FIELD_TMP id="ProcessID3">button</FIELD_TMP>")) {
-        <FIELD_TMP id="FieldsLoad3">String strField = vars.getStringParameter("inpFields");</FIELD_TMP>
-        
-        ProcessBundle pb = new ProcessBundle(strProcessId, vars).init(this);
-        HashMap&lt;String, Object&gt; params= new HashMap&lt;String, Object&gt;();
-       
-        <FIELD_TMP id="FieldsLoadParams3">PInstanceProcessData.insertPInstanceParam(this, pinstance, )</FIELD_TMP>
-        
-        pb.setParams(params);
-        OBError myMessage = null;
-        try {
-          <FIELD_TMP id="ProcessCode3">execute process</FIELD_TMP>
-          myMessage = (OBError) pb.getResult();
-          myMessage.setMessage(Utility.parseTranslation(this, vars, vars.getLanguage(), myMessage.getMessage()));
-          myMessage.setTitle(Utility.parseTranslation(this, vars, vars.getLanguage(), myMessage.getTitle()));
-        } catch (Exception ex) {
-          myMessage = Utility.translateError(this, vars, vars.getLanguage(), ex.getMessage());
-          log4j.error(ex);
-          if (!myMessage.isConnectionAvailable()) {
-            bdErrorConnection(response);
-            return;
-          }
-        }
-
-        processButtonHelper(request, response, vars, myMessage);        
+        process<FIELD_TMP id="ProcessID3">button</FIELD_TMP>(strProcessId, vars, request, response);
 </FIELDS_TMP>
     } else pageErrorPopUp(response);
   }
@@ -204,6 +181,35 @@
     }
 </FIELDS_TMP>
 
+<FIELDS_TMP id="sectionActionButtonsProcess">    private void process<FIELD_TMP id="ProcessID4">xx</FIELD_TMP>(String strProcessId, VariablesSecureApp vars, HttpServletRequest request, HttpServletResponse response) throws IOException,
+      ServletException {
+        <FIELD_TMP id="FieldsLoad4">String strField = vars.getStringParameter("inpFields");</FIELD_TMP>
+        
+        ProcessBundle pb = new ProcessBundle(strProcessId, vars).init(this);
+        HashMap&lt;String, Object&gt; params= new HashMap&lt;String, Object&gt;();
+       
+        <FIELD_TMP id="FieldsLoadParams4">PInstanceProcessData.insertPInstanceParam(this, pinstance, )</FIELD_TMP>
+        
+        pb.setParams(params);
+        OBError myMessage = null;
+        try {
+          <FIELD_TMP id="ProcessCode4">execute process</FIELD_TMP>
+          myMessage = (OBError) pb.getResult();
+          myMessage.setMessage(Utility.parseTranslation(this, vars, vars.getLanguage(), myMessage.getMessage()));
+          myMessage.setTitle(Utility.parseTranslation(this, vars, vars.getLanguage(), myMessage.getTitle()));
+        } catch (Exception ex) {
+          myMessage = Utility.translateError(this, vars, vars.getLanguage(), ex.getMessage());
+          log4j.error(ex);
+          if (!myMessage.isConnectionAvailable()) {
+            bdErrorConnection(response);
+            return;
+          }
+        }
+
+        processButtonHelper(request, response, vars, myMessage); 
+   }
+</FIELDS_TMP>
+
   public String getServletInfo() {
     return "Servlet ActionButton_Responser. This Servlet was made by Wad constructor";
   } // end of the getServletInfo() method
--- a/src-wad/src/org/openbravo/wad/ActionButtonJava_Responser.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/src-wad/src/org/openbravo/wad/ActionButtonJava_Responser.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -12,7 +12,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2008 Openbravo SLU 
+ * All portions are Copyright (C) 2008-2011 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -45,12 +45,17 @@
 
 <structure name="structure3">
   <FIELD id="ProcessID3">adProcessId</FIELD>
-  <FIELD id="ButtonName3">columnname</FIELD>
-  <FIELD id="ButtonRealName3">realname</FIELD>
-  <FIELD id="FieldsLoad3">htmltext</FIELD>
-  <FIELD id="FieldsLoadParams3">processParams</FIELD>
-  <FIELD id="ProcessCode3">processCode</FIELD>
   <SECTION id="sectionActionButtons3"/>
 </structure>
 
+<structure name="structure4">
+  <FIELD id="ProcessID4">adProcessId</FIELD>
+  <FIELD id="ButtonName4">columnname</FIELD>
+  <FIELD id="ButtonRealName4">realname</FIELD>
+  <FIELD id="FieldsLoad4">htmltext</FIELD>
+  <FIELD id="FieldsLoadParams4">processParams</FIELD>
+  <FIELD id="ProcessCode4">processCode</FIELD>
+  <SECTION id="sectionActionButtonsProcess"/>
+</structure>
+
 </REPORT>
--- a/src-wad/src/org/openbravo/wad/ActionButton_Responser.javaxml	Wed Jun 15 07:49:58 2011 +0200
+++ b/src-wad/src/org/openbravo/wad/ActionButton_Responser.javaxml	Tue Jun 21 09:25:30 2011 +0200
@@ -12,7 +12,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2010 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2011 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -116,16 +116,7 @@
         printPageButton<FIELD_TMP id="ProcessID1">xx</FIELD_TMP>(response, vars, strProcessId<FIELD_TMP id="FieldsLoadName1">, strFields</FIELD_TMP>);
 </FIELDS_TMP>
 <FIELDS_TMP id="sectionActionButtons3">    } else if (vars.commandIn("SAVE_BUTTONActionButton<FIELD_TMP id="ProcessID3">button</FIELD_TMP>")) {
-        <FIELD_TMP id="FieldsLoad3">String strField = vars.getStringParameter("inpFields");</FIELD_TMP>
-        String strProcessing = vars.getStringParameter("inpprocessing");
-        String pinstance = SequenceIdData.getUUID();
-        PInstanceProcessData.insertPInstance(this, pinstance, "<FIELD_TMP id="ProcessID3">button</FIELD_TMP>", "0", strProcessing, vars.getUser(), vars.getClient(), vars.getOrg());
-        <FIELD_TMP id="FieldsLoadParams3">PInstanceProcessData.insertPInstanceParam(this, pinstance, )</FIELD_TMP>
-        <FIELD_TMP id="AdditionalCode3">code</FIELD_TMP>
-        ProcessBundle bundle = ProcessBundle.pinstance(pinstance, vars, this);
-        new ProcessRunner(bundle).execute(this);
-
-        processButtonHelper(request, response, vars, pinstance);        
+       process<FIELD_TMP id="ProcessID3">button</FIELD_TMP>(vars, request, response);    
 </FIELDS_TMP>
     } else pageErrorPopUp(response);
   }
@@ -187,6 +178,22 @@
     }
 </FIELDS_TMP>
 
+
+<FIELDS_TMP id="sectionActionButtonsProcess">    private void process<FIELD_TMP id="ProcessID4">xx</FIELD_TMP>(VariablesSecureApp vars, HttpServletRequest request, HttpServletResponse response) throws IOException,
+      ServletException{
+         <FIELD_TMP id="FieldsLoad4">String strField = vars.getStringParameter("inpFields");</FIELD_TMP>
+        String strProcessing = vars.getStringParameter("inpprocessing");
+        String pinstance = SequenceIdData.getUUID();
+        PInstanceProcessData.insertPInstance(this, pinstance, "<FIELD_TMP id="ProcessID4">button</FIELD_TMP>", "0", strProcessing, vars.getUser(), vars.getClient(), vars.getOrg());
+        <FIELD_TMP id="FieldsLoadParams4">PInstanceProcessData.insertPInstanceParam(this, pinstance, )</FIELD_TMP>
+        <FIELD_TMP id="AdditionalCode4">code</FIELD_TMP>
+        ProcessBundle bundle = ProcessBundle.pinstance(pinstance, vars, this);
+        new ProcessRunner(bundle).execute(this);
+
+        processButtonHelper(request, response, vars, pinstance);    
+  }
+</FIELDS_TMP>
+
   public String getServletInfo() {
     return "Servlet ActionButton_Responser. This Servlet was made by Wad constructor";
   } // end of the getServletInfo() method
--- a/src-wad/src/org/openbravo/wad/ActionButton_Responser.xml	Wed Jun 15 07:49:58 2011 +0200
+++ b/src-wad/src/org/openbravo/wad/ActionButton_Responser.xml	Tue Jun 21 09:25:30 2011 +0200
@@ -12,7 +12,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2006 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2011 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -45,13 +45,18 @@
 
 <structure name="structure3">
   <FIELD id="ProcessID3">adProcessId</FIELD>
-  <FIELD id="ButtonName3">columnname</FIELD>
-  <FIELD id="ButtonRealName3">realname</FIELD>
-  <FIELD id="FieldsLoad3">htmltext</FIELD>
-  <FIELD id="FieldsLoadParams3">processParams</FIELD>
-  <FIELD id="ProcessCode3">processCode</FIELD>
-  <FIELD id="AdditionalCode3">additionalCode</FIELD>
   <SECTION id="sectionActionButtons3"/>
 </structure>
 
+<structure name="structure4">
+  <FIELD id="ProcessID4">adProcessId</FIELD>
+  <FIELD id="ButtonName4">columnname</FIELD>
+  <FIELD id="ButtonRealName4">realname</FIELD>
+  <FIELD id="FieldsLoad4">htmltext</FIELD>
+  <FIELD id="FieldsLoadParams4">processParams</FIELD>
+  <FIELD id="ProcessCode4">processCode</FIELD>
+  <FIELD id="AdditionalCode4">additionalCode</FIELD>
+  <SECTION id="sectionActionButtonsProcess"/>
+</structure>
+
 </REPORT>
--- a/src-wad/src/org/openbravo/wad/Fields_data.xsql	Wed Jun 15 07:49:58 2011 +0200
+++ b/src-wad/src/org/openbravo/wad/Fields_data.xsql	Tue Jun 21 09:25:30 2011 +0200
@@ -122,15 +122,20 @@
         (SELECT tableNAME FROM AD_TABLE, AD_TAB WHERE AD_TABLE.ad_table_id = AD_TAB.ad_table_id
         AND AD_TAB.ad_tab_id=?) AS tablename, ? as AD_Tab_ID, (select name from ad_tab where ad_tab_id = ?) as parent_tab_name,
         (SELECT P.ad_module_id FROM AD_TABLE T, AD_PACKAGE P WHERE T.ad_table_id = AD_COLUMN.ad_table_id AND T.AD_PACKAGE_ID = P.AD_PACKAGE_ID) as tableModule,
-        AD_COLUMN.AD_Module_ID as columnModule
+        AD_COLUMN.AD_Module_ID as columnModule, 
+          (SELECT c.issecondarykey 
+             FROM AD_COLUMN c, AD_FIELD f 
+            WHERE c.ad_column_id = f.ad_column_id AND (c.iskey='Y' OR c.issecondarykey='Y')
+              AND ad_tab_id=? AND UPPER(c.columnname) = UPPER(AD_COLUMN.columnname)) as issecondarykey 
         FROM AD_FIELD, AD_COLUMN 
         WHERE AD_FIELD.ad_column_id = AD_COLUMN.ad_column_id AND ad_tab_id = ? AND isParent='Y' 
-        AND EXISTS(SELECT 1 FROM AD_COLUMN c, AD_FIELD f WHERE c.ad_column_id = f.ad_column_id AND (c.iskey='Y' OR c.issecondarykey='Y')
+        AND EXISTS (SELECT 1 FROM AD_COLUMN c, AD_FIELD f WHERE c.ad_column_id = f.ad_column_id AND (c.iskey='Y' OR c.issecondarykey='Y')
         AND ad_tab_id=? AND UPPER(c.columnname) = UPPER(AD_COLUMN.columnname))
       ]]></Sql>
       <Parameter name="parentTab"/>
       <Parameter name="parentTab"/>
       <Parameter name="parentTab"/>
+      <Parameter name="parentTab"/>
       <Parameter name="tab"/>
       <Parameter name="parentTab"/>
   </SqlMethod>
--- a/src-wad/src/org/openbravo/wad/Tabs_data.xsql	Wed Jun 15 07:49:58 2011 +0200
+++ b/src-wad/src/org/openbravo/wad/Tabs_data.xsql	Tue Jun 21 09:25:30 2011 +0200
@@ -12,7 +12,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2010 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2011 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -197,6 +197,16 @@
                        AND C.UPDATED > SI.LAST_BUILD
                         AND C.AD_TABLE_ID = TB.AD_TABLE_ID
                         AND W.AD_WINDOW_ID = TB.AD_WINDOW_ID
+                    UNION
+                      SELECT 1
+                        FROM AD_COLUMN C, AD_TAB TB, AD_WINDOW W, AD_COLUMN C2, AD_REF_SEARCH R
+                       WHERE AD_WINDOW.AD_WINDOW_ID = W.AD_WINDOW_ID
+                         AND R.AD_TABLE_ID = C.AD_TABLE_ID
+                         AND C.UPDATED > SI.LAST_BUILD
+                         AND C2.AD_REFERENCE_ID = '30'
+                         AND C2.AD_REFERENCE_VALUE_ID = R.AD_REFERENCE_ID
+                         AND C2.AD_TABLE_ID = TB.AD_TABLE_ID
+                         AND W.AD_WINDOW_ID = TB.AD_WINDOW_ID
                        )
         ORDER BY AD_WINDOW.name, AD_TAB.tablevel, AD_TAB.seqno
           ]]>
--- a/src-wad/src/org/openbravo/wad/Wad.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/src-wad/src/org/openbravo/wad/Wad.java	Tue Jun 21 09:25:30 2011 +0200
@@ -485,6 +485,7 @@
       xmlDocumentData.setData("structure1", abrd);
       xmlDocumentData.setData("structure2", abrd);
       xmlDocumentData.setData("structure3", abrd);
+      xmlDocumentData.setData("structure4", abrd);
 
       WadUtility.writeFile(fileReference, "ActionButton_Responser.java", xmlDocumentData.print());
 
@@ -497,6 +498,7 @@
       xmlDocumentData.setData("structure1", abrd);
       xmlDocumentData.setData("structure2", abrd);
       xmlDocumentData.setData("structure3", abrd);
+      xmlDocumentData.setData("structure4", abrd);
 
       WadUtility.writeFile(fileReference, "ActionButtonJava_Responser.java", xmlDocumentData
           .print());
@@ -1567,12 +1569,15 @@
     }
 
     final String[] discard = { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "",
-        "", "", "", "", "hasReference", "", "", "", "", "", "", "", "hasOrgKey", "", "" };
+        "", "", "", "", "hasReference", "", "", "", "", "", "", "", "hasOrgKey", "", "", "" };
 
     if (parentsFieldsData == null || parentsFieldsData.length == 0) {
       discard[0] = "parent"; // remove the parent tags
       hasParentsFields = false;
+    } else if (!"Y".equals(parentsFieldsData[0].issecondarykey)) {
+      discard[32] = "parentSecondaryKey";
     }
+
     if (tableName.toUpperCase().endsWith("_ACCESS")) {
       discard[18] = "client";
       discard[1] = "org";
@@ -1689,10 +1694,24 @@
     if (parentsFieldsData.length > 0) {
 
       xmlDocument.setParameter("keyParent", parentsFieldsData[0].name);
+      xmlDocument.setParameter("keyParentColName",
+          "Y".equals(parentsFieldsData[0].issecondarykey) ? "arentId" : parentsFieldsData[0].name);
+
       xmlDocument.setParameter("keyParentSimple", WadUtility.columnName(parentsFieldsData[0].name,
           parentsFieldsData[0].tablemodule, parentsFieldsData[0].columnmodule));
       xmlDocument.setParameter("keyParentT", Sqlc
           .TransformaNombreColumna(parentsFieldsData[0].name));
+
+      String keyTabName;
+      if ("Y".equals(parentsFieldsData[0].issecondarykey)) {
+        keyTabName = parentsFieldsData[0].tablename + "_ID";
+      } else {
+        keyTabName = parentsFieldsData[0].name;
+      }
+
+      xmlDocument.setParameter("keyParentTabINP", Sqlc.TransformaNombreColumna(WadUtility
+          .columnName(keyTabName, parentsFieldsData[0].tablemodule,
+              parentsFieldsData[0].columnmodule)));
       xmlDocument.setParameter("keyParentINP", Sqlc.TransformaNombreColumna(WadUtility.columnName(
           parentsFieldsData[0].name, parentsFieldsData[0].tablemodule,
           parentsFieldsData[0].columnmodule)));
@@ -2441,10 +2460,14 @@
       throws ServletException, IOException {
     log4j.debug("Procesig xsql: " + strTab + ", " + tabName);
     XmlDocument xmlDocumentXsql;
-    final String[] discard = { "", "", "", "", "", "", "", "", "", "" };
-
-    if (parentsFieldsData == null || parentsFieldsData.length == 0)
+    final String[] discard = { "", "", "", "", "", "", "", "", "", "", "" };
+
+    if (parentsFieldsData == null || parentsFieldsData.length == 0) {
       discard[0] = "parent"; // remove the parent tags
+    } else if (!"Y".equals(parentsFieldsData[0].issecondarykey)) {
+      discard[10] = "parentSecondaryKey";
+    }
+
     if (tableName.toUpperCase().endsWith("_ACCESS")) {
       discard[6] = "client";
       discard[1] = "org";
@@ -2557,6 +2580,12 @@
       for (int s = 0; s < vecParameters.size(); s++) {
         fieldsParent[0].whereclause += vecParameters.elementAt(s).toString() + "\n";
       }
+
+      if ("Y".equals(parentsFieldsData[0].issecondarykey)) {
+        xmlDocumentXsql.setParameter("parentTableName", parentsFieldsData[0].tablename);
+        xmlDocumentXsql.setParameter("keySecondary", parentsFieldsData[0].name);
+      }
+
       xmlDocumentXsql.setData("structure14", fieldsParent);
     } else {
       xmlDocumentXsql.setData("structure14", null);
@@ -3807,11 +3836,9 @@
 
         strFieldGroup = auxControl.getData("AD_FieldGroup_ID");
         html.append("      <tr><td colspan=\"4\">\n");
-        html
-            .append("      <table border=0 cellspacing=0 cellpadding=0 class=\"FieldGroup\" id=\"fldgrp"
-                + strFieldGroup + "\"><tr class=\"FieldGroup_TopMargin\"></tr>\n<tr>\n");
-        html
-            .append("<td class=\"FieldGroupTitle_Left\"><img src=\"../../../../../web/images/blank.gif\" class=\"FieldGroupTitle_Left_bg\" border=0/></td>");
+        html.append("      <table border=0 cellspacing=0 cellpadding=0 class=\"FieldGroup\" id=\"fldgrp"
+            + strFieldGroup + "\"><tr class=\"FieldGroup_TopMargin\"></tr>\n<tr>\n");
+        html.append("<td class=\"FieldGroupTitle_Left\"><img src=\"../../../../../web/images/blank.gif\" class=\"FieldGroupTitle_Left_bg\" border=0/></td>");
         String strText = "";
         strText = EditionFieldsData.fieldGroupName(pool, strFieldGroup);
 
@@ -3826,10 +3853,8 @@
         final String labelText = fieldGroupLabelBuilder.getBasicLabelText();
 
         html.append("<td class=\"FieldGroupTitle\">").append(labelText).append("</td>");
-        html
-            .append("<td class=\"FieldGroupTitle_Right\"><img src=\"../../../../../web/images/blank.gif\" class=\"FieldGroupTitle_Right_bg\" border=0/></td>");
-        html
-            .append("<td class=\"FieldGroupContent\">&nbsp;</td></tr>\n<tr class=\"FieldGroup_BottomMargin\"></tr></table>");
+        html.append("<td class=\"FieldGroupTitle_Right\"><img src=\"../../../../../web/images/blank.gif\" class=\"FieldGroupTitle_Right_bg\" border=0/></td>");
+        html.append("<td class=\"FieldGroupContent\">&nbsp;</td></tr>\n<tr class=\"FieldGroup_BottomMargin\"></tr></table>");
         html.append("      </td></tr>\n");
 
       }
--- a/src-wad/src/org/openbravo/wad/WadActionButton.java	Wed Jun 15 07:49:58 2011 +0200
+++ b/src-wad/src/org/openbravo/wad/WadActionButton.java	Tue Jun 21 09:25:30 2011 +0200
@@ -336,8 +336,8 @@
     String processId = fd.adProcessId;
     final StringBuffer html = new StringBuffer();
     if (fd.columnname.equalsIgnoreCase("DocAction")) {
-      html.append("String strdocstatus = vars.getSessionValue(\"button").append(processId).append(
-          ".inpdocstatus\");\n");
+      html.append("String strdocstatus = vars.getSessionValue(\"button").append(processId)
+          .append(".inpdocstatus\");\n");
       vecFields.addElement("strdocstatus");
       vecTotalFields.addElement("DocStatus");
       html.append("String stradTableId = \"" + fd.adTableId + "\";\n");
@@ -366,11 +366,11 @@
     String processId = fd.adProcessId;
     final StringBuffer result = new StringBuffer();
     if (fd.columnname.equalsIgnoreCase("DocAction")) {
-      result.append("vars.setSessionValue(\"button").append(processId).append(
-          ".inpdocstatus\", vars.getRequiredStringParameter(\"inpdocstatus\"));\n");
+      result.append("vars.setSessionValue(\"button").append(processId)
+          .append(".inpdocstatus\", vars.getRequiredStringParameter(\"inpdocstatus\"));\n");
     } else if (fd.columnname.equalsIgnoreCase("ChangeProjectStatus")) {
-      result.append("vars.setSessionValue(\"button").append(processId).append(
-          ".inpprojectstatus\", vars.getRequiredStringParameter(\"inpprojectstatus\"));\n");
+      result.append("vars.setSessionValue(\"button").append(processId)
+          .append(".inpprojectstatus\", vars.getRequiredStringParameter(\"inpprojectstatus\"));\n");
     }
     return result.toString();
   }
@@ -458,18 +458,19 @@
 
             html.append("Utility.getContext(this, vars, \"#User_Client\", \"\"), 0");
             html.append(");\n");
-            html.append("    Utility.fillSQLParameters(this, vars, ").append(
-                genericActionButton ? "null" : "(FieldProvider) vars.getSessionObject(\"button"
-                    + processId + ".originalParams\")").append(", comboTableData, \"\", ").append(
-                strDefault).append(");\n");
+            html.append("    Utility.fillSQLParameters(this, vars, ")
+                .append(
+                    genericActionButton ? "null" : "(FieldProvider) vars.getSessionObject(\"button"
+                        + processId + ".originalParams\")").append(", comboTableData, \"\", ")
+                .append(strDefault).append(");\n");
             html.append("    xmlDocument.setData(\"report");
             // html.append(Sqlc.TransformaNombreColumna(data[i].columnname));
             html.append(data[i].columnname);
             html.append("\", \"liststructure\", comboTableData.select(false));\n");
             html.append("comboTableData = null;\n");
           } else if (data[i].adReferenceId.equals("15")) {
-            html.append("    xmlDocument.setParameter(\"").append(data[i].columnname).append(
-                "_Format\", vars.getSessionValue(\"#AD_SqlDateFormat\"));\n");
+            html.append("    xmlDocument.setParameter(\"").append(data[i].columnname)
+                .append("_Format\", vars.getSessionValue(\"#AD_SqlDateFormat\"));\n");
           } else if (data[i].adReferenceId.equals("30") || data[i].adReferenceId.equals("35")
               || data[i].adReferenceId.equals("25") || data[i].adReferenceId.equals("31")
               || data[i].adReferenceId.equals("800011")) {
@@ -482,11 +483,10 @@
               html.append("Data.selectActDef");