Merge with 0d1776ed454ab63056c4fc6f0538c773bc502dbc

db/ddlutils/oracle/views/AD_FIELD_V.sql

@@ -16,7 +16,9 @@ CREATE OR REPLACE VIEW AD_FIELD_V AS
  fg.NAME AS FieldGroup, vr.Code AS ValidationCode,
  f.Included_Tab_ID, fg.FieldGroupType, fg.IsCollapsedByDefault,
  COALESCE(f.InfoFactoryClass, c.InfoFactoryClass) as InfoFactoryClass,
- c.IsAutocomplete, COALESCE(f.IsAllowCopy, c.IsAllowCopy) AS IsAllowCopy
+ c.IsAutocomplete, COALESCE(f.IsAllowCopy, c.IsAllowCopy) AS IsAllowCopy,
+	f.isdisplayedgrid, 
+	f.seqnogrid
 FROM AD_FIELD f 
   INNER JOIN AD_TAB t ON (f.AD_Tab_ID = t.AD_Tab_ID)
   LEFT OUTER JOIN AD_FIELDGROUP fg ON (f.AD_FieldGroup_ID = fg.AD_FieldGroup_ID) 

db/ddlutils/oracle/views/AD_FIELD_VT.sql

@@ -15,7 +15,9 @@ CREATE OR REPLACE VIEW AD_FIELD_VT AS
    fgt.NAME AS FieldGroup, vr.Code AS ValidationCode,
    f.Included_Tab_ID, fg.FieldGroupType, fg.IsCollapsedByDefault,
    COALESCE(f.InfoFactoryClass, c.InfoFactoryClass) as InfoFactoryClass,
-   c.IsAutocomplete, COALESCE(f.IsAllowCopy, c.IsAllowCopy) AS IsAllowCopy
+   c.IsAutocomplete, COALESCE(f.IsAllowCopy, c.IsAllowCopy) AS IsAllowCopy,
+	f.isdisplayedgrid, 
+	f.seqnogrid
   FROM AD_FIELD f 
    INNER JOIN AD_FIELD_TRL trl ON (f.AD_Field_ID = trl.AD_Field_ID)
     INNER JOIN AD_TAB t ON (f.AD_Tab_ID = t.AD_Tab_ID)

db/ddlutils/postgresql/views/AD_FIELD_V.sql

@@ -12,7 +12,9 @@ CREATE OR REPLACE VIEW ad_field_v AS
  c.isencrypted AS isencryptedcolumn, c.isselectioncolumn, tbl.tablename, c.valuemin, c.valuemax, 
  fg.name AS fieldgroup, vr.code AS validationcode, f.included_tab_id, fg.fieldgrouptype, fg.iscollapsedbydefault, 
  COALESCE(f.infofactoryclass, c.infofactoryclass) AS infofactoryclass, c.isautocomplete,
- COALESCE(f.IsAllowCopy, c.IsAllowCopy) AS IsAllowCopy
+ COALESCE(f.IsAllowCopy, c.IsAllowCopy) AS IsAllowCopy,
+	f.isdisplayedgrid, 
+	f.seqnogrid
    FROM ad_field f
    JOIN ad_tab t ON f.ad_tab_id = t.ad_tab_id
    LEFT JOIN ad_fieldgroup fg ON f.ad_fieldgroup_id = fg.ad_fieldgroup_id

db/ddlutils/postgresql/views/AD_FIELD_VT.sql

@@ -7,7 +7,9 @@ CREATE OR REPLACE VIEW ad_field_vt AS
  COALESCE(f.ad_val_rule_id, c.ad_val_rule_id) AS ad_val_rule_id, c.ad_process_id, c.isalwaysupdateable, c.readonlylogic, c.mandatorylogic, c.isupdateable, 
  c.isencrypted AS isencryptedcolumn, c.isselectioncolumn, tbl.tablename, c.valuemin, c.valuemax, fgt.name AS fieldgroup, vr.code AS validationcode, 
  f.included_tab_id, fg.fieldgrouptype, fg.iscollapsedbydefault, COALESCE(f.infofactoryclass, c.infofactoryclass) AS infofactoryclass, c.isautocomplete,
- COALESCE(f.IsAllowCopy, c.IsAllowCopy) AS IsAllowCopy
+ COALESCE(f.IsAllowCopy, c.IsAllowCopy) AS IsAllowCopy,
+	f.isdisplayedgrid, 
+	f.seqnogrid
    FROM ad_field f
    JOIN ad_field_trl trl ON f.ad_field_id = trl.ad_field_id
    JOIN ad_tab t ON f.ad_tab_id = t.ad_tab_id

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java

@@ -1271,6 +1271,8 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
         //Deepak-Enabling customize button IDEMPIERE-364
         if(!(curTabpanel instanceof ADSortTab))
         	toolbar.enableCustomize(((ADTabpanel)curTabpanel).isGridView());
+        else
+        	toolbar.enableCustomize(false);
 	}
 
 	/**
@@ -2732,8 +2734,8 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
 		GridField[] fields = tabPanel.getGridView().getFields();
 		Map<Integer, String> columnsWidth = new HashMap<Integer, String>();
 		ArrayList<Integer> gridFieldIds = new ArrayList<Integer>();
-		for (int i = 0; i < columnList.size()-1; i++) {
+		for (int i = 0; i < fields.length; i++) {
-			Column column = (Column) columnList.get(i);
+			Column column = (Column) columnList.get(i+1);
 			String width = column.getWidth(); 			
 			columnsWidth.put(fields[i].getAD_Field_ID(), width);
 			gridFieldIds.add(fields[i].getAD_Field_ID());