hg merge release-1.0c (merge release1 into release2)
This commit is contained in:
commit
4626279112
|
@ -867,7 +867,7 @@ public class MInvoiceLine extends X_C_InvoiceLine
|
|||
enforce = false;
|
||||
// Check Price Limit?
|
||||
if (enforce && getPriceLimit() != Env.ZERO
|
||||
&& getPriceActual().compareTo(getPriceLimit()) < 0)
|
||||
&& getPriceEntered().compareTo(getPriceLimit()) < 0)
|
||||
{
|
||||
log.saveError("UnderLimitPrice", "PriceEntered=" + getPriceEntered() + ", PriceLimit=" + getPriceLimit());
|
||||
return false;
|
||||
|
|
|
@ -877,7 +877,7 @@ public class MOrderLine extends X_C_OrderLine
|
|||
enforce = false;
|
||||
// Check Price Limit?
|
||||
if (enforce && getPriceLimit() != Env.ZERO
|
||||
&& getPriceActual().compareTo(getPriceLimit()) < 0)
|
||||
&& getPriceEntered().compareTo(getPriceLimit()) < 0)
|
||||
{
|
||||
log.saveError("UnderLimitPrice", "PriceEntered=" + getPriceEntered() + ", PriceLimit=" + getPriceLimit());
|
||||
return false;
|
||||
|
|
|
@ -213,11 +213,6 @@ public class VLocationDialog extends CDialog
|
|||
|
||||
private boolean inCountryAction;
|
||||
private boolean inOKAction;
|
||||
|
||||
/** The "route" key */
|
||||
private static final String TO_ROUTE = Msg.getMsg(Env.getCtx(), "Route");
|
||||
/** The "to link" key */
|
||||
private static final String TO_LINK = Msg.getMsg(Env.getCtx(), "Map");
|
||||
|
||||
private JButton toLink = new JButton();
|
||||
private JButton toRoute = new JButton();
|
||||
|
@ -246,14 +241,14 @@ public class VLocationDialog extends CDialog
|
|||
southPanel.add(confirmPanel, BorderLayout.NORTH);
|
||||
|
||||
//BEGIN fernandinho/ricardo
|
||||
toLink.setText(TO_LINK);
|
||||
toLink.setText(Msg.getMsg(Env.getCtx(), "Map"));
|
||||
toLink.addActionListener(this);
|
||||
toLink.setMargin(ConfirmPanel.s_insets);
|
||||
confirmPanel.addComponent(toLink);
|
||||
if (MLocation.LOCATION_MAPS_URL_PREFIX == null)
|
||||
toLink.setVisible(false);
|
||||
|
||||
toRoute.setText(TO_ROUTE);
|
||||
toRoute.setText(Msg.getMsg(Env.getCtx(), "Route"));
|
||||
toRoute.addActionListener(this);
|
||||
toRoute.setMargin(ConfirmPanel.s_insets);
|
||||
confirmPanel.addComponent(toRoute);
|
||||
|
|
|
@ -367,7 +367,11 @@ public class WCreateFromShipmentUI extends CreateFromShipment implements EventLi
|
|||
// BPartner - load Order/Invoice/Shipment
|
||||
if (e.getPropertyName().equals("C_BPartner_ID"))
|
||||
{
|
||||
int C_BPartner_ID = ((Integer)e.getNewValue()).intValue();
|
||||
int C_BPartner_ID = 0;
|
||||
if (e.getNewValue() != null){
|
||||
C_BPartner_ID = ((Integer)e.getNewValue()).intValue();
|
||||
}
|
||||
|
||||
initBPOrderDetails (C_BPartner_ID, true);
|
||||
}
|
||||
window.tableChanged(null);
|
||||
|
|
|
@ -137,11 +137,6 @@ public class WLocationDialog extends Window implements EventListener<Event>
|
|||
private boolean inCountryAction;
|
||||
private boolean inOKAction;
|
||||
|
||||
/** The "route" key */
|
||||
private static final String TO_ROUTE = Msg.getMsg(Env.getCtx(), "Route");
|
||||
/** The "to link" key */
|
||||
private static final String TO_LINK = Msg.getMsg(Env.getCtx(), "Map");
|
||||
|
||||
private Button toLink;
|
||||
private Button toRoute;
|
||||
|
||||
|
@ -277,10 +272,10 @@ public class WLocationDialog extends Window implements EventListener<Event>
|
|||
confirmPanel = new ConfirmPanel(true);
|
||||
confirmPanel.addActionListener(this);
|
||||
|
||||
toLink = new Button(TO_LINK);
|
||||
toLink = new Button(Msg.getMsg(Env.getCtx(), "Map"));
|
||||
LayoutUtils.addSclass("txt-btn", toLink);
|
||||
toLink.addEventListener(Events.ON_CLICK,this);
|
||||
toRoute = new Button(TO_ROUTE);
|
||||
toRoute = new Button(Msg.getMsg(Env.getCtx(), "Route"));
|
||||
LayoutUtils.addSclass("txt-btn", toRoute);
|
||||
toRoute.addEventListener(Events.ON_CLICK,this);
|
||||
|
||||
|
|
Loading…
Reference in New Issue