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

Fix error when creating an invoice from a purchase order - when the material is already received and different UoM than product. 

Steps to reproduce:
- Create purchase order for 1 6-pack of Elm
- Create a material receipt for the corresponding purchase order
- Create an invoice for the material receipt (or purchase order) - the qtyentered is 1 6-pack, and the qtyinvoiced was 1 (must be 6)
This commit is contained in:
Carlos Ruiz 2011-03-25 19:45:43 -05:00
parent 3b0f048d05
commit f80fdada3b
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
org.adempiere.ui/src/org/compiere/grid/CreateFromInvoice.java
View File

@ -32,6 +32,7 @@ import org.compiere.model.MOrderLine;
import org.compiere.model.MProduct; import org.compiere.model.MProduct;
import org.compiere.model.MRMA; import org.compiere.model.MRMA;
import org.compiere.model.MRMALine; import org.compiere.model.MRMALine;
import org.compiere.model.MUOMConversion;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
@ -364,23 +365,24 @@ public class CreateFromInvoice extends CreateFrom
invoice.saveEx(); invoice.saveEx();
} }
MInOut inout = null; // MInOut inout = null;
// if (m_M_InOut_ID > 0) // if (m_M_InOut_ID > 0)
// { // {
// inout = new MInOut(Env.getCtx(), m_M_InOut_ID, trxName); // inout = new MInOut(Env.getCtx(), m_M_InOut_ID, trxName);
// } // }
if (inout != null && inout.getM_InOut_ID() != 0 // if (inout != null && inout.getM_InOut_ID() != 0
&& inout.getC_Invoice_ID() == 0) // only first time // && inout.getC_Invoice_ID() == 0) // only first time
{ // {
inout.setC_Invoice_ID(C_Invoice_ID); // inout.setC_Invoice_ID(C_Invoice_ID);
inout.saveEx(); // inout.saveEx();
} // }
// Lines // Lines
for (int i = 0; i < miniTable.getRowCount(); i++) for (int i = 0; i < miniTable.getRowCount(); i++)
{ {
if (((Boolean)miniTable.getValueAt(i, 0)).booleanValue()) if (((Boolean)miniTable.getValueAt(i, 0)).booleanValue())
{ {
MProduct product = null;
// variable values // variable values
BigDecimal QtyEntered = (BigDecimal)miniTable.getValueAt(i, 1); // 1-Qty BigDecimal QtyEntered = (BigDecimal)miniTable.getValueAt(i, 1); // 1-Qty
@ -410,7 +412,7 @@ public class CreateFromInvoice extends CreateFrom
int precision = 2; int precision = 2;
if (M_Product_ID != 0) if (M_Product_ID != 0)
{ {
MProduct product = MProduct.get(Env.getCtx(), M_Product_ID); product = MProduct.get(Env.getCtx(), M_Product_ID);
precision = product.getUOMPrecision(); precision = product.getUOMPrecision();
} }
QtyEntered = QtyEntered.setScale(precision, BigDecimal.ROUND_HALF_DOWN); QtyEntered = QtyEntered.setScale(precision, BigDecimal.ROUND_HALF_DOWN);
@ -423,6 +425,13 @@ public class CreateFromInvoice extends CreateFrom
MInvoiceLine invoiceLine = new MInvoiceLine (invoice); MInvoiceLine invoiceLine = new MInvoiceLine (invoice);
invoiceLine.setM_Product_ID(M_Product_ID, C_UOM_ID); // Line UOM invoiceLine.setM_Product_ID(M_Product_ID, C_UOM_ID); // Line UOM
invoiceLine.setQty(QtyEntered); // Invoiced/Entered invoiceLine.setQty(QtyEntered); // Invoiced/Entered
BigDecimal QtyInvoiced = null;
if (M_Product_ID > 0 && product.getC_UOM_ID() != C_UOM_ID) {
QtyInvoiced = MUOMConversion.convertProductFrom(Env.getCtx(), M_Product_ID, C_UOM_ID, QtyEntered);
}
if (QtyInvoiced == null)
QtyInvoiced = QtyEntered;
invoiceLine.setQtyInvoiced(QtyInvoiced);
// Info // Info
MOrderLine orderLine = null; MOrderLine orderLine = null;
@ -494,15 +503,11 @@ public class CreateFromInvoice extends CreateFrom
} }
// get Ship info // get Ship info
// Shipment Info // Shipment Info
if (inoutLine != null) if (inoutLine != null)
{ {
invoiceLine.setShipLine(inoutLine); // overwrites invoiceLine.setShipLine(inoutLine); // overwrites
if (inoutLine.sameOrderLineUOM())
invoiceLine.setQtyInvoiced(QtyEntered);
else
invoiceLine.setQtyInvoiced(inoutLine.getMovementQty());
} }
else { else {
log.fine("No Receipt Line"); log.fine("No Receipt Line");
@ -510,10 +515,6 @@ public class CreateFromInvoice extends CreateFrom
if (orderLine != null) if (orderLine != null)
{ {
invoiceLine.setOrderLine(orderLine); // overwrites invoiceLine.setOrderLine(orderLine); // overwrites
if (orderLine.getQtyEntered().compareTo(orderLine.getQtyOrdered()) != 0)
invoiceLine.setQtyInvoiced(QtyEntered
.multiply(orderLine.getQtyOrdered())
.divide(orderLine.getQtyEntered(), 12, BigDecimal.ROUND_HALF_UP));
} }
else else
{ {
@ -526,7 +527,6 @@ public class CreateFromInvoice extends CreateFrom
if (rmaLine != null) if (rmaLine != null)
{ {
invoiceLine.setRMALine(rmaLine); // overwrites invoiceLine.setRMALine(rmaLine); // overwrites
invoiceLine.setQty(QtyEntered);
} }
else else
log.fine("No RMA Line"); log.fine("No RMA Line");