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

https://sourceforge.net/tracker/?func=detail&atid=879334&aid=1756793&group_id=176962 

- add back the corrected setQty in MInvoiceLine.setRMALine
This commit is contained in:
Heng Sin Low 2009-06-10 16:26:23 +00:00
parent 65d5f0e120
commit 5956d91f98
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -872,7 +872,7 @@ public class MInvoiceLine extends X_C_InvoiceLine
{ {
if (!success) if (!success)
return success; return success;
// reset shipment line invoiced flag // reset shipment line invoiced flag
if ( getM_InOutLine_ID() > 0 ) if ( getM_InOutLine_ID() > 0 )
{ {
@ -880,7 +880,7 @@ public class MInvoiceLine extends X_C_InvoiceLine
sLine.setIsInvoiced(false); sLine.setIsInvoiced(false);
sLine.saveEx(); sLine.saveEx();
} }
return updateHeaderTax(); return updateHeaderTax();
} // afterDelete } // afterDelete
@ -1232,6 +1232,10 @@ public class MInvoiceLine extends X_C_InvoiceLine
setC_UOM_ID(rmaLine.getC_UOM_ID()); setC_UOM_ID(rmaLine.getC_UOM_ID());
setC_Tax_ID(rmaLine.getC_Tax_ID()); setC_Tax_ID(rmaLine.getC_Tax_ID());
setPrice(rmaLine.getAmt()); setPrice(rmaLine.getAmt());
BigDecimal qty = rmaLine.getQty();
if (rmaLine.getQtyInvoiced() != null)
qty = qty.subtract(rmaLine.getQtyInvoiced());
setQty(qty);
setLineNetAmt(); setLineNetAmt();
setTaxAmt(); setTaxAmt();
setLineTotalAmt(rmaLine.getLineNetAmt()); setLineTotalAmt(rmaLine.getLineNetAmt());

1
client/src/org/compiere/grid/CreateFromInvoice.java
View File

@ -526,6 +526,7 @@ 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");