parent
ac10f352f6
commit
57fc79f081
|
@ -14,16 +14,20 @@
|
||||||
|
|
||||||
package org.compiere.pos;
|
package org.compiere.pos;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Dimension;
|
||||||
import java.awt.event.*;
|
import java.awt.GridBagConstraints;
|
||||||
import java.util.*;
|
import java.awt.Insets;
|
||||||
|
import java.awt.event.ActionEvent;
|
||||||
|
import java.awt.event.ActionListener;
|
||||||
|
import java.util.Properties;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.KeyStroke;
|
||||||
|
|
||||||
import org.compiere.swing.*;
|
import org.compiere.apps.AppsAction;
|
||||||
import org.compiere.apps.*;
|
import org.compiere.model.MPOS;
|
||||||
import org.compiere.model.*;
|
import org.compiere.swing.CButton;
|
||||||
import org.compiere.util.*;
|
import org.compiere.swing.CPanel;
|
||||||
|
import org.compiere.util.Env;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* POS Sub Panel Base Class.
|
* POS Sub Panel Base Class.
|
||||||
|
|
|
@ -14,19 +14,28 @@
|
||||||
|
|
||||||
package org.compiere.pos;
|
package org.compiere.pos;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Cursor;
|
||||||
import java.awt.event.*;
|
import java.awt.Dimension;
|
||||||
import java.math.*;
|
import java.awt.GridBagConstraints;
|
||||||
|
import java.awt.GridBagLayout;
|
||||||
|
import java.awt.event.ActionEvent;
|
||||||
|
import java.awt.event.ActionListener;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
import javax.swing.border.TitledBorder;
|
import javax.swing.border.TitledBorder;
|
||||||
|
|
||||||
import org.compiere.swing.*;
|
|
||||||
import org.compiere.grid.ed.VNumber;
|
import org.compiere.grid.ed.VNumber;
|
||||||
import org.compiere.model.MOrder;
|
import org.compiere.model.MOrder;
|
||||||
import org.compiere.print.ReportCtl;
|
import org.compiere.print.ReportCtl;
|
||||||
import org.compiere.print.ReportEngine;
|
import org.compiere.print.ReportEngine;
|
||||||
import org.compiere.process.*;
|
import org.compiere.process.DocAction;
|
||||||
import org.compiere.util.*;
|
import org.compiere.swing.CButton;
|
||||||
|
import org.compiere.swing.CLabel;
|
||||||
|
import org.compiere.swing.CPanel;
|
||||||
|
import org.compiere.util.CLogger;
|
||||||
|
import org.compiere.util.DisplayType;
|
||||||
|
import org.compiere.util.Env;
|
||||||
|
import org.compiere.util.Msg;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checkout Sub Panel
|
* Checkout Sub Panel
|
||||||
|
@ -76,10 +85,6 @@ public class SubCheckout extends PosSubPanel implements ActionListener
|
||||||
*/
|
*/
|
||||||
public void init()
|
public void init()
|
||||||
{
|
{
|
||||||
// Title
|
|
||||||
TitledBorder border = new TitledBorder(Msg.getMsg(Env.getCtx(), "Checkout"));
|
|
||||||
setBorder(border);
|
|
||||||
|
|
||||||
// Content
|
// Content
|
||||||
setLayout(new GridBagLayout());
|
setLayout(new GridBagLayout());
|
||||||
GridBagConstraints gbc = new GridBagConstraints();
|
GridBagConstraints gbc = new GridBagConstraints();
|
||||||
|
@ -91,7 +96,8 @@ public class SubCheckout extends PosSubPanel implements ActionListener
|
||||||
gbc.fill = GridBagConstraints.BOTH;
|
gbc.fill = GridBagConstraints.BOTH;
|
||||||
gbc.weightx = .1;
|
gbc.weightx = .1;
|
||||||
CPanel cash = new CPanel(new GridBagLayout());
|
CPanel cash = new CPanel(new GridBagLayout());
|
||||||
cash.setBorder(new TitledBorder(Msg.getMsg(Env.getCtx(), "Cash")));
|
cash.setBackground(java.awt.Color.lightGray);
|
||||||
|
cash.setBorder(new TitledBorder(Msg.getMsg(Env.getCtx(), "Checkout")));
|
||||||
gbc.gridy = 0;
|
gbc.gridy = 0;
|
||||||
add (cash, gbc);
|
add (cash, gbc);
|
||||||
GridBagConstraints gbc0 = new GridBagConstraints();
|
GridBagConstraints gbc0 = new GridBagConstraints();
|
||||||
|
|
|
@ -294,8 +294,7 @@ public class SubCurrentLine extends PosSubPanel implements ActionListener {
|
||||||
int numLineas = lineas.length;
|
int numLineas = lineas.length;
|
||||||
if (numLineas > row)
|
if (numLineas > row)
|
||||||
{
|
{
|
||||||
//delete line from order
|
//delete line from order - true only when DRAFT is not PREPARE-IT()
|
||||||
//illegal! lineas[row].setQtyReserved(Env.ZERO); //red1 - [2093355 ] Small bugs in OpenXpertya POS
|
|
||||||
lineas[row].delete(true);
|
lineas[row].delete(true);
|
||||||
for (int i = row; i < (numLineas - 1); i++)
|
for (int i = row; i < (numLineas - 1); i++)
|
||||||
lineas[i] = lineas[i + 1];
|
lineas[i] = lineas[i + 1];
|
||||||
|
|
|
@ -14,15 +14,23 @@
|
||||||
|
|
||||||
package org.compiere.pos;
|
package org.compiere.pos;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Color;
|
||||||
import java.awt.event.*;
|
import java.awt.Dimension;
|
||||||
|
import java.awt.GridBagConstraints;
|
||||||
|
import java.awt.GridLayout;
|
||||||
|
import java.awt.event.ActionEvent;
|
||||||
|
import java.awt.event.ActionListener;
|
||||||
|
|
||||||
import javax.swing.border.*;
|
import javax.swing.border.TitledBorder;
|
||||||
|
|
||||||
import org.compiere.swing.*;
|
import org.compiere.model.MPOSKey;
|
||||||
import org.compiere.model.*;
|
import org.compiere.model.MPOSKeyLayout;
|
||||||
import org.compiere.print.*;
|
import org.compiere.print.MPrintColor;
|
||||||
import org.compiere.util.*;
|
import org.compiere.swing.CButton;
|
||||||
|
import org.compiere.swing.CPanel;
|
||||||
|
import org.compiere.util.CLogger;
|
||||||
|
import org.compiere.util.Env;
|
||||||
|
import org.compiere.util.Msg;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue