From 2c11d411390f208d0515267c85648cb0168d0226 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Mon, 3 Sep 2012 12:06:10 +0800
Subject: [PATCH] IDEMPIERE-9 New BP window allowed on disabled BP field -
 Fixed save error and minor alignment adjustment.

---
 .../src/org/compiere/model/MBPartner.java     |  1 +
 .../org/adempiere/webui/grid/WBPartner.java   | 34 +++++++++++++------
 .../theme/default/css/theme.css.dsp           |  7 +++-
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/org.adempiere.base/src/org/compiere/model/MBPartner.java b/org.adempiere.base/src/org/compiere/model/MBPartner.java
index 78967fbfdd..40f5d32ca5 100644
--- a/org.adempiere.base/src/org/compiere/model/MBPartner.java
+++ b/org.adempiere.base/src/org/compiere/model/MBPartner.java
@@ -64,6 +64,7 @@ public class MBPartner extends X_C_BPartner
 		if (template != null)
 		{
 			template.set_ValueNoCheck ("C_BPartner_ID", new Integer(0));
+			template.set_ValueNoCheck ("C_BPartner_UU", (String)null);
 			template.setValue ("");
 			template.setName ("");
 			template.setName2 (null);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java
index 9bcd13fc7f..907c8b0da7 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java
@@ -24,7 +24,6 @@ import org.adempiere.webui.component.Label;
 import org.adempiere.webui.component.ListItem;
 import org.adempiere.webui.component.Listbox;
 import org.adempiere.webui.component.Textbox;
-import org.adempiere.webui.component.VerticalBox;
 import org.adempiere.webui.component.Window;
 import org.adempiere.webui.editor.WLocationEditor;
 import org.adempiere.webui.event.ValueChangeEvent;
@@ -42,12 +41,15 @@ import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 import org.compiere.util.Msg;
 import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.HtmlBasedComponent;
 import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
-import org.zkoss.zul.Hbox;
+import org.zkoss.zul.Hlayout;
 import org.zkoss.zul.Separator;
+import org.zkoss.zul.Span;
+import org.zkoss.zul.Vlayout;
 
 /**
  * Business Partner : Based on VBPartner
@@ -96,7 +98,7 @@ public class WBPartner extends Window implements EventListener, ValueChangeListe
 	
 	private WLocationEditor fAddress;/* = new WLocationDialog();*/
 	
-	private VerticalBox centerPanel = new VerticalBox();
+	private Vlayout centerPanel = new Vlayout();	
 	
 	private ConfirmPanel confirmPanel = new ConfirmPanel(true, false, false, false, false, false);
 	
@@ -140,9 +142,12 @@ public class WBPartner extends Window implements EventListener, ValueChangeListe
 		this.setWidth("350px");
 		this.setBorder("normal");
 		this.setClosable(true);
-		this.setTitle("Business Partner");
+		this.setSizable(true);
+		this.setTitle("Business Partner");		
 		this.appendChild(centerPanel);
 		this.appendChild(confirmPanel);
+		centerPanel.setWidth("100%");
+		
 		
 		confirmPanel.addActionListener(Events.ON_CLICK, this);
 	}
@@ -231,17 +236,21 @@ public class WBPartner extends Window implements EventListener, ValueChangeListe
 	
 	private Label createLine (Component field, String title, boolean addSpace)
 	{
-		Hbox hbox = new Hbox(); 
+		Hlayout layout = new Hlayout(); 
 		
-		hbox.setWidth("100%");
-		hbox.setWidths("30%, 70%");
+		layout.setHflex("10");
 		
 		Label label = new Label(Msg.translate(Env.getCtx(), title));
-		hbox.appendChild(label);
+		Span span = new Span();
+		span.setHflex("3");
+		layout.appendChild(span);
+		span.appendChild(label);
+		label.setSclass("field-label");
 
-		hbox.appendChild(field);
+		layout.appendChild(field);
+		((HtmlBasedComponent)field).setHflex("7");
 		
-		centerPanel.appendChild(hbox);
+		centerPanel.appendChild(layout);
 		centerPanel.appendChild(new Separator());
 		
 		return label;
@@ -428,8 +437,11 @@ public class WBPartner extends Window implements EventListener, ValueChangeListe
 		
 		if (m_partner.save())
 			log.fine("C_BPartner_ID=" + m_partner.getC_BPartner_ID());
-		else
+		else {
 			FDialog.error(m_WindowNo, this, "BPartnerNotSaved");
+			m_partner = null;
+			return false;
+		}
 		
 		//	***** Business Partner - Location *****
 		
diff --git a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
index 3c9f100380..8ccf51c956 100644
--- a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
+++ b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
@@ -911,4 +911,9 @@ div.simileAjax-bubble-container {
 
 .info-product-tabbedpane {
 	background-color: #FFFFFF;
-}
\ No newline at end of file
+}
+
+.field-label {
+	position: relative; 
+	float: right;
+}