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

* [ 1639249 ] Complete the POS implementation 

- complete cash drawer movement functions
- fixed integration to cash book
This commit is contained in:
Heng Sin Low 2007-02-25 19:03:11 +00:00
parent b7efaec6c8
commit 4f1070663a
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/org/compiere/pos/CashSubFunctions.java
View File

@ -353,8 +353,7 @@ public class CashSubFunctions extends PosSubPanel implements ActionListener, Inp
MQuery query = new MQuery(MCash.Table_Name); MQuery query = new MQuery(MCash.Table_Name);
query.addRestriction("C_Cash_ID", MQuery.EQUAL, cash.getC_Cash_ID()); query.addRestriction("C_Cash_ID", MQuery.EQUAL, cash.getC_Cash_ID());
//TODO AEnv.zoom(query);
//AEnv.openWindow(MCash.Table_ID, query, false);
} }
// to open window with inputs and outputs of cash // to open window with inputs and outputs of cash
else if (action.equals("InputsOutputs")) else if (action.equals("InputsOutputs"))
@ -363,15 +362,13 @@ public class CashSubFunctions extends PosSubPanel implements ActionListener, Inp
MCash cash = MCash.get(p_pos.getCtx(), /*p_pos.getAD_Org_ID(),*/ p_pos.getC_CashBook_ID(), today, null); MCash cash = MCash.get(p_pos.getCtx(), /*p_pos.getAD_Org_ID(),*/ p_pos.getC_CashBook_ID(), today, null);
//TODO: new method added by openxpertya AEnv.zoom(MCash.Table_ID, cash.getC_Cash_ID());
//AEnv.detailedZoom(MCash.Table_ID, cash.getC_Cash_ID(), false);
} }
else if (action.equals("Tickets")) else if (action.equals("Tickets"))
{ {
MQuery query = new MQuery(MOrder.Table_Name); MQuery query = new MQuery(MOrder.Table_Name);
query.addRestriction("C_DocTypeTarget_ID", MQuery.EQUAL, p_pos.getC_DocType_ID()); query.addRestriction("C_DocTypeTarget_ID", MQuery.EQUAL, p_pos.getC_DocType_ID());
//TODO: openxpertya added ad_window_id to c_pos AEnv.zoom(query);
//AEnv.openWindow(p_pos.getAD_Window_ID(), query, true);
} }
// Cash (Payment) // Cash (Payment)
else if (action.equals("displayCashScrutiny")) else if (action.equals("displayCashScrutiny"))
@ -547,4 +544,5 @@ public class CashSubFunctions extends PosSubPanel implements ActionListener, Inp
{ {
cmd_calculateDifference(); cmd_calculateDifference();
} }
} // CashSubFunctions } // CashSubFunctions

8
client/src/org/compiere/pos/SubCurrentLine.java
View File

@ -281,13 +281,6 @@ public class SubCurrentLine extends PosSubPanel implements ActionListener {
int numLineas = lineas.length; int numLineas = lineas.length;
if (numLineas > row) if (numLineas > row)
{ {
//to unreserve
lineas[row].setQty(Env.ZERO);
lineas[row].setLineNetAmt(Env.ZERO);
lineas[row].save();
//TODO: openxpertya using private method from MOrder
//m_order.reserveStock(null, lineas);
//delete line from order //delete line from order
lineas[row].delete(true); lineas[row].delete(true);
for (int i = row; i < (numLineas - 1); i++) for (int i = row; i < (numLineas - 1); i++)
@ -388,6 +381,7 @@ public class SubCurrentLine extends PosSubPanel implements ActionListener {
m_order.setM_PriceList_ID(p_pos.getM_PriceList_ID()); m_order.setM_PriceList_ID(p_pos.getM_PriceList_ID());
m_order.setM_Warehouse_ID(p_pos.getM_Warehouse_ID()); m_order.setM_Warehouse_ID(p_pos.getM_Warehouse_ID());
m_order.setSalesRep_ID(p_pos.getSalesRep_ID()); m_order.setSalesRep_ID(p_pos.getSalesRep_ID());
m_order.setPaymentRule(MOrder.PAYMENTRULE_Cash);
if (!m_order.save()) if (!m_order.save())
{ {
m_order = null; m_order = null;