midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hg merge release-1.0c (forward-porting)

This commit is contained in:
Carlos Ruiz 2013-08-25 12:39:35 -05:00
parent dd5f0cbd07 e6337d1837
commit b66f380ace
6 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
migration/i1.0c-release/oracle/201308231451_IDEMPIERE-1299.sql Normal file
View File

@ -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
;

7
migration/i1.0c-release/postgresql/201308231451_IDEMPIERE-1299.sql Normal file
View File

@ -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
;

2
org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java
View File

@ -312,7 +312,7 @@ public class ColumnElementHandler extends AbstractElementHandler {
filler.add("AD_Column_ID", new AttributesImpl()); filler.add("AD_Column_ID", new AttributesImpl());
filler.addString("IsSyncDatabase", "Y", 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()); filler.addTableReference("AD_Reference_Value_ID", "AD_Reference", new AttributesImpl());
excludes.add("IsSyncDatabase"); excludes.add("IsSyncDatabase");

2
org.adempiere.pipo/src/org/adempiere/pipo2/PoExporter.java
View File

@ -159,7 +159,7 @@ public class PoExporter {
} }
public void addTableReference(String columnName, String tableName, AttributesImpl atts) { 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); addTableReference(columnName, tableName, id, atts);
} }

4
org.adempiere.pipo/src/org/adempiere/pipo2/ReferenceUtils.java
View File

@ -72,9 +72,9 @@ public class ReferenceUtils {
String value = Integer.toString(id); String value = Integer.toString(id);
return value; 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"); atts.addAttribute("", "", "reference", "CDATA", "id");
return ""; return "";
} }

16
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java
View File

@ -451,11 +451,21 @@ public class GridView extends Vbox implements EventListener<Event>, IdSpace, IFi
column.setWidth(columnWidthMap.get(gridField[i].getAD_Field_ID())); column.setWidth(columnWidthMap.get(gridField[i].getAD_Field_ID()));
} else { } else {
if (gridField[i].getDisplayType()==DisplayType.YesNo) { if (gridField[i].getDisplayType()==DisplayType.YesNo) {
//safe to use minimum width for checkbox if (i > 0) {
column.setHflex("min"); 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())) { } else if (DisplayType.isNumeric(gridField[i].getDisplayType()) && "Line".equals(gridField[i].getColumnName())) {
//special treatment for line //special treatment for line
column.setHflex("min"); if (i > 0)
column.setHflex("min");
else
column.setWidth("60px");
} else { } else {
int estimatedWidth = 0; int estimatedWidth = 0;
if (DisplayType.isNumeric(gridField[i].getDisplayType())) if (DisplayType.isNumeric(gridField[i].getDisplayType()))