hg merge release-2.0 (merge release2 into development)

org.adempiere.base/src/org/compiere/model/GridField.java

@@ -423,17 +423,17 @@ public class GridField
 			|| (m_vo.ColumnName.equals("Record_ID") && m_vo.displayType == DisplayType.Button))	//  Zoom
 			return true;
 
-		//  Fields always updareable
-		if (m_vo.IsAlwaysUpdateable)      //  Zoom
-			return true;
-		
 		//  Tab or field is R/O
 		if (m_vo.tabReadOnly || m_vo.IsReadOnly)
 		{
 			if (log.isLoggable(Level.FINEST)) log.finest(m_vo.ColumnName + " NO - TabRO=" + m_vo.tabReadOnly + ", FieldRO=" + m_vo.IsReadOnly);
 			return false;
 		}
-		
+
+		//  Fields always updateable
+		if (m_vo.IsAlwaysUpdateable)      //  Zoom
+			return true;
+
 		//check tab context
 		if (checkContext && getGridTab() != null &&
 			! "Y".equals(Env.getContext(Env.getCtx(), getWindowNo(), "_QUICK_ENTRY_MODE_")))

org.adempiere.base/src/org/compiere/model/GridTab.java

@@ -113,7 +113,7 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 1583164211079643636L;
+	private static final long serialVersionUID = 1377113168185797983L;
 
 	public static final String DEFAULT_STATUS_MESSAGE = "NavigateOrUpdate";
 
@@ -210,8 +210,6 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
 
 	private DataStatusEvent m_lastDataStatusEvent;
 
-	private String m_parsedWhere;
-
 	//Contains currently selected rows
 	private ArrayList<Integer> selection = null;
 	
@@ -626,9 +624,6 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
 		if (log.isLoggable(Level.FINE)) log.fine("#" + m_vo.TabNo
 			+ " - Only Current Rows=" + onlyCurrentRows
 			+ ", Days=" + onlyCurrentDays + ", Detail=" + isDetail());
-		//	is it same query?
-		boolean refresh = m_oldQuery.equals(m_query.getWhereClause())
-			&& m_vo.onlyCurrentRows == onlyCurrentRows && m_vo.onlyCurrentDays == onlyCurrentDays;
 		m_oldQuery = m_query.getWhereClause();
 		m_vo.onlyCurrentRows = onlyCurrentRows;
 		m_vo.onlyCurrentDays = onlyCurrentDays;
@@ -670,8 +665,6 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
 				}
 
 				//	Same link value?
-				if (refresh)
-					refresh = m_linkValue.equals(value);
 				if (! m_linkValue.equals(value))
 					setQuery(null);
 				m_linkValue = value;
@@ -704,23 +697,6 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
 
 		m_extendedWhere = where.toString();
 		
-		if (m_extendedWhere.indexOf("@") > 1)
-		{
-			String s = Env.parseContext(Env.getCtx(), getWindowNo(), m_extendedWhere, false);
-			if (s != null)
-			{
-				if (!(s.equals(m_parsedWhere)))
-				{
-					refresh = false;
-				}				
-			}
-			else
-			{
-				refresh = false;
-			}
-			m_parsedWhere = s;
-		}
-
 		//	Final Query
 		if (m_query.isActive())
 		{
@@ -740,10 +716,7 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
 		if (log.isLoggable(Level.FINE)) log.fine("#" + m_vo.TabNo + " - " + where);
 		if (m_mTable.isOpen())
 		{
-			if (refresh)
+			m_mTable.dataRequery(where.toString(), m_vo.onlyCurrentRows && !isDetail(), onlyCurrentDays);
-				m_mTable.dataRefreshAll();
-			else
-				m_mTable.dataRequery(where.toString(), m_vo.onlyCurrentRows && !isDetail(), onlyCurrentDays);
 		}
 		else
 		{

org.adempiere.base/src/org/compiere/model/MUser.java

@@ -42,6 +42,7 @@ import org.compiere.util.Env;
 import org.compiere.util.Msg;
 import org.compiere.util.Secure;
 import org.compiere.util.SecureEngine;
+import org.compiere.util.Util;
 
 /**
  *  User Model
@@ -899,7 +900,7 @@ public class MUser extends X_AD_User
 			setEMailVerifyDate(null);
 
 		// IDEMPIERE-1409
-		if (getEMail() != null && (newRecord || is_ValueChanged("EMail"))) {
+		if (!Util.isEmpty(getEMail()) && (newRecord || is_ValueChanged("EMail"))) {
 			if (! EMail.validate(getEMail())) {
 				log.saveError("SaveError", Msg.getMsg(getCtx(), "InvalidEMailFormat") + Msg.getElement(getCtx(), COLUMNNAME_EMail) + " - [" + getEMail() + "]");
 				return false;

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditorPopupMenu.java

@@ -123,7 +123,7 @@ public class WEditorPopupMenu extends Menupopup implements EventListener<Event>
     		int winID = lookup.getZoom();
     		int winIDPO = lookup.getZoom(false) ;
     		Boolean canAccess = MRole.getDefault().getWindowAccess(winID);
-    		if (winID <= 0 || canAccess == null || ! canAccess) {
+    		if (winID <= 0 || canAccess == null) {
     	    	this.zoomEnabled = false;
     	    	this.newEnabled = false;
     	    	this.updateEnabled = false;