Merge f32e3a9d9afb

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

@@ -594,15 +594,11 @@ public abstract class PO
 			log.log(Level.WARNING, "Index invalid - " + index);
 			return false;
 		}
-		Object newval = m_newValues[index];		
-		if (newval == Null.NULL)
-			newval = null;
-		Object oldval = m_oldValues[index];
-		if (newval == null && oldval == null)
+		if (m_newValues[index] == null)
 			return false;
-		if (newval == null)
+		if (m_newValues[index] == Null.NULL && m_oldValues[index] == null)
 			return false;
-		return !newval.equals(oldval);
+		return !m_newValues[index].equals(m_oldValues[index]);
 	}   //  is_ValueChanged
 
 	/**

org.adempiere.ui.swing/src/org/compiere/apps/APanel.java

@@ -17,6 +17,9 @@
  *****************************************************************************/
 package org.compiere.apps;
 
+import static org.compiere.model.SystemIDs.PROCESS_AD_CHANGELOG_REDO;
+import static org.compiere.model.SystemIDs.PROCESS_AD_CHANGELOG_UNDO;
+
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Cursor;
@@ -71,7 +74,6 @@ import org.compiere.grid.ICreateFrom;
 import org.compiere.grid.RecordAccessDialog;
 import org.compiere.grid.VCreateFromFactory;
 import org.compiere.grid.VOnlyCurrentDays;
-import org.compiere.grid.VPayment;
 import org.compiere.grid.VSortTab;
 import org.compiere.grid.VTabbedPane;
 import org.compiere.grid.ed.VButton;
@@ -92,7 +94,6 @@ import org.compiere.model.MRole;
 import org.compiere.model.MToolBarButtonRestrict;
 import org.compiere.model.MUser;
 import org.compiere.model.MWindow;
-import static org.compiere.model.SystemIDs.*;
 import org.compiere.model.X_AD_ToolBarButton;
 import org.compiere.plaf.CompiereColor;
 import org.compiere.print.AReport;
@@ -2524,23 +2525,8 @@ public final class APanel extends CPanel
 		}
 
 		boolean isProcessMandatory = false;
-
-		//	Pop up Payment Rules
-		if (col.equals("PaymentRule"))
-		{
-			VPayment vp = new VPayment(m_curWindowNo, m_curTab, vButton);
-			if (vp.isInitOK())		//	may not be allowed
-				vp.setVisible(true);
-			vp.dispose();
-			if (vp.needSave())
-			{
-				cmd_save(false);
-				cmd_refresh();
-			}
-		}	//	PaymentRule
-
 		//	Pop up Document Action (Workflow)
-		else if (col.equals("DocAction"))
+		if (col.equals("DocAction"))
 		{
 			isProcessMandatory = true;
 			VDocAction vda = new VDocAction(m_curWindowNo, m_curTab, vButton, record_ID);

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java

@@ -44,14 +44,12 @@ import org.adempiere.webui.apps.BusyDialogTemplate;
 import org.adempiere.webui.apps.ProcessModalDialog;
 import org.adempiere.webui.apps.form.WCreateFromFactory;
 import org.adempiere.webui.apps.form.WCreateFromWindow;
-import org.adempiere.webui.apps.form.WPayment;
 import org.adempiere.webui.component.Button;
 import org.adempiere.webui.component.Listbox;
 import org.adempiere.webui.component.ProcessInfoDialog;
 import org.adempiere.webui.component.Window;
 import org.adempiere.webui.component.ZkCssHelper;
 import org.adempiere.webui.editor.IProcessButton;
-import org.adempiere.webui.editor.WButtonEditor;
 import org.adempiere.webui.editor.WEditor;
 import org.adempiere.webui.event.ActionEvent;
 import org.adempiere.webui.event.ActionListener;
@@ -2339,38 +2337,8 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 		}
 
 		boolean isProcessMandatory = false;
-
-		//	Pop up Payment Rules
-		if (col.equals("PaymentRule"))
-		{
-			final WPayment vp = new WPayment(curWindowNo, adtabPanel.getGridTab(), (WButtonEditor) wButton);
-			if (vp.isInitOK())		//	may not be allowed
-			{
-				vp.setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED);
-				vp.addEventListener(DialogEvents.ON_WINDOW_CLOSE, new EventListener<Event>() {
-					@Override
-					public void onEvent(Event event) throws Exception {
-						if (vp.needSave())
-						{
-							onSave(false, false, new Callback<Boolean>() {
-
-								@Override
-								public void onCallback(Boolean result) {
-									onRefresh(true, false);
-								}
-
-							});
-						}
-					}
-				});
-				AEnv.showWindow(vp);
-			}
-			return;
-		} // PaymentRule
-
 		//	Pop up Document Action (Workflow)
-
-		else if (col.equals("DocAction"))
+		if (col.equals("DocAction"))
 		{
 			final WDocActionPanel win = new WDocActionPanel(adtabPanel.getGridTab());
 			if (win.getNumberOfOptions() == 0)

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java

@@ -45,7 +45,6 @@ public class MenuSearchPanel extends AbstractMenuPanel
 	{
 		super.init();
         pnlSearch.initialise();
-        pnlSearch.cmbSearch.setDraggable("favourite");
         
         EventQueues.lookup(MenuTreeFilterPanel.MENU_TREE_FILTER_CHECKED_QUEUE, EventQueues.APPLICATION, true).subscribe(new EventListener<Event>() {
 			public void onEvent(Event event) throws Exception {