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

Fix [2833245] - Usability - form Generate Charges two buttons same label 

https://sourceforge.net/tracker/?func=detail&aid=2833245&group_id=176962&atid=879332
This commit is contained in:
Carlos Ruiz 2009-08-06 16:42:38 +00:00
parent ad7ffda05c
commit da90c2553e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/org/compiere/apps/form/VCharge.java
View File

@ -53,6 +53,7 @@ import org.compiere.util.DB;
import org.compiere.util.Env; 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.compiere.util.Util;
/** /**
* Create Charge from Accounts * Create Charge from Accounts
@ -137,12 +138,12 @@ public class VCharge extends Charge
nameLabel.setText(Msg.translate(Env.getCtx(), "Name")); nameLabel.setText(Msg.translate(Env.getCtx(), "Name"));
nameField.setColumns(20); nameField.setColumns(20);
valueField.setColumns(10); valueField.setColumns(10);
newButton.setText(Msg.getMsg(Env.getCtx(), "Create")); newButton.setText(Msg.getMsg(Env.getCtx(), "Create") + " " + Util.cleanAmp(Msg.getMsg(Env.getCtx(), "New")));
newButton.addActionListener(this); newButton.addActionListener(this);
accountPanel.setBorder(accountBorder); accountPanel.setBorder(accountBorder);
accountPanel.setLayout(accountLayout); accountPanel.setLayout(accountLayout);
accountBorder.setTitle(Msg.getMsg(Env.getCtx(), "ChargeFromAccount")); accountBorder.setTitle(Msg.getMsg(Env.getCtx(), "ChargeFromAccount"));
accountButton.setText(Msg.getMsg(Env.getCtx(), "Create")); accountButton.setText(Msg.getMsg(Env.getCtx(), "Create") + " " + Msg.getMsg(Env.getCtx(), "From") + " " + Msg.getElement(Env.getCtx(), "Account_ID"));
accountButton.addActionListener(this); accountButton.addActionListener(this);
accountOKPanel.setLayout(accountOKLayout); accountOKPanel.setLayout(accountOKLayout);
accountOKLayout.setAlignment(FlowLayout.RIGHT); accountOKLayout.setAlignment(FlowLayout.RIGHT);

5
zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java
View File

@ -45,6 +45,7 @@ import org.compiere.apps.form.Charge;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg; import org.compiere.util.Msg;
import org.compiere.util.Util;
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;
@ -277,7 +278,7 @@ public class WCharge extends Charge implements IFormController, EventListener
Panel southPanel = new Panel(); Panel southPanel = new Panel();
southPanel.setAlign("right"); southPanel.setAlign("right");
south.appendChild(southPanel); south.appendChild(southPanel);
m_btnAccount.setLabel(Msg.getMsg(Env.getCtx(), AD_MESSAGE_CREATE)); m_btnAccount.setLabel(Msg.getMsg(Env.getCtx(), AD_MESSAGE_CREATE) + " " + Msg.getMsg(Env.getCtx(), "From") + " " + Msg.getElement(Env.getCtx(), "Account_ID"));
m_btnAccount.addEventListener(Events.ON_CLICK, this); m_btnAccount.addEventListener(Events.ON_CLICK, this);
southPanel.appendChild(m_btnAccount); southPanel.appendChild(m_btnAccount);
@ -304,7 +305,7 @@ public class WCharge extends Charge implements IFormController, EventListener
// bottom row // bottom row
m_lblName.setValue(Msg.translate(Env.getCtx(), EColumn.NAME.title())); m_lblName.setValue(Msg.translate(Env.getCtx(), EColumn.NAME.title()));
m_txbNameField.setCols(nameFieldColumns); m_txbNameField.setCols(nameFieldColumns);
m_btnNew.setLabel(Msg.getMsg(Env.getCtx(), AD_MESSAGE_CREATE)); m_btnNew.setLabel(Msg.getMsg(Env.getCtx(), AD_MESSAGE_CREATE) + " " + Util.cleanAmp(Msg.getMsg(Env.getCtx(), "New")));
m_btnNew.addEventListener(Events.ON_CLICK, this); m_btnNew.addEventListener(Events.ON_CLICK, this);
Rows rows = new Rows(); Rows rows = new Rows();