hg merge 7ff0a307b3ea

org.adempiere.base/src/org/compiere/util/ValueNamePair.java

@@ -83,6 +83,16 @@ public final class ValueNamePair extends NamePair
 		return false;
 	}	//	equals
 
+
+	/**
+	 * Get the Object representation of the value
+	 * @return value
+	 */
+	public Object getValueObject()
+	{
+	    return m_value;
+	}
+	
 	/**
 	 *  Return Hashcode of value
 	 *  @return hascode

org.adempiere.server-feature/feature.xml

@@ -308,4 +308,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.idempiere.webservices"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java

@@ -42,6 +42,7 @@ import org.compiere.util.Env;
 import org.compiere.util.Msg;
 import org.zkoss.zhtml.Table;
 import org.zkoss.zhtml.Td;
+import org.zkoss.zhtml.Text;
 import org.zkoss.zhtml.Tr;
 import org.zkoss.zk.au.out.AuEcho;
 import org.zkoss.zk.ui.Component;
@@ -469,9 +470,10 @@ public class ProcessDialog extends Window implements EventListener<Event>, IProc
 	
 	private void appendRecordLogInfo(ProcessInfoLog[] m_logs) {
 		if (m_logs == null)
-			return ;
+			return;
 
-		SimpleDateFormat dateFormat = DisplayType.getDateFormat(DisplayType.Date);
+		SimpleDateFormat dateFormat = DisplayType
+				.getDateFormat(DisplayType.Date);
 
 		logMessageTable = new Table();
 		logMessageTable.setId("logrecords");
@@ -482,44 +484,66 @@ public class ProcessDialog extends Window implements EventListener<Event>, IProc
 
 		this.appendChild(logMessageTable);
 
-    	for (int i = 0; i < m_logs.length; i++)
+		boolean datePresents = false;
-		{
+		boolean numberPresents = false;
+		boolean msgPresents = false;
+
+		for (ProcessInfoLog log : m_logs) {
+			if (log.getP_Date() != null)
+				datePresents = true;
+			if (log.getP_Number() != null)
+				numberPresents = true;
+			if (log.getP_Msg() != null)
+				msgPresents = true;
+		}
+
+		for (int i = 0; i < m_logs.length; i++) {
 
 			Tr tr = new Tr();
 			logMessageTable.appendChild(tr);
 
 			ProcessInfoLog log = m_logs[i];
 
-			if (log.getP_Date() != null){
+			if (datePresents) {
+				Td td = new Td();
+				if (log.getP_Date() != null) {
 					Label label = new Label(dateFormat.format(log.getP_Date()));
-				//label.setStyle("padding-right:100px");
-				Td td = new Td();
-				td = new Td();
 					td.appendChild(label);
+					// label.setStyle("padding-right:100px");
+				}
 				tr.appendChild(td);
 
 			}
 
-			if (log.getP_Number() != null){
+			if (numberPresents) {
-				Label labelPno= new Label(""+log.getP_Number());
+
 				Td td = new Td();
+				if (log.getP_Number() != null) {
+					Label labelPno = new Label("" + log.getP_Number());
 					td.appendChild(labelPno);
+				}
 				tr.appendChild(td);
 			}
 
-			A recordLink = null;
+			if (msgPresents) {
-			if (log.getP_Msg() != null){
-				recordLink = new A();
-				recordLink.setLabel(log.getP_Msg());
-
-				if (log.getAD_Table_ID() > 0 && log.getRecord_ID()> 0) {
-					recordLink.setAttribute("Record_ID", String.valueOf(log.getRecord_ID()));
-					recordLink.setAttribute("AD_Table_ID", String.valueOf(log.getAD_Table_ID()));
-					recordLink.addEventListener(Events.ON_CLICK, this);
-					
-				}
 				Td td = new Td();
+				if (log.getP_Msg() != null) {
+					if (log.getAD_Table_ID() > 0 && log.getRecord_ID() > 0) {
+						A recordLink = new A();
+						recordLink.setLabel(log.getP_Msg());
+						recordLink.setAttribute("Record_ID",
+								String.valueOf(log.getRecord_ID()));
+						recordLink.setAttribute("AD_Table_ID",
+								String.valueOf(log.getAD_Table_ID()));
+						recordLink.addEventListener(Events.ON_CLICK, this);
 						td.appendChild(recordLink);
+					} else {
+						Text t = new Text();
+						t.setEncode(false);
+						t.setValue(log.getP_Msg());
+						td.appendChild(t);
+					}
+				}
 				tr.appendChild(td);
 			}
 		}

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java

@@ -58,6 +58,7 @@ import org.compiere.util.Env;
 import org.compiere.util.Msg;
 import org.zkoss.zhtml.Table;
 import org.zkoss.zhtml.Td;
+import org.zkoss.zhtml.Text;
 import org.zkoss.zhtml.Tr;
 import org.zkoss.zk.au.out.AuEcho;
 import org.zkoss.zk.ui.event.Event;
@@ -486,6 +487,20 @@ public class WGenForm extends ADForm implements EventListener, WTableModelListen
     	
     	this.appendChild(logMessageTable);
 
+    	boolean datePresents = false;
+		boolean numberPresents = false;
+		boolean msgPresents = false;
+
+		for (ProcessInfoLog log : m_logs) {
+			if (log.getP_Date() != null)
+				datePresents = true;
+			if (log.getP_Number() != null)
+				numberPresents = true;
+			if (log.getP_Msg() != null)
+				msgPresents = true;
+		}
+
+		
     	for (int i = 0; i < m_logs.length; i++)
 		{
 		
@@ -494,36 +509,46 @@ public class WGenForm extends ADForm implements EventListener, WTableModelListen
         	
     		ProcessInfoLog log = m_logs[i];
 			
-			if (log.getP_Date() != null){
+    		if (datePresents) {
+				Td td = new Td();
+				if (log.getP_Date() != null) {
 					Label label = new Label(dateFormat.format(log.getP_Date()));
-				//label.setStyle("padding-right:100px");
-				Td td = new Td();
-				td = new Td();
 					td.appendChild(label);
+					// label.setStyle("padding-right:100px");
+				}
 				tr.appendChild(td);
 
 			}
 
-			if (log.getP_Number() != null){
+			if (numberPresents) {
-				Label labelPno= new Label(""+log.getP_Number());
+
 				Td td = new Td();
+				if (log.getP_Number() != null) {
+					Label labelPno = new Label("" + log.getP_Number());
 					td.appendChild(labelPno);
+				}
 				tr.appendChild(td);
 			}
 			
-			A recordLink = null;
+			if (msgPresents) {
-			if (log.getP_Msg() != null){
-				recordLink = new A();
-				recordLink.setLabel(log.getP_Msg());
-
-				if (log.getAD_Table_ID() > 0 && log.getRecord_ID()> 0) {
-					recordLink.setAttribute("Record_ID", String.valueOf(log.getRecord_ID()));
-					recordLink.setAttribute("AD_Table_ID", String.valueOf(log.getAD_Table_ID()));
-					recordLink.addEventListener(Events.ON_CLICK, this);
-					
-				}
 				Td td = new Td();
+				if (log.getP_Msg() != null) {
+					if (log.getAD_Table_ID() > 0 && log.getRecord_ID() > 0) {
+						A recordLink = new A();
+						recordLink.setLabel(log.getP_Msg());
+						recordLink.setAttribute("Record_ID",
+								String.valueOf(log.getRecord_ID()));
+						recordLink.setAttribute("AD_Table_ID",
+								String.valueOf(log.getAD_Table_ID()));
+						recordLink.addEventListener(Events.ON_CLICK, this);
 						td.appendChild(recordLink);
+					} else {
+						Text t = new Text();
+						t.setEncode(false);
+						t.setValue(log.getP_Msg());
+						td.appendChild(t);
+					}
+				}
 				tr.appendChild(td);
 			}
 		}