From 1e9d2ccf78f967cd3b600ffaa8cd7ea4d7c20d0b Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Sat, 24 Aug 2013 01:28:23 +0800 Subject: [PATCH 1/3] IDEMPIERE-1279 Grid column is often having default width that's too big. Workaround hflex not working correctly for first column. --- .../org/adempiere/webui/adwindow/GridView.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java index 8a374dd7e9..d50bbc809e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java @@ -425,11 +425,21 @@ public class GridView extends Vbox implements EventListener, IdSpace, IFi column.setWidth(columnWidthMap.get(gridField[i].getAD_Field_ID())); } else { if (gridField[i].getDisplayType()==DisplayType.YesNo) { - //safe to use minimum width for checkbox - column.setHflex("min"); + if (i > 0) { + column.setHflex("min"); + } else { + int estimatedWidth=60; + int headerWidth = (gridField[i].getHeader().length()+2) * 8; + if (headerWidth > estimatedWidth) + estimatedWidth = headerWidth; + column.setWidth(estimatedWidth+"px"); + } } else if (DisplayType.isNumeric(gridField[i].getDisplayType()) && "Line".equals(gridField[i].getColumnName())) { //special treatment for line - column.setHflex("min"); + if (i > 0) + column.setHflex("min"); + else + column.setWidth("60px"); } else { int estimatedWidth = 0; if (DisplayType.isNumeric(gridField[i].getDisplayType())) From 7d12418fc3d7f2935d8fd09f07e97c9daaec4367 Mon Sep 17 00:00:00 2001 From: Richard Morales Date: Fri, 23 Aug 2013 16:07:19 -0500 Subject: [PATCH 2/3] IDEMPIERE-1299 Requisition Lines can be deleted on completed Requisitions --- .../i1.0c-release/oracle/201308231451_IDEMPIERE-1299.sql | 8 ++++++++ .../postgresql/201308231451_IDEMPIERE-1299.sql | 7 +++++++ 2 files changed, 15 insertions(+) create mode 100644 migration/i1.0c-release/oracle/201308231451_IDEMPIERE-1299.sql create mode 100644 migration/i1.0c-release/postgresql/201308231451_IDEMPIERE-1299.sql diff --git a/migration/i1.0c-release/oracle/201308231451_IDEMPIERE-1299.sql b/migration/i1.0c-release/oracle/201308231451_IDEMPIERE-1299.sql new file mode 100644 index 0000000000..dcbb35112d --- /dev/null +++ b/migration/i1.0c-release/oracle/201308231451_IDEMPIERE-1299.sql @@ -0,0 +1,8 @@ +-- Aug 23, 2013 2:49:42 PM COT +-- IDEMPIERE-1299 Requisition Lines can be deleted on completed Requisitions +UPDATE AD_Tab SET ReadOnlyLogic='@Processed@=Y',Updated=TO_DATE('2013-08-23 14:49:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=642 +; + +SELECT register_migration_script('201308231451_IDEMPIERE-1299.sql') FROM dual +; + diff --git a/migration/i1.0c-release/postgresql/201308231451_IDEMPIERE-1299.sql b/migration/i1.0c-release/postgresql/201308231451_IDEMPIERE-1299.sql new file mode 100644 index 0000000000..52dd46408c --- /dev/null +++ b/migration/i1.0c-release/postgresql/201308231451_IDEMPIERE-1299.sql @@ -0,0 +1,7 @@ +-- Aug 23, 2013 2:49:42 PM COT +-- IDEMPIERE-1299 Requisition Lines can be deleted on completed Requisitions +UPDATE AD_Tab SET ReadOnlyLogic='@Processed@=Y',Updated=TO_TIMESTAMP('2013-08-23 14:49:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=642 +; + +SELECT register_migration_script('201308231451_IDEMPIERE-1299.sql') FROM dual +; From e6337d183764ae791c5f8c89a347770b9b741e19 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 23 Aug 2013 19:29:59 -0500 Subject: [PATCH 3/3] Troubleshoot 2pack for IDEMPIERE-1265 Related to IDEMPIERE-1178 2Pack was exporting wrongly AD_ReportView_ID=NULL as a zero value Also AD_Table_ID was being exported as NULL on columns --- .../src/org/adempiere/pipo2/handler/ColumnElementHandler.java | 2 +- org.adempiere.pipo/src/org/adempiere/pipo2/PoExporter.java | 2 +- .../src/org/adempiere/pipo2/ReferenceUtils.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java index 5a77931450..8a0b8da4be 100644 --- a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java +++ b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java @@ -312,7 +312,7 @@ public class ColumnElementHandler extends AbstractElementHandler { filler.add("AD_Column_ID", new AttributesImpl()); filler.addString("IsSyncDatabase", "Y", new AttributesImpl()); - filler.addTableReference("AD_Table", "TableName", new AttributesImpl()); + filler.addTableReference("AD_Table_ID", "TableName", new AttributesImpl()); filler.addTableReference("AD_Reference_Value_ID", "AD_Reference", new AttributesImpl()); excludes.add("IsSyncDatabase"); diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/PoExporter.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PoExporter.java index 558b689d0e..0c147f733c 100644 --- a/org.adempiere.pipo/src/org/adempiere/pipo2/PoExporter.java +++ b/org.adempiere.pipo/src/org/adempiere/pipo2/PoExporter.java @@ -159,7 +159,7 @@ public class PoExporter { } public void addTableReference(String columnName, String tableName, AttributesImpl atts) { - int id = po.get_Value(columnName) != null ? (Integer)po.get_Value(columnName) : 0; + int id = po.get_Value(columnName) != null ? (Integer)po.get_Value(columnName) : -1; addTableReference(columnName, tableName, id, atts); } diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/ReferenceUtils.java b/org.adempiere.pipo/src/org/adempiere/pipo2/ReferenceUtils.java index b520b02284..6fe91a5dc9 100644 --- a/org.adempiere.pipo/src/org/adempiere/pipo2/ReferenceUtils.java +++ b/org.adempiere.pipo/src/org/adempiere/pipo2/ReferenceUtils.java @@ -72,9 +72,9 @@ public class ReferenceUtils { String value = Integer.toString(id); return value; } - else if (id == 0) + else if (id <= 0) { - //no id, should never happen + //no id, -1 indicates it was read a null atts.addAttribute("", "", "reference", "CDATA", "id"); return ""; }