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

IDEMPIERE-9 New BP window allowed on disabled BP field - Fixed save error and minor alignment adjustment.

This commit is contained in:
Heng Sin Low 2012-09-03 12:06:10 +08:00
parent bbc323241c
commit 2c11d41139
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.adempiere.base/src/org/compiere/model/MBPartner.java
View File

@ -64,6 +64,7 @@ public class MBPartner extends X_C_BPartner
if (template != null) if (template != null)
{ {
template.set_ValueNoCheck ("C_BPartner_ID", new Integer(0)); template.set_ValueNoCheck ("C_BPartner_ID", new Integer(0));
template.set_ValueNoCheck ("C_BPartner_UU", (String)null);
template.setValue (""); template.setValue ("");
template.setName (""); template.setName ("");
template.setName2 (null); template.setName2 (null);

32
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java
View File

@ -24,7 +24,6 @@ import org.adempiere.webui.component.Label;
import org.adempiere.webui.component.ListItem; import org.adempiere.webui.component.ListItem;
import org.adempiere.webui.component.Listbox; import org.adempiere.webui.component.Listbox;
import org.adempiere.webui.component.Textbox; import org.adempiere.webui.component.Textbox;
import org.adempiere.webui.component.VerticalBox;
import org.adempiere.webui.component.Window; import org.adempiere.webui.component.Window;
import org.adempiere.webui.editor.WLocationEditor; import org.adempiere.webui.editor.WLocationEditor;
import org.adempiere.webui.event.ValueChangeEvent; import org.adempiere.webui.event.ValueChangeEvent;
@ -42,12 +41,15 @@ import org.compiere.util.Env;
import org.compiere.util.KeyNamePair; import org.compiere.util.KeyNamePair;
import org.compiere.util.Msg; import org.compiere.util.Msg;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.HtmlBasedComponent;
import org.zkoss.zk.ui.WrongValueException; import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; 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.Separator;
import org.zkoss.zul.Span;
import org.zkoss.zul.Vlayout;
/** /**
* Business Partner : Based on VBPartner * Business Partner : Based on VBPartner
@ -96,7 +98,7 @@ public class WBPartner extends Window implements EventListener, ValueChangeListe
private WLocationEditor fAddress;/* = new WLocationDialog();*/ 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); 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.setWidth("350px");
this.setBorder("normal"); this.setBorder("normal");
this.setClosable(true); this.setClosable(true);
this.setSizable(true);
this.setTitle("Business Partner"); this.setTitle("Business Partner");
this.appendChild(centerPanel); this.appendChild(centerPanel);
this.appendChild(confirmPanel); this.appendChild(confirmPanel);
centerPanel.setWidth("100%");
confirmPanel.addActionListener(Events.ON_CLICK, this); 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) private Label createLine (Component field, String title, boolean addSpace)
{ {
Hbox hbox = new Hbox(); Hlayout layout = new Hlayout();
hbox.setWidth("100%"); layout.setHflex("10");
hbox.setWidths("30%, 70%");
Label label = new Label(Msg.translate(Env.getCtx(), title)); 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()); centerPanel.appendChild(new Separator());
return label; return label;
@ -428,8 +437,11 @@ public class WBPartner extends Window implements EventListener, ValueChangeListe
if (m_partner.save()) if (m_partner.save())
log.fine("C_BPartner_ID=" + m_partner.getC_BPartner_ID()); log.fine("C_BPartner_ID=" + m_partner.getC_BPartner_ID());
else else {
FDialog.error(m_WindowNo, this, "BPartnerNotSaved"); FDialog.error(m_WindowNo, this, "BPartnerNotSaved");
m_partner = null;
return false;
}
// ***** Business Partner - Location ***** // ***** Business Partner - Location *****

5
org.adempiere.ui.zk/theme/default/css/theme.css.dsp
View File

@ -912,3 +912,8 @@ div.simileAjax-bubble-container {
.info-product-tabbedpane { .info-product-tabbedpane {
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.field-label {
position: relative;
float: right;
}