Related to issue 25355: Fix Dimension fields display
authorAlvaro Ferraz <alvaro.ferraz@openbravo.com>
Thu, 26 Feb 2015 18:09:18 +0100
changeset 26830 093fb9ca1c6d
parent 26829 15dbf5983411
child 26831 38c6321b2ad9
Related to issue 25355: Fix Dimension fields display

Dimension fields display in Payment In Lines and Payment Out Lines tabs will now work with Accounting Dimensions Central Maintenance.
Also, Order Payment Schedule and Invoice Payment Schedule fields navigation has been fixed.
src-db/database/sourcedata/AD_AUXILIARINPUT.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml
src-db/database/sourcedata/AD_FIELD.xml
src/org/openbravo/erpCommon/utility/ReferencedLink.java
--- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Fri Feb 13 10:20:41 2015 -0500
+++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Thu Feb 26 18:09:18 2015 +0100
@@ -2068,6 +2068,17 @@
 <!--571778C5E2AD4A13BDD7DD15A4DA470E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--571778C5E2AD4A13BDD7DD15A4DA470E--></AD_AUXILIARINPUT>
 
+<!--57C6F047656D4BB2B7D987BFA8C028B8--><AD_AUXILIARINPUT>
+<!--57C6F047656D4BB2B7D987BFA8C028B8-->  <AD_AUXILIARINPUT_ID><![CDATA[57C6F047656D4BB2B7D987BFA8C028B8]]></AD_AUXILIARINPUT_ID>
+<!--57C6F047656D4BB2B7D987BFA8C028B8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--57C6F047656D4BB2B7D987BFA8C028B8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--57C6F047656D4BB2B7D987BFA8C028B8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--57C6F047656D4BB2B7D987BFA8C028B8-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
+<!--57C6F047656D4BB2B7D987BFA8C028B8-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
+<!--57C6F047656D4BB2B7D987BFA8C028B8-->  <CODE><![CDATA[APP]]></CODE>
+<!--57C6F047656D4BB2B7D987BFA8C028B8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--57C6F047656D4BB2B7D987BFA8C028B8--></AD_AUXILIARINPUT>
+
 <!--580450E783674E3B8C03B76B49613CF2--><AD_AUXILIARINPUT>
 <!--580450E783674E3B8C03B76B49613CF2-->  <AD_AUXILIARINPUT_ID><![CDATA[580450E783674E3B8C03B76B49613CF2]]></AD_AUXILIARINPUT_ID>
 <!--580450E783674E3B8C03B76B49613CF2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2935,6 +2946,17 @@
 <!--991A2EBD0227461DA2792317D75F576F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--991A2EBD0227461DA2792317D75F576F--></AD_AUXILIARINPUT>
 
+<!--9B3FBCD97DCE4611A67532F8611161F0--><AD_AUXILIARINPUT>
+<!--9B3FBCD97DCE4611A67532F8611161F0-->  <AD_AUXILIARINPUT_ID><![CDATA[9B3FBCD97DCE4611A67532F8611161F0]]></AD_AUXILIARINPUT_ID>
+<!--9B3FBCD97DCE4611A67532F8611161F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9B3FBCD97DCE4611A67532F8611161F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9B3FBCD97DCE4611A67532F8611161F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9B3FBCD97DCE4611A67532F8611161F0-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
+<!--9B3FBCD97DCE4611A67532F8611161F0-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
+<!--9B3FBCD97DCE4611A67532F8611161F0-->  <CODE><![CDATA[ARR]]></CODE>
+<!--9B3FBCD97DCE4611A67532F8611161F0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9B3FBCD97DCE4611A67532F8611161F0--></AD_AUXILIARINPUT>
+
 <!--9B8DEEF369014E938A73D766890AE941--><AD_AUXILIARINPUT>
 <!--9B8DEEF369014E938A73D766890AE941-->  <AD_AUXILIARINPUT_ID><![CDATA[9B8DEEF369014E938A73D766890AE941]]></AD_AUXILIARINPUT_ID>
 <!--9B8DEEF369014E938A73D766890AE941-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Fri Feb 13 10:20:41 2015 -0500
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Thu Feb 26 18:09:18 2015 +0100
@@ -257115,7 +257115,6 @@
 <!--5BC978BD972A4CB9936D7B5794153BE1-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--5BC978BD972A4CB9936D7B5794153BE1-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--5BC978BD972A4CB9936D7B5794153BE1-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--5BC978BD972A4CB9936D7B5794153BE1-->  <READONLYLOGIC><![CDATA['Y' = 'Y']]></READONLYLOGIC>
 <!--5BC978BD972A4CB9936D7B5794153BE1-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--5BC978BD972A4CB9936D7B5794153BE1-->  <SEQNO><![CDATA[140]]></SEQNO>
 <!--5BC978BD972A4CB9936D7B5794153BE1-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
--- a/src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml	Fri Feb 13 10:20:41 2015 -0500
+++ b/src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml	Thu Feb 26 18:09:18 2015 +0100
@@ -312,6 +312,19 @@
 <!--095908A0A6544532B7413ACEA01E54A4-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
 <!--095908A0A6544532B7413ACEA01E54A4--></AD_DIMENSION_MAPPING>
 
+<!--09D6DC2780E44CA08C4605AE346755F6--><AD_DIMENSION_MAPPING>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <AD_DIMENSION_MAPPING_ID><![CDATA[09D6DC2780E44CA08C4605AE346755F6]]></AD_DIMENSION_MAPPING_ID>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <DIMENSION><![CDATA[U1]]></DIMENSION>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <DOCBASETYPE><![CDATA[APP]]></DOCBASETYPE>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--09D6DC2780E44CA08C4605AE346755F6-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--09D6DC2780E44CA08C4605AE346755F6--></AD_DIMENSION_MAPPING>
+
 <!--0A122FCE059342EBAE5A41CAB5AA0C1F--><AD_DIMENSION_MAPPING>
 <!--0A122FCE059342EBAE5A41CAB5AA0C1F-->  <AD_DIMENSION_MAPPING_ID><![CDATA[0A122FCE059342EBAE5A41CAB5AA0C1F]]></AD_DIMENSION_MAPPING_ID>
 <!--0A122FCE059342EBAE5A41CAB5AA0C1F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1339,6 +1352,19 @@
 <!--4A802D177AF54248B69D73492B74EEFF-->  <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
 <!--4A802D177AF54248B69D73492B74EEFF--></AD_DIMENSION_MAPPING>
 
+<!--4BD403FD08674545A2FDDEEC89C927D6--><AD_DIMENSION_MAPPING>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <AD_DIMENSION_MAPPING_ID><![CDATA[4BD403FD08674545A2FDDEEC89C927D6]]></AD_DIMENSION_MAPPING_ID>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <DIMENSION><![CDATA[CC]]></DIMENSION>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <DOCBASETYPE><![CDATA[ARR]]></DOCBASETYPE>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--4BD403FD08674545A2FDDEEC89C927D6-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--4BD403FD08674545A2FDDEEC89C927D6--></AD_DIMENSION_MAPPING>
+
 <!--4E3EED08E1F44D099C7E7D7551452AAC--><AD_DIMENSION_MAPPING>
 <!--4E3EED08E1F44D099C7E7D7551452AAC-->  <AD_DIMENSION_MAPPING_ID><![CDATA[4E3EED08E1F44D099C7E7D7551452AAC]]></AD_DIMENSION_MAPPING_ID>
 <!--4E3EED08E1F44D099C7E7D7551452AAC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1612,6 +1638,19 @@
 <!--58628F7C27B64407A6AEF11462F2CB13-->  <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
 <!--58628F7C27B64407A6AEF11462F2CB13--></AD_DIMENSION_MAPPING>
 
+<!--58B170496DCF4E979C85F35E60CB65E0--><AD_DIMENSION_MAPPING>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <AD_DIMENSION_MAPPING_ID><![CDATA[58B170496DCF4E979C85F35E60CB65E0]]></AD_DIMENSION_MAPPING_ID>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <DIMENSION><![CDATA[U2]]></DIMENSION>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <DOCBASETYPE><![CDATA[ARR]]></DOCBASETYPE>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--58B170496DCF4E979C85F35E60CB65E0-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--58B170496DCF4E979C85F35E60CB65E0--></AD_DIMENSION_MAPPING>
+
 <!--58C8138C329A4C6C97FB3118CFDA9C75--><AD_DIMENSION_MAPPING>
 <!--58C8138C329A4C6C97FB3118CFDA9C75-->  <AD_DIMENSION_MAPPING_ID><![CDATA[58C8138C329A4C6C97FB3118CFDA9C75]]></AD_DIMENSION_MAPPING_ID>
 <!--58C8138C329A4C6C97FB3118CFDA9C75-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1742,6 +1781,19 @@
 <!--5DC26CC3C7B34D9A97A6EEA3EEB18EA3-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
 <!--5DC26CC3C7B34D9A97A6EEA3EEB18EA3--></AD_DIMENSION_MAPPING>
 
+<!--5E737C153A6E4CFF8182518F6922CC51--><AD_DIMENSION_MAPPING>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <AD_DIMENSION_MAPPING_ID><![CDATA[5E737C153A6E4CFF8182518F6922CC51]]></AD_DIMENSION_MAPPING_ID>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <DIMENSION><![CDATA[U2]]></DIMENSION>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <DOCBASETYPE><![CDATA[APP]]></DOCBASETYPE>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--5E737C153A6E4CFF8182518F6922CC51-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--5E737C153A6E4CFF8182518F6922CC51--></AD_DIMENSION_MAPPING>
+
 <!--5F06327AFA8442E481CEF2853440DBB2--><AD_DIMENSION_MAPPING>
 <!--5F06327AFA8442E481CEF2853440DBB2-->  <AD_DIMENSION_MAPPING_ID><![CDATA[5F06327AFA8442E481CEF2853440DBB2]]></AD_DIMENSION_MAPPING_ID>
 <!--5F06327AFA8442E481CEF2853440DBB2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2574,6 +2626,19 @@
 <!--861BE97C472041B0BE72863348F79C13-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
 <!--861BE97C472041B0BE72863348F79C13--></AD_DIMENSION_MAPPING>
 
+<!--862D99D1B343407DA00824A10E98B46C--><AD_DIMENSION_MAPPING>
+<!--862D99D1B343407DA00824A10E98B46C-->  <AD_DIMENSION_MAPPING_ID><![CDATA[862D99D1B343407DA00824A10E98B46C]]></AD_DIMENSION_MAPPING_ID>
+<!--862D99D1B343407DA00824A10E98B46C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--862D99D1B343407DA00824A10E98B46C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--862D99D1B343407DA00824A10E98B46C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--862D99D1B343407DA00824A10E98B46C-->  <DIMENSION><![CDATA[U1]]></DIMENSION>
+<!--862D99D1B343407DA00824A10E98B46C-->  <DOCBASETYPE><![CDATA[ARR]]></DOCBASETYPE>
+<!--862D99D1B343407DA00824A10E98B46C-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--862D99D1B343407DA00824A10E98B46C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--862D99D1B343407DA00824A10E98B46C-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--862D99D1B343407DA00824A10E98B46C-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--862D99D1B343407DA00824A10E98B46C--></AD_DIMENSION_MAPPING>
+
 <!--865501E11C9A4684B82183F07808C04A--><AD_DIMENSION_MAPPING>
 <!--865501E11C9A4684B82183F07808C04A-->  <AD_DIMENSION_MAPPING_ID><![CDATA[865501E11C9A4684B82183F07808C04A]]></AD_DIMENSION_MAPPING_ID>
 <!--865501E11C9A4684B82183F07808C04A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4108,6 +4173,19 @@
 <!--D77D072E7CAF48319043169F65E4F5E1-->  <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
 <!--D77D072E7CAF48319043169F65E4F5E1--></AD_DIMENSION_MAPPING>
 
+<!--D86080B5CCC44AF4B3462C1B3AED23B1--><AD_DIMENSION_MAPPING>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <AD_DIMENSION_MAPPING_ID><![CDATA[D86080B5CCC44AF4B3462C1B3AED23B1]]></AD_DIMENSION_MAPPING_ID>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <DIMENSION><![CDATA[CC]]></DIMENSION>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <DOCBASETYPE><![CDATA[APP]]></DOCBASETYPE>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1-->  <DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--D86080B5CCC44AF4B3462C1B3AED23B1--></AD_DIMENSION_MAPPING>
+
 <!--D86A82D5233F4ABFBB41CD4BF052B6DA--><AD_DIMENSION_MAPPING>
 <!--D86A82D5233F4ABFBB41CD4BF052B6DA-->  <AD_DIMENSION_MAPPING_ID><![CDATA[D86A82D5233F4ABFBB41CD4BF052B6DA]]></AD_DIMENSION_MAPPING_ID>
 <!--D86A82D5233F4ABFBB41CD4BF052B6DA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Fri Feb 13 10:20:41 2015 -0500
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Thu Feb 26 18:09:18 2015 +0100
@@ -180129,7 +180129,9 @@
 <!--0654DFBA5DAB463499127DB1AA43C856-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
 <!--0654DFBA5DAB463499127DB1AA43C856-->  <AD_COLUMN_ID><![CDATA[2C18C72E50CB499BB466F65C2E06F66D]]></AD_COLUMN_ID>
 <!--0654DFBA5DAB463499127DB1AA43C856-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--0654DFBA5DAB463499127DB1AA43C856-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <DISPLAYLOGIC><![CDATA[@$Element_MC@='Y']]></DISPLAYLOGIC>
 <!--0654DFBA5DAB463499127DB1AA43C856-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--0654DFBA5DAB463499127DB1AA43C856-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--0654DFBA5DAB463499127DB1AA43C856-->  <SEQNO><![CDATA[120]]></SEQNO>
@@ -180139,7 +180141,7 @@
 <!--0654DFBA5DAB463499127DB1AA43C856-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--0654DFBA5DAB463499127DB1AA43C856-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--0654DFBA5DAB463499127DB1AA43C856-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--0654DFBA5DAB463499127DB1AA43C856-->  <GRID_SEQNO><![CDATA[12]]></GRID_SEQNO>
+<!--0654DFBA5DAB463499127DB1AA43C856-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
 <!--0654DFBA5DAB463499127DB1AA43C856-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--0654DFBA5DAB463499127DB1AA43C856-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--0654DFBA5DAB463499127DB1AA43C856-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -180616,7 +180618,7 @@
 <!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <GRID_SEQNO><![CDATA[17]]></GRID_SEQNO>
+<!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
 <!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--07D37B50650B44A2A7A7D5B1BAF07E4E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -181466,7 +181468,7 @@
 <!--0AA97BC575E040EF8314AFE584112FD0-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
 <!--0AA97BC575E040EF8314AFE584112FD0-->  <AD_COLUMN_ID><![CDATA[7FF2BE0C560241FDE040007F010060C1]]></AD_COLUMN_ID>
 <!--0AA97BC575E040EF8314AFE584112FD0-->  <PROPERTY><![CDATA[orderPaymentSchedule]]></PROPERTY>
-<!--0AA97BC575E040EF8314AFE584112FD0-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
 <!--0AA97BC575E040EF8314AFE584112FD0-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--0AA97BC575E040EF8314AFE584112FD0-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
 <!--0AA97BC575E040EF8314AFE584112FD0-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
@@ -181477,7 +181479,7 @@
 <!--0AA97BC575E040EF8314AFE584112FD0-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--0AA97BC575E040EF8314AFE584112FD0-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--0AA97BC575E040EF8314AFE584112FD0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--0AA97BC575E040EF8314AFE584112FD0-->  <GRID_SEQNO><![CDATA[27]]></GRID_SEQNO>
+<!--0AA97BC575E040EF8314AFE584112FD0-->  <GRID_SEQNO><![CDATA[270]]></GRID_SEQNO>
 <!--0AA97BC575E040EF8314AFE584112FD0-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--0AA97BC575E040EF8314AFE584112FD0-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--0AA97BC575E040EF8314AFE584112FD0-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -182687,7 +182689,9 @@
 <!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
 <!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <AD_COLUMN_ID><![CDATA[A581C9F44F0B4A51963ACFEC7EECA642]]></AD_COLUMN_ID>
 <!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <DISPLAYLOGIC><![CDATA[@$Element_SR@='Y']]></DISPLAYLOGIC>
 <!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <SEQNO><![CDATA[140]]></SEQNO>
@@ -182697,7 +182701,7 @@
 <!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <GRID_SEQNO><![CDATA[14]]></GRID_SEQNO>
+<!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <GRID_SEQNO><![CDATA[140]]></GRID_SEQNO>
 <!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--0E49E537EBCF4953ABF8DCBF0C2885AA-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -185625,7 +185629,7 @@
 <!--155C0203D6974D59B54E8D1F081B47C0-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--155C0203D6974D59B54E8D1F081B47C0-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--155C0203D6974D59B54E8D1F081B47C0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--155C0203D6974D59B54E8D1F081B47C0-->  <GRID_SEQNO><![CDATA[5]]></GRID_SEQNO>
+<!--155C0203D6974D59B54E8D1F081B47C0-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
 <!--155C0203D6974D59B54E8D1F081B47C0-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--155C0203D6974D59B54E8D1F081B47C0-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--155C0203D6974D59B54E8D1F081B47C0-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -187769,6 +187773,7 @@
 <!--1A4B8B9E94B348BD9D45B50916B136D1-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--1A4B8B9E94B348BD9D45B50916B136D1-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--1A4B8B9E94B348BD9D45B50916B136D1-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <DISPLAYLOGIC><![CDATA[@$Element_AY@='Y']]></DISPLAYLOGIC>
 <!--1A4B8B9E94B348BD9D45B50916B136D1-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--1A4B8B9E94B348BD9D45B50916B136D1-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--1A4B8B9E94B348BD9D45B50916B136D1-->  <SEQNO><![CDATA[100]]></SEQNO>
@@ -187778,7 +187783,7 @@
 <!--1A4B8B9E94B348BD9D45B50916B136D1-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--1A4B8B9E94B348BD9D45B50916B136D1-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1A4B8B9E94B348BD9D45B50916B136D1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
+<!--1A4B8B9E94B348BD9D45B50916B136D1-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
 <!--1A4B8B9E94B348BD9D45B50916B136D1-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--1A4B8B9E94B348BD9D45B50916B136D1-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--1A4B8B9E94B348BD9D45B50916B136D1-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -188535,7 +188540,7 @@
 <!--1C2F424FD31742C48557D2DAB13C62F8-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--1C2F424FD31742C48557D2DAB13C62F8-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--1C2F424FD31742C48557D2DAB13C62F8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1C2F424FD31742C48557D2DAB13C62F8-->  <GRID_SEQNO><![CDATA[8]]></GRID_SEQNO>
+<!--1C2F424FD31742C48557D2DAB13C62F8-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
 <!--1C2F424FD31742C48557D2DAB13C62F8-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--1C2F424FD31742C48557D2DAB13C62F8-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--1C2F424FD31742C48557D2DAB13C62F8-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -197945,7 +197950,7 @@
 <!--34E0280E1EA348DE8BC1CEEFD0508424-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--34E0280E1EA348DE8BC1CEEFD0508424-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--34E0280E1EA348DE8BC1CEEFD0508424-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <GRID_SEQNO><![CDATA[1]]></GRID_SEQNO>
+<!--34E0280E1EA348DE8BC1CEEFD0508424-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
 <!--34E0280E1EA348DE8BC1CEEFD0508424-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--34E0280E1EA348DE8BC1CEEFD0508424-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--34E0280E1EA348DE8BC1CEEFD0508424-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -202997,7 +203002,9 @@
 <!--42A9B6EF19F84243B9D4C025EF25CA19-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
 <!--42A9B6EF19F84243B9D4C025EF25CA19-->  <AD_COLUMN_ID><![CDATA[2C18C72E50CB499BB466F65C2E06F66D]]></AD_COLUMN_ID>
 <!--42A9B6EF19F84243B9D4C025EF25CA19-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--42A9B6EF19F84243B9D4C025EF25CA19-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <DISPLAYLOGIC><![CDATA[@$Element_MC@='Y']]></DISPLAYLOGIC>
 <!--42A9B6EF19F84243B9D4C025EF25CA19-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--42A9B6EF19F84243B9D4C025EF25CA19-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--42A9B6EF19F84243B9D4C025EF25CA19-->  <SEQNO><![CDATA[120]]></SEQNO>
@@ -203007,7 +203014,7 @@
 <!--42A9B6EF19F84243B9D4C025EF25CA19-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--42A9B6EF19F84243B9D4C025EF25CA19-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--42A9B6EF19F84243B9D4C025EF25CA19-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <GRID_SEQNO><![CDATA[12]]></GRID_SEQNO>
+<!--42A9B6EF19F84243B9D4C025EF25CA19-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
 <!--42A9B6EF19F84243B9D4C025EF25CA19-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--42A9B6EF19F84243B9D4C025EF25CA19-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--42A9B6EF19F84243B9D4C025EF25CA19-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -206337,7 +206344,7 @@
 <!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <GRID_SEQNO><![CDATA[4]]></GRID_SEQNO>
+<!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
 <!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--4C88FF39C98C4704B2A57A8D01C55DF8-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -206588,7 +206595,7 @@
 <!--4D7210CF7CDC46278CCD3E6C34590D52-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4D7210CF7CDC46278CCD3E6C34590D52-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4D7210CF7CDC46278CCD3E6C34590D52-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <GRID_SEQNO><![CDATA[37]]></GRID_SEQNO>
+<!--4D7210CF7CDC46278CCD3E6C34590D52-->  <GRID_SEQNO><![CDATA[370]]></GRID_SEQNO>
 <!--4D7210CF7CDC46278CCD3E6C34590D52-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--4D7210CF7CDC46278CCD3E6C34590D52-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--4D7210CF7CDC46278CCD3E6C34590D52-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -206732,7 +206739,7 @@
 <!--4DD2289423954DDE95FF74BF3EAB2E46-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--4DD2289423954DDE95FF74BF3EAB2E46-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4DD2289423954DDE95FF74BF3EAB2E46-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <GRID_SEQNO><![CDATA[16]]></GRID_SEQNO>
+<!--4DD2289423954DDE95FF74BF3EAB2E46-->  <GRID_SEQNO><![CDATA[160]]></GRID_SEQNO>
 <!--4DD2289423954DDE95FF74BF3EAB2E46-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--4DD2289423954DDE95FF74BF3EAB2E46-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--4DD2289423954DDE95FF74BF3EAB2E46-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -210059,6 +210066,7 @@
 <!--531E438D61704C03AE3E5AC156E46287-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
 <!--531E438D61704C03AE3E5AC156E46287-->  <AD_COLUMN_ID><![CDATA[7C8B0463053745C6B5408D804C1646C9]]></AD_COLUMN_ID>
 <!--531E438D61704C03AE3E5AC156E46287-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--531E438D61704C03AE3E5AC156E46287-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--531E438D61704C03AE3E5AC156E46287-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--531E438D61704C03AE3E5AC156E46287-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
 <!--531E438D61704C03AE3E5AC156E46287-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
@@ -210070,7 +210078,7 @@
 <!--531E438D61704C03AE3E5AC156E46287-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--531E438D61704C03AE3E5AC156E46287-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--531E438D61704C03AE3E5AC156E46287-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--531E438D61704C03AE3E5AC156E46287-->  <GRID_SEQNO><![CDATA[13]]></GRID_SEQNO>
+<!--531E438D61704C03AE3E5AC156E46287-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
 <!--531E438D61704C03AE3E5AC156E46287-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--531E438D61704C03AE3E5AC156E46287-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--531E438D61704C03AE3E5AC156E46287-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -217820,7 +217828,7 @@
 <!--598F8411C8174E1DAA072C3194A2350E-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--598F8411C8174E1DAA072C3194A2350E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--598F8411C8174E1DAA072C3194A2350E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--598F8411C8174E1DAA072C3194A2350E-->  <GRID_SEQNO><![CDATA[15]]></GRID_SEQNO>
+<!--598F8411C8174E1DAA072C3194A2350E-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
 <!--598F8411C8174E1DAA072C3194A2350E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--598F8411C8174E1DAA072C3194A2350E-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--598F8411C8174E1DAA072C3194A2350E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -221615,7 +221623,7 @@
 <!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <GRID_SEQNO><![CDATA[4]]></GRID_SEQNO>
+<!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
 <!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--5DD7287D8AFF4B7AABD6963C91FBF0C2-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -223406,6 +223414,7 @@
 <!--6175F26324464D34B930A648822F83E7-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
 <!--6175F26324464D34B930A648822F83E7-->  <AD_COLUMN_ID><![CDATA[5837FEED4CE74D7F859166E5EC158BED]]></AD_COLUMN_ID>
 <!--6175F26324464D34B930A648822F83E7-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--6175F26324464D34B930A648822F83E7-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--6175F26324464D34B930A648822F83E7-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--6175F26324464D34B930A648822F83E7-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
 <!--6175F26324464D34B930A648822F83E7-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
@@ -223417,7 +223426,7 @@
 <!--6175F26324464D34B930A648822F83E7-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--6175F26324464D34B930A648822F83E7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6175F26324464D34B930A648822F83E7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6175F26324464D34B930A648822F83E7-->  <GRID_SEQNO><![CDATA[16]]></GRID_SEQNO>
+<!--6175F26324464D34B930A648822F83E7-->  <GRID_SEQNO><![CDATA[160]]></GRID_SEQNO>
 <!--6175F26324464D34B930A648822F83E7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--6175F26324464D34B930A648822F83E7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--6175F26324464D34B930A648822F83E7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -225789,6 +225798,7 @@
 <!--6641967A77BC4962BF0433EC8B5E13A6-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--6641967A77BC4962BF0433EC8B5E13A6-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--6641967A77BC4962BF0433EC8B5E13A6-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <DISPLAYLOGIC><![CDATA[@$Element_AY@='Y']]></DISPLAYLOGIC>
 <!--6641967A77BC4962BF0433EC8B5E13A6-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--6641967A77BC4962BF0433EC8B5E13A6-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--6641967A77BC4962BF0433EC8B5E13A6-->  <SEQNO><![CDATA[100]]></SEQNO>
@@ -225798,7 +225808,7 @@
 <!--6641967A77BC4962BF0433EC8B5E13A6-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--6641967A77BC4962BF0433EC8B5E13A6-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6641967A77BC4962BF0433EC8B5E13A6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6641967A77BC4962BF0433EC8B5E13A6-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
+<!--6641967A77BC4962BF0433EC8B5E13A6-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
 <!--6641967A77BC4962BF0433EC8B5E13A6-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--6641967A77BC4962BF0433EC8B5E13A6-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--6641967A77BC4962BF0433EC8B5E13A6-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -227103,7 +227113,7 @@
 <!--6A80E7A6014749B4926F6822651F1A2B-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--6A80E7A6014749B4926F6822651F1A2B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6A80E7A6014749B4926F6822651F1A2B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6A80E7A6014749B4926F6822651F1A2B-->  <GRID_SEQNO><![CDATA[2]]></GRID_SEQNO>
+<!--6A80E7A6014749B4926F6822651F1A2B-->  <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO>
 <!--6A80E7A6014749B4926F6822651F1A2B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--6A80E7A6014749B4926F6822651F1A2B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--6A80E7A6014749B4926F6822651F1A2B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -228529,6 +228539,7 @@
 <!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
 <!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <AD_COLUMN_ID><![CDATA[7B1F0700FBEC4FCCB3050AD1E750A3F6]]></AD_COLUMN_ID>
 <!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
 <!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
@@ -228540,7 +228551,7 @@
 <!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <GRID_SEQNO><![CDATA[11]]></GRID_SEQNO>
+<!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
 <!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--6E8B6D13DA0D4A38B8713062B8E0DDA9-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -245022,7 +245033,7 @@
 <!--86CCCAEE17A2407F85E9885BB571424F-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--86CCCAEE17A2407F85E9885BB571424F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--86CCCAEE17A2407F85E9885BB571424F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--86CCCAEE17A2407F85E9885BB571424F-->  <GRID_SEQNO><![CDATA[7]]></GRID_SEQNO>
+<!--86CCCAEE17A2407F85E9885BB571424F-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
 <!--86CCCAEE17A2407F85E9885BB571424F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--86CCCAEE17A2407F85E9885BB571424F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--86CCCAEE17A2407F85E9885BB571424F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -246533,7 +246544,7 @@
 <!--888E6479171749F791296171121F974E-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--888E6479171749F791296171121F974E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--888E6479171749F791296171121F974E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--888E6479171749F791296171121F974E-->  <GRID_SEQNO><![CDATA[8]]></GRID_SEQNO>
+<!--888E6479171749F791296171121F974E-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
 <!--888E6479171749F791296171121F974E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--888E6479171749F791296171121F974E-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--888E6479171749F791296171121F974E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -253162,7 +253173,7 @@
 <!--967489DF64CB47BF96F571C3EA28A236-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--967489DF64CB47BF96F571C3EA28A236-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--967489DF64CB47BF96F571C3EA28A236-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--967489DF64CB47BF96F571C3EA28A236-->  <GRID_SEQNO><![CDATA[27]]></GRID_SEQNO>
+<!--967489DF64CB47BF96F571C3EA28A236-->  <GRID_SEQNO><![CDATA[270]]></GRID_SEQNO>
 <!--967489DF64CB47BF96F571C3EA28A236-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--967489DF64CB47BF96F571C3EA28A236-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--967489DF64CB47BF96F571C3EA28A236-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -253437,7 +253448,7 @@
 <!--97121CB0AC4740328AAB8B6CE2BC6794-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--97121CB0AC4740328AAB8B6CE2BC6794-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--97121CB0AC4740328AAB8B6CE2BC6794-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <GRID_SEQNO><![CDATA[6]]></GRID_SEQNO>
+<!--97121CB0AC4740328AAB8B6CE2BC6794-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
 <!--97121CB0AC4740328AAB8B6CE2BC6794-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--97121CB0AC4740328AAB8B6CE2BC6794-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--97121CB0AC4740328AAB8B6CE2BC6794-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -253521,7 +253532,7 @@
 <!--9722B8A10DCA4CF5AED5779B782113FC-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--9722B8A10DCA4CF5AED5779B782113FC-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--9722B8A10DCA4CF5AED5779B782113FC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--9722B8A10DCA4CF5AED5779B782113FC-->  <GRID_SEQNO><![CDATA[2]]></GRID_SEQNO>
+<!--9722B8A10DCA4CF5AED5779B782113FC-->  <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO>
 <!--9722B8A10DCA4CF5AED5779B782113FC-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--9722B8A10DCA4CF5AED5779B782113FC-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--9722B8A10DCA4CF5AED5779B782113FC-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -253894,7 +253905,7 @@
 <!--98A79DD714E94F1692C54DD0D6423107-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--98A79DD714E94F1692C54DD0D6423107-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--98A79DD714E94F1692C54DD0D6423107-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--98A79DD714E94F1692C54DD0D6423107-->  <GRID_SEQNO><![CDATA[9]]></GRID_SEQNO>
+<!--98A79DD714E94F1692C54DD0D6423107-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
 <!--98A79DD714E94F1692C54DD0D6423107-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--98A79DD714E94F1692C54DD0D6423107-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
 <!--98A79DD714E94F1692C54DD0D6423107-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -256208,7 +256219,7 @@
 <!--9E5508C17547495AA904EE61BEF0F2CF-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--9E5508C17547495AA904EE61BEF0F2CF-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--9E5508C17547495AA904EE61BEF0F2CF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--9E5508C17547495AA904EE61BEF0F2CF-->  <GRID_SEQNO><![CDATA[1]]></GRID_SEQNO>
+<!--9E5508C17547495AA904EE61BEF0F2CF-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
 <!--9E5508C17547495AA904EE61BEF0F2CF-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--9E5508C17547495AA904EE61BEF0F2CF-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--9E5508C17547495AA904EE61BEF0F2CF-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -257851,7 +257862,7 @@
 <!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <GRID_SEQNO><![CDATA[6]]></GRID_SEQNO>
+<!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
 <!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--A25B94CDDAE74D1BB18F29B4BAFB4741-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -260278,6 +260289,7 @@
 <!--A9AA1AAD978D44A1B10C2117E1232609-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
 <!--A9AA1AAD978D44A1B10C2117E1232609-->  <AD_COLUMN_ID><![CDATA[594197039CB647DF9FBEC3386D5761BD]]></AD_COLUMN_ID>
 <!--A9AA1AAD978D44A1B10C2117E1232609-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--A9AA1AAD978D44A1B10C2117E1232609-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--A9AA1AAD978D44A1B10C2117E1232609-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
 <!--A9AA1AAD978D44A1B10C2117E1232609-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
@@ -260289,7 +260301,7 @@
 <!--A9AA1AAD978D44A1B10C2117E1232609-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--A9AA1AAD978D44A1B10C2117E1232609-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--A9AA1AAD978D44A1B10C2117E1232609-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--A9AA1AAD978D44A1B10C2117E1232609-->  <GRID_SEQNO><![CDATA[17]]></GRID_SEQNO>
+<!--A9AA1AAD978D44A1B10C2117E1232609-->  <GRID_SEQNO><![CDATA[170]]></GRID_SEQNO>
 <!--A9AA1AAD978D44A1B10C2117E1232609-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--A9AA1AAD978D44A1B10C2117E1232609-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--A9AA1AAD978D44A1B10C2117E1232609-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -272984,6 +272996,7 @@
 <!--B7462CA219BE4EFA9352029710EE9FDD-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
 <!--B7462CA219BE4EFA9352029710EE9FDD-->  <AD_COLUMN_ID><![CDATA[7B1F0700FBEC4FCCB3050AD1E750A3F6]]></AD_COLUMN_ID>
 <!--B7462CA219BE4EFA9352029710EE9FDD-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--B7462CA219BE4EFA9352029710EE9FDD-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--B7462CA219BE4EFA9352029710EE9FDD-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
 <!--B7462CA219BE4EFA9352029710EE9FDD-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
@@ -272995,7 +273008,7 @@
 <!--B7462CA219BE4EFA9352029710EE9FDD-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--B7462CA219BE4EFA9352029710EE9FDD-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--B7462CA219BE4EFA9352029710EE9FDD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B7462CA219BE4EFA9352029710EE9FDD-->  <GRID_SEQNO><![CDATA[11]]></GRID_SEQNO>
+<!--B7462CA219BE4EFA9352029710EE9FDD-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
 <!--B7462CA219BE4EFA9352029710EE9FDD-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--B7462CA219BE4EFA9352029710EE9FDD-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--B7462CA219BE4EFA9352029710EE9FDD-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -276119,6 +276132,7 @@
 <!--BC5959F0B1CF447E829C54E3516DFA8C-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
 <!--BC5959F0B1CF447E829C54E3516DFA8C-->  <AD_COLUMN_ID><![CDATA[7C8B0463053745C6B5408D804C1646C9]]></AD_COLUMN_ID>
 <!--BC5959F0B1CF447E829C54E3516DFA8C-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--BC5959F0B1CF447E829C54E3516DFA8C-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--BC5959F0B1CF447E829C54E3516DFA8C-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
 <!--BC5959F0B1CF447E829C54E3516DFA8C-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
@@ -276130,7 +276144,7 @@
 <!--BC5959F0B1CF447E829C54E3516DFA8C-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--BC5959F0B1CF447E829C54E3516DFA8C-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--BC5959F0B1CF447E829C54E3516DFA8C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <GRID_SEQNO><![CDATA[13]]></GRID_SEQNO>
+<!--BC5959F0B1CF447E829C54E3516DFA8C-->  <GRID_SEQNO><![CDATA[130]]></GRID_SEQNO>
 <!--BC5959F0B1CF447E829C54E3516DFA8C-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--BC5959F0B1CF447E829C54E3516DFA8C-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--BC5959F0B1CF447E829C54E3516DFA8C-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -284279,7 +284293,7 @@
 <!--CD95FF6ECD014CCC88CC73EB828D7336-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--CD95FF6ECD014CCC88CC73EB828D7336-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--CD95FF6ECD014CCC88CC73EB828D7336-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <GRID_SEQNO><![CDATA[3]]></GRID_SEQNO>
+<!--CD95FF6ECD014CCC88CC73EB828D7336-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
 <!--CD95FF6ECD014CCC88CC73EB828D7336-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--CD95FF6ECD014CCC88CC73EB828D7336-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--CD95FF6ECD014CCC88CC73EB828D7336-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -288522,7 +288536,7 @@
 <!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <GRID_SEQNO><![CDATA[9]]></GRID_SEQNO>
+<!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
 <!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
 <!--D5C575CCCAFC4C62B5FA64938B0FB5C8-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -296520,7 +296534,9 @@
 <!--E54C6EB9DE884D5A9779012F3CBBE674-->  <AD_TAB_ID><![CDATA[34DA12C2E9E3424E9A853563BEFDE81F]]></AD_TAB_ID>
 <!--E54C6EB9DE884D5A9779012F3CBBE674-->  <AD_COLUMN_ID><![CDATA[A581C9F44F0B4A51963ACFEC7EECA642]]></AD_COLUMN_ID>
 <!--E54C6EB9DE884D5A9779012F3CBBE674-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--E54C6EB9DE884D5A9779012F3CBBE674-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <DISPLAYLOGIC><![CDATA[@$Element_SR@='Y']]></DISPLAYLOGIC>
 <!--E54C6EB9DE884D5A9779012F3CBBE674-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--E54C6EB9DE884D5A9779012F3CBBE674-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--E54C6EB9DE884D5A9779012F3CBBE674-->  <SEQNO><![CDATA[140]]></SEQNO>
@@ -296530,7 +296546,7 @@
 <!--E54C6EB9DE884D5A9779012F3CBBE674-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--E54C6EB9DE884D5A9779012F3CBBE674-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--E54C6EB9DE884D5A9779012F3CBBE674-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <GRID_SEQNO><![CDATA[14]]></GRID_SEQNO>
+<!--E54C6EB9DE884D5A9779012F3CBBE674-->  <GRID_SEQNO><![CDATA[140]]></GRID_SEQNO>
 <!--E54C6EB9DE884D5A9779012F3CBBE674-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--E54C6EB9DE884D5A9779012F3CBBE674-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--E54C6EB9DE884D5A9779012F3CBBE674-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -297646,6 +297662,7 @@
 <!--E857B25D48604CC39BCF9530ED2A8E00-->  <AD_TAB_ID><![CDATA[809C66481863428C8D714F2018644CC6]]></AD_TAB_ID>
 <!--E857B25D48604CC39BCF9530ED2A8E00-->  <AD_COLUMN_ID><![CDATA[BB466480BFAC492AA36E5495EC72BD44]]></AD_COLUMN_ID>
 <!--E857B25D48604CC39BCF9530ED2A8E00-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--E857B25D48604CC39BCF9530ED2A8E00-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--E857B25D48604CC39BCF9530ED2A8E00-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
 <!--E857B25D48604CC39BCF9530ED2A8E00-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
@@ -297657,7 +297674,7 @@
 <!--E857B25D48604CC39BCF9530ED2A8E00-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--E857B25D48604CC39BCF9530ED2A8E00-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--E857B25D48604CC39BCF9530ED2A8E00-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--E857B25D48604CC39BCF9530ED2A8E00-->  <GRID_SEQNO><![CDATA[15]]></GRID_SEQNO>
+<!--E857B25D48604CC39BCF9530ED2A8E00-->  <GRID_SEQNO><![CDATA[150]]></GRID_SEQNO>
 <!--E857B25D48604CC39BCF9530ED2A8E00-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--E857B25D48604CC39BCF9530ED2A8E00-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--E857B25D48604CC39BCF9530ED2A8E00-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -298552,7 +298569,7 @@
 <!--EB1ABC95FEFA4F499384EA5421CF8844-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--EB1ABC95FEFA4F499384EA5421CF8844-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--EB1ABC95FEFA4F499384EA5421CF8844-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <GRID_SEQNO><![CDATA[3]]></GRID_SEQNO>
+<!--EB1ABC95FEFA4F499384EA5421CF8844-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
 <!--EB1ABC95FEFA4F499384EA5421CF8844-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--EB1ABC95FEFA4F499384EA5421CF8844-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--EB1ABC95FEFA4F499384EA5421CF8844-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -301829,7 +301846,7 @@
 <!--F492C58D6C10449E8A98A09B21F6046A-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--F492C58D6C10449E8A98A09B21F6046A-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--F492C58D6C10449E8A98A09B21F6046A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--F492C58D6C10449E8A98A09B21F6046A-->  <GRID_SEQNO><![CDATA[37]]></GRID_SEQNO>
+<!--F492C58D6C10449E8A98A09B21F6046A-->  <GRID_SEQNO><![CDATA[370]]></GRID_SEQNO>
 <!--F492C58D6C10449E8A98A09B21F6046A-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--F492C58D6C10449E8A98A09B21F6046A-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--F492C58D6C10449E8A98A09B21F6046A-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -303621,7 +303638,7 @@
 <!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <GRID_SEQNO><![CDATA[7]]></GRID_SEQNO>
+<!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
 <!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--F9AF6EB2AEBA4B588C39A8CB68E2795D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -306159,7 +306176,7 @@
 <!--FF24A0DF410D42DBA62154C68AC78CF3-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--FF24A0DF410D42DBA62154C68AC78CF3-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--FF24A0DF410D42DBA62154C68AC78CF3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <GRID_SEQNO><![CDATA[5]]></GRID_SEQNO>
+<!--FF24A0DF410D42DBA62154C68AC78CF3-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
 <!--FF24A0DF410D42DBA62154C68AC78CF3-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--FF24A0DF410D42DBA62154C68AC78CF3-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--FF24A0DF410D42DBA62154C68AC78CF3-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
--- a/src/org/openbravo/erpCommon/utility/ReferencedLink.java	Fri Feb 13 10:20:41 2015 -0500
+++ b/src/org/openbravo/erpCommon/utility/ReferencedLink.java	Thu Feb 26 18:09:18 2015 +0100
@@ -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) 2001-2011 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2015 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -43,6 +43,7 @@
 import org.openbravo.model.ad.system.Language;
 import org.openbravo.model.ad.ui.Tab;
 import org.openbravo.model.ad.ui.WindowTrl;
+import org.openbravo.model.financialmgmt.payment.FIN_PaymentSchedule;
 import org.openbravo.model.project.Project;
 
 public class ReferencedLink extends HttpSecureAppServlet {
@@ -232,7 +233,44 @@
           OBContext.restorePreviousMode();
         }
 
-      } else {
+      }
+
+      else if (strTableReferenceId.equals("CE9AFF5F51B846AEAB0B6CBF829092CD")
+          && (strWindowId.equals("E547CE89D4C04429B6340FFA44E70716") || strWindowId
+              .equals("6F8F913FA60F4CBD93DC1D3AA696E76E"))) {
+        // Navigate to FIN_Payment_Schedule from Payment In or Payment Out: select destination
+        // window depending on the source window
+        try {
+          OBContext.setAdminMode();
+          FIN_PaymentSchedule paymentSchedule = OBDal.getInstance().get(FIN_PaymentSchedule.class,
+              strKeyReferenceId);
+          if (paymentSchedule.getOrder() != null) {
+            // Order Payment Schedule
+            strTableReferenceId = "70E57DEA195843729FF303C9A71EBCA3";
+            if (strWindowId.equals("E547CE89D4C04429B6340FFA44E70716")) {
+              // Payment In window -> Sales Order
+              strWindowId = "143";
+            } else if (strWindowId.equals("6F8F913FA60F4CBD93DC1D3AA696E76E")) {
+              // Payment Out window -> Purchase Order
+              strWindowId = "181";
+            }
+          } else if (paymentSchedule.getInvoice() != null) {
+            // Invoice Payment Schedule
+            if (strWindowId.equals("E547CE89D4C04429B6340FFA44E70716")) {
+              // Payment In window -> Sales Invoice
+              strWindowId = "167";
+            } else if (strWindowId.equals("6F8F913FA60F4CBD93DC1D3AA696E76E")) {
+              // Payment Out window -> Purchase Invoice
+              strWindowId = "183";
+            }
+          }
+        } finally {
+          OBContext.restorePreviousMode();
+        }
+
+      }
+
+      else {
         // Standard case, select window based on table definition and isSOTrx
         ReferencedLinkData[] data = ReferencedLinkData.selectWindows(this, strTableRealReference);
         if (data == null || data.length == 0)