diff --git a/client/src/org/compiere/pos/PosPanel.java b/client/src/org/compiere/pos/PosPanel.java index a4332d286c..84ca4c9e65 100644 --- a/client/src/org/compiere/pos/PosPanel.java +++ b/client/src/org/compiere/pos/PosPanel.java @@ -339,13 +339,11 @@ public class PosPanel extends CPanel */ public void openQuery (CPanel panel) { - if (panel.equals(f_cashfunctions)) - { f_bpartner.setVisible(false); f_salesRep.setVisible(false); f_curLine.setVisible(false); f_product.setVisible(false); - } + f_checkout.setVisible(false); // f_basicKeys.setVisible(false); removed by ConSerTi upon not appreciating its functionality f_lines.setVisible(false); @@ -386,7 +384,7 @@ public class PosPanel extends CPanel */ public void newOrder() { - log.info( "PosPabel.newOrder"); + log.info( "PosPanel.newOrder"); f_bpartner.setC_BPartner_ID(0); f_curLine.newOrder(); f_curLine.newLine(); diff --git a/client/src/org/compiere/pos/SubCheckout.java b/client/src/org/compiere/pos/SubCheckout.java index bd379099ff..a84409794e 100644 --- a/client/src/org/compiere/pos/SubCheckout.java +++ b/client/src/org/compiere/pos/SubCheckout.java @@ -265,7 +265,7 @@ public class SubCheckout extends PosSubPanel implements ActionListener } else { - p_posPanel.f_status.setStatusLine("Order not fully pay."); + p_posPanel.f_status.setStatusLine("Order not fully paid."); } } // Cash (Payment) diff --git a/client/src/org/compiere/pos/SubFunctionKeys.java b/client/src/org/compiere/pos/SubFunctionKeys.java index fa5fe5c4fc..2f0dfe4644 100644 --- a/client/src/org/compiere/pos/SubFunctionKeys.java +++ b/client/src/org/compiere/pos/SubFunctionKeys.java @@ -77,24 +77,26 @@ public class SubFunctionKeys extends PosSubPanel implements ActionListener CPanel content = new CPanel (new GridLayout(Math.max(rows, 3), Math.max(cols, 3))); for (int i = 0; i < m_keys.length; i++) { + Color keyColor = null; MPOSKey key = m_keys[i]; StringBuffer buttonHTML = new StringBuffer("

"); if (key.getAD_PrintColor_ID() != 0) { MPrintColor color = MPrintColor.get(Env.getCtx(), key.getAD_PrintColor_ID()); + keyColor = color.getColor(); buttonHTML - .append("") .append(key.getName()) - .append(""); + .append(""); } else buttonHTML.append(key.getName()); buttonHTML.append("

"); - log.fine( "#" + i + " - " + buttonHTML); + log.fine( "#" + i + " - " + keyColor); CButton button = new CButton(buttonHTML.toString()); button.setMargin(INSETS1); + button.setBackground(keyColor); button.setFocusable(false); button.setActionCommand(String.valueOf(key.getC_POSKey_ID())); button.addActionListener(this);