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

hg merge release-2.0 (merge release2 into development)

This commit is contained in:
Carlos Ruiz 2013-12-26 18:29:18 -05:00
parent 28ad6f4a0f 7f55f46569
commit bf9bc38aa1
4 changed files with 59 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
migration/i2.0/oracle/201312260552_IDEMPIERE-1644.sql Normal file
View File

@ -0,0 +1,16 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Dec 26, 2013 12:22:23 PM MYT
-- IDEMPIERE-1644 Length 22 for AD_PrintFormatItem.FormatPattern is too short
UPDATE AD_Column SET FieldLength=60,Updated=TO_DATE('2013-12-26 12:22:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=56351
;
-- Dec 26, 2013 12:22:34 PM MYT
-- IDEMPIERE-1644 Length 22 for AD_PrintFormatItem.FormatPattern is too short
ALTER TABLE AD_PrintFormatItem MODIFY FormatPattern VARCHAR2(60) DEFAULT NULL
;
SELECT register_migration_script('201312260552_IDEMPIERE-1644.sql') FROM dual
;

13
migration/i2.0/postgresql/201312260552_IDEMPIERE-1644.sql Normal file
View File

@ -0,0 +1,13 @@
-- Dec 26, 2013 12:22:23 PM MYT
-- IDEMPIERE-1644 Length 22 for AD_PrintFormatItem.FormatPattern is too short
UPDATE AD_Column SET FieldLength=60,Updated=TO_TIMESTAMP('2013-12-26 12:22:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=56351
;
-- Dec 26, 2013 12:22:34 PM MYT
-- IDEMPIERE-1644 Length 22 for AD_PrintFormatItem.FormatPattern is too short
INSERT INTO t_alter_column values('ad_printformatitem','FormatPattern','VARCHAR(60)',null,'NULL')
;
SELECT register_migration_script('201312260552_IDEMPIERE-1644.sql') FROM dual
;

2
org.adempiere.base/src/org/compiere/model/MRecentItem.java
View File

@ -280,7 +280,7 @@ public class MRecentItem extends X_AD_RecentItem
String windowName;
MWindow win = MWindow.get(getCtx(), getAD_Window_ID());
MUserDefWin userDef = MUserDefWin.getBestMatch(getCtx(), getAD_Window_ID());
if (userDef != null) {
if (userDef != null && !Util.isEmpty(userDef.getName())) {
windowName = userDef.getName();
} else {
windowName = win.get_Translation("Name");

59
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
View File

@ -26,6 +26,7 @@ import java.util.Map.Entry;
import java.util.logging.Level;
import org.adempiere.base.Core;
import org.adempiere.exceptions.AdempiereException;
import org.adempiere.webui.AdempiereIdGenerator;
import org.adempiere.webui.AdempiereWebUI;
import org.adempiere.webui.LayoutUtils;
@ -614,17 +615,14 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
if (gridTab.isTreeTab() && treePanel != null) {
int AD_Tree_ID = Env.getContextAsInt (Env.getCtx(), getWindowNo(), "AD_Tree_ID", true);
int AD_Tree_ID_Default = MTree.getDefaultAD_Tree_ID (Env.getAD_Client_ID(Env.getCtx()), gridTab.getKeyColumnName());
if (gridTab.getRecord_ID() >= 0) {
if (AD_Tree_ID != 0) {
treePanel.initTree(AD_Tree_ID, windowNo);
Events.echoEvent(ON_DEFER_SET_SELECTED_NODE, this, null);
} else if (AD_Tree_ID_Default != 0) {
treePanel.initTree(AD_Tree_ID_Default, windowNo);
Events.echoEvent(ON_DEFER_SET_SELECTED_NODE, this, null);
}
} else {
treePanel.getTree().clear();
}
if (AD_Tree_ID != 0) {
treePanel.initTree(AD_Tree_ID, windowNo);
Events.echoEvent(ON_DEFER_SET_SELECTED_NODE, this, null);
} else if (AD_Tree_ID_Default != 0) {
treePanel.initTree(AD_Tree_ID_Default, windowNo);
Events.echoEvent(ON_DEFER_SET_SELECTED_NODE, this, null);
}
}
if (!gridTab.isSingleRow() && !isGridView())
@ -1144,7 +1142,11 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
{
if (nodeID > 0 && logger.isLoggable(Level.WARNING))
logger.log(Level.WARNING, "Tab does not have ID with Node_ID=" + nodeID);
return;
if (gridTab.getCurrentRow() >= 0)
{
gridTab.setCurrentRow(gridTab.getCurrentRow(), true);
}
throw new AdempiereException(Msg.getMsg(Env.getCtx(),"RecordIsNotInCurrentSearch"));
}
// Navigate to node row
@ -1228,26 +1230,21 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
if (refresh)
{
int AD_Tree_ID = Env.getContextAsInt (Env.getCtx(), getWindowNo(), "AD_Tree_ID", true);
if (gridTab.getRecord_ID()>=0)
{
if (AD_Tree_ID != 0)
{
if (treePanel.initTree(AD_Tree_ID, windowNo))
echoDeferSetSelectedNodeEvent();
else
setSelectedNode(gridTab.getRecord_ID());
}
else
{
AD_Tree_ID = MTree.getDefaultAD_Tree_ID (Env.getAD_Client_ID(Env.getCtx()), gridTab.getKeyColumnName());
treePanel.initTree(AD_Tree_ID, windowNo);
}
}
else
{
treePanel.getTree().clear();
}
if (AD_Tree_ID != 0)
{
if (treePanel.initTree(AD_Tree_ID, windowNo))
echoDeferSetSelectedNodeEvent();
else
setSelectedNode(gridTab.getRecord_ID());
}
else
{
AD_Tree_ID = MTree.getDefaultAD_Tree_ID (Env.getAD_Client_ID(Env.getCtx()), gridTab.getKeyColumnName());
treePanel.initTree(AD_Tree_ID, windowNo);
}
}
}else if(e.isInserting() && gridTab.getRecord_ID() < 0 && gridTab.getTabLevel() > 0 )