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

Fix [2520529] - Error Generating Invoice from Shipment with different UoM 

https://sourceforge.net/tracker2/?func=detail&atid=879332&aid=2520529&group_id=176962
This commit is contained in:
Carlos Ruiz 2009-01-20 04:25:21 +00:00
parent f516d38ba5
commit 5fcb693d2b
8 changed files with 80 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
base/src/org/compiere/model/MInOutConfirm.java
View File

@ -605,6 +605,11 @@ public class MInOutConfirm extends X_M_InOutConfirm implements DocAction
} }
MInvoiceLine line = new MInvoiceLine (m_creditMemo); MInvoiceLine line = new MInvoiceLine (m_creditMemo);
line.setShipLine(confirm.getLine()); line.setShipLine(confirm.getLine());
if (confirm.getLine().getProduct() != null) {
// use product UOM in case the shipment hasn't the same uom than the order
line.setC_UOM_ID(confirm.getLine().getProduct().getC_UOM_ID());
}
// Note: confirmation is always in the qty according to the product UOM
line.setQty(confirm.getDifferenceQty()); // Entered/Invoiced line.setQty(confirm.getDifferenceQty()); // Entered/Invoiced
if (!line.save(get_TrxName())) if (!line.save(get_TrxName()))
{ {

14
base/src/org/compiere/model/MInOutLine.java
View File

@ -617,4 +617,18 @@ public class MInOutLine extends X_M_InOutLine
return Env.ZERO; return Env.ZERO;
} // getBase } // getBase
public boolean sameOrderLineUOM()
{
if (getC_OrderLine_ID() <= 0)
return false;
MOrderLine oLine = new MOrderLine(getCtx(), getC_OrderLine_ID(), get_TrxName());
if (oLine.getC_UOM_ID() != getC_UOM_ID())
return false;
// inout has orderline and both has the same UOM
return true;
}
} // MInOutLine } // MInOutLine

11
base/src/org/compiere/model/MInvoiceLine.java
View File

@ -242,7 +242,11 @@ public class MInvoiceLine extends X_C_InvoiceLine
setDescription(sLine.getDescription()); setDescription(sLine.getDescription());
// //
setM_Product_ID(sLine.getM_Product_ID()); setM_Product_ID(sLine.getM_Product_ID());
setC_UOM_ID(sLine.getC_UOM_ID()); if (sLine.sameOrderLineUOM())
setC_UOM_ID(sLine.getC_UOM_ID());
else
// use product UOM if the shipment hasn't the same uom than the order
setC_UOM_ID(getProduct().getC_UOM_ID());
setM_AttributeSetInstance_ID(sLine.getM_AttributeSetInstance_ID()); setM_AttributeSetInstance_ID(sLine.getM_AttributeSetInstance_ID());
// setS_ResourceAssignment_ID(sLine.getS_ResourceAssignment_ID()); // setS_ResourceAssignment_ID(sLine.getS_ResourceAssignment_ID());
if(getM_Product_ID() == 0) if(getM_Product_ID() == 0)
@ -254,7 +258,10 @@ public class MInvoiceLine extends X_C_InvoiceLine
MOrderLine oLine = new MOrderLine (getCtx(), C_OrderLine_ID, get_TrxName()); MOrderLine oLine = new MOrderLine (getCtx(), C_OrderLine_ID, get_TrxName());
setS_ResourceAssignment_ID(oLine.getS_ResourceAssignment_ID()); setS_ResourceAssignment_ID(oLine.getS_ResourceAssignment_ID());
// //
setPriceEntered(oLine.getPriceEntered()); if (sLine.sameOrderLineUOM())
setPriceEntered(oLine.getPriceEntered());
else
setPriceEntered(oLine.getPriceActual());
setPriceActual(oLine.getPriceActual()); setPriceActual(oLine.getPriceActual());
setPriceLimit(oLine.getPriceLimit()); setPriceLimit(oLine.getPriceLimit());
setPriceList(oLine.getPriceList()); setPriceList(oLine.getPriceList());

5
base/src/org/compiere/model/MOrder.java
View File

@ -1792,7 +1792,10 @@ public class MOrder extends X_C_Order implements DocAction
MInvoiceLine iLine = new MInvoiceLine(invoice); MInvoiceLine iLine = new MInvoiceLine(invoice);
iLine.setShipLine(sLine); iLine.setShipLine(sLine);
// Qty = Delivered // Qty = Delivered
iLine.setQtyEntered(sLine.getQtyEntered()); if (sLine.sameOrderLineUOM())
iLine.setQtyEntered(sLine.getQtyEntered());
else
iLine.setQtyEntered(sLine.getMovementQty());
iLine.setQtyInvoiced(sLine.getMovementQty()); iLine.setQtyInvoiced(sLine.getMovementQty());
if (!iLine.save(get_TrxName())) if (!iLine.save(get_TrxName()))
{ {

5
base/src/org/compiere/process/InOutCreateInvoice.java
View File

@ -92,7 +92,10 @@ public class InOutCreateInvoice extends SvrProcess
MInOutLine sLine = shipLines[i]; MInOutLine sLine = shipLines[i];
MInvoiceLine line = new MInvoiceLine(invoice); MInvoiceLine line = new MInvoiceLine(invoice);
line.setShipLine(sLine); line.setShipLine(sLine);
line.setQtyEntered(sLine.getQtyEntered()); if (sLine.sameOrderLineUOM())
line.setQtyEntered(sLine.getQtyEntered());
else
line.setQtyEntered(sLine.getMovementQty());
line.setQtyInvoiced(sLine.getMovementQty()); line.setQtyInvoiced(sLine.getMovementQty());
if (!line.save()) if (!line.save())
throw new IllegalArgumentException("Cannot save Invoice Line"); throw new IllegalArgumentException("Cannot save Invoice Line");

5
base/src/org/compiere/process/InvoiceGenerate.java
View File

@ -415,7 +415,10 @@ public class InvoiceGenerate extends SvrProcess
// //
MInvoiceLine line = new MInvoiceLine (m_invoice); MInvoiceLine line = new MInvoiceLine (m_invoice);
line.setShipLine(sLine); line.setShipLine(sLine);
line.setQtyEntered(sLine.getQtyEntered()); if (sLine.sameOrderLineUOM())
line.setQtyEntered(sLine.getQtyEntered());
else
line.setQtyEntered(sLine.getMovementQty());
line.setQtyInvoiced(sLine.getMovementQty()); line.setQtyInvoiced(sLine.getMovementQty());
line.setLine(m_line + sLine.getLine()); line.setLine(m_line + sLine.getLine());
if (!line.save()) if (!line.save())

40
client/src/org/compiere/grid/VCreateFromInvoice.java
View File

@ -590,28 +590,28 @@ public class VCreateFromInvoice extends VCreateFrom implements VetoableChangeLis
if (inoutLine != null) if (inoutLine != null)
{ {
invoiceLine.setShipLine(inoutLine); // overwrites invoiceLine.setShipLine(inoutLine); // overwrites
if (inoutLine.getQtyEntered().compareTo(inoutLine.getMovementQty()) != 0) if (inoutLine.sameOrderLineUOM())
invoiceLine.setQtyInvoiced(QtyEntered invoiceLine.setQtyInvoiced(QtyEntered);
.multiply(inoutLine.getMovementQty()) else
.divide(inoutLine.getQtyEntered(), 12, BigDecimal.ROUND_HALF_UP)); invoiceLine.setQtyInvoiced(inoutLine.getMovementQty());
} }
else else {
log.fine("No Receipt Line"); log.fine("No Receipt Line");
// Order Info
// Order Info if (orderLine != null)
if (orderLine != null) {
{ invoiceLine.setOrderLine(orderLine); // overwrites
invoiceLine.setOrderLine(orderLine); // overwrites if (orderLine.getQtyEntered().compareTo(orderLine.getQtyOrdered()) != 0)
if (orderLine.getQtyEntered().compareTo(orderLine.getQtyOrdered()) != 0) invoiceLine.setQtyInvoiced(QtyEntered
invoiceLine.setQtyInvoiced(QtyEntered .multiply(orderLine.getQtyOrdered())
.multiply(orderLine.getQtyOrdered()) .divide(orderLine.getQtyEntered(), 12, BigDecimal.ROUND_HALF_UP));
.divide(orderLine.getQtyEntered(), 12, BigDecimal.ROUND_HALF_UP)); }
} else
else {
{ log.fine("No Order Line");
log.fine("No Order Line"); invoiceLine.setPrice();
invoiceLine.setPrice(); invoiceLine.setTax();
invoiceLine.setTax(); }
} }
if (!invoiceLine.save()) if (!invoiceLine.save())
log.log(Level.SEVERE, "Line NOT created #" + i); log.log(Level.SEVERE, "Line NOT created #" + i);

40
zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoice.java
View File

@ -581,28 +581,28 @@ public class WCreateFromInvoice extends WCreateFrom implements ValueChangeListen
if (inoutLine != null) if (inoutLine != null)
{ {
invoiceLine.setShipLine(inoutLine); // overwrites invoiceLine.setShipLine(inoutLine); // overwrites
if (inoutLine.getQtyEntered().compareTo(inoutLine.getMovementQty()) != 0) if (inoutLine.sameOrderLineUOM())
invoiceLine.setQtyInvoiced(QtyEntered invoiceLine.setQtyInvoiced(QtyEntered);
.multiply(inoutLine.getMovementQty()) else
.divide(inoutLine.getQtyEntered(), 12, BigDecimal.ROUND_HALF_UP)); invoiceLine.setQtyInvoiced(inoutLine.getMovementQty());
} }
else else {
log.fine("No Receipt Line"); log.fine("No Receipt Line");
// Order Info
// Order Info if (orderLine != null)
if (orderLine != null) {
{ invoiceLine.setOrderLine(orderLine); // overwrites
invoiceLine.setOrderLine(orderLine); // overwrites if (orderLine.getQtyEntered().compareTo(orderLine.getQtyOrdered()) != 0)
if (orderLine.getQtyEntered().compareTo(orderLine.getQtyOrdered()) != 0) invoiceLine.setQtyInvoiced(QtyEntered
invoiceLine.setQtyInvoiced(QtyEntered .multiply(orderLine.getQtyOrdered())
.multiply(orderLine.getQtyOrdered()) .divide(orderLine.getQtyEntered(), 12, BigDecimal.ROUND_HALF_UP));
.divide(orderLine.getQtyEntered(), 12, BigDecimal.ROUND_HALF_UP)); }
} else
else {
{ log.fine("No Order Line");
log.fine("No Order Line"); invoiceLine.setPrice();
invoiceLine.setPrice(); invoiceLine.setTax();
invoiceLine.setTax(); }
} }
if (!invoiceLine.save()) if (!invoiceLine.save())
log.log(Level.SEVERE, "Line NOT created #" + i); log.log(Level.SEVERE, "Line NOT created #" + i);