# HG changeset patch
# User Asier Lostalé <asier.lostale@openbravo.com>
# Date 1283844934 -7200
# Node ID a0d2411bf5af8933b242a883959feca965d01edc
# Parent  1bffa23a3517dbeb460a8e7bb734d54d986dfbb1
related to issue 14090: Active GL Journal > Header > Processing field

diff -r 1bffa23a3517 -r a0d2411bf5af src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml	Mon Sep 06 16:09:11 2010 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Tue Sep 07 09:35:34 2010 +0200
@@ -57390,7 +57390,7 @@
 <!--4723-->  <AD_FIELD_ID><![CDATA[4723]]></AD_FIELD_ID>
 <!--4723-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--4723-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--4723-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
+<!--4723-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4723-->  <NAME><![CDATA[Process Now]]></NAME>
 <!--4723-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--4723-->  <AD_TAB_ID><![CDATA[160]]></AD_TAB_ID>
# HG changeset patch
# User Asier Lostalé <asier.lostale@openbravo.com>
# Date 1283782151 -7200
# Node ID 1bffa23a3517dbeb460a8e7bb734d54d986dfbb1
# Parent  3d28f6f1ac67449d61ea40c9883624beeab8f0c5
fixed bug 14090: Do not create hidden fields if field is deactivated

diff -r 3d28f6f1ac67 -r 1bffa23a3517 src-wad/src/org/openbravo/wad/EditionFields_data.xsql
--- a/src-wad/src/org/openbravo/wad/EditionFields_data.xsql	Mon Sep 06 15:00:26 2010 +0200
+++ b/src-wad/src/org/openbravo/wad/EditionFields_data.xsql	Mon Sep 06 16:09:11 2010 +0200
@@ -56,6 +56,7 @@
       WHERE ad_field.ad_column_id = ad_column.ad_column_id 
         AND ad_field.ad_tab_id = ?
         AND ad_column.isActive = 'Y'
+        AND ad_field.isActive = 'Y'
               union 
       select null, (case when upper(columnname)='CREATED' then 10000 
                    when upper(columnname)='CREATEDBY' then 10001
@@ -112,7 +113,8 @@
                               AND momc.isdefault = 'Y'
       WHERE ad_field.ad_column_id = ad_column.ad_column_id 
         AND ad_field.displaylogic is not null 
-        AND AD_FIELD.ISDISPLAYED = 'Y' 
+        AND AD_FIELD.ISDISPLAYED = 'Y'
+        AND ad_field.isActive = 'Y' 
         AND ad_field.ad_tab_id = ?
       union
       select (case when upper(columnname)='CREATED' then 10000 
@@ -160,6 +162,7 @@
       WHERE ad_field.ad_column_id = ad_column.ad_column_id 
         AND ad_column.readonlylogic is not null 
         AND AD_FIELD.ISDISPLAYED = 'Y' 
+        AND ad_field.isActive = 'Y' 
         AND ad_field.ad_tab_id = ?
         AND ad_field.isreadonly='N'
         AND ad_column.isupdateable='Y'
@@ -259,6 +262,7 @@
         where c.isactive = 'Y'
           and f.isactive = 'Y'
           and f.isdisplayed = 'Y'
+          AND f.isActive = 'Y' 
           and c.ad_column_id = f.ad_column_id
           and f.ad_tab_id = ?
           and f.isfirstFocusedField='Y'