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

BF [ 1894524 ] Pay an reversed invoice 

* minor error user friendly improvements
This commit is contained in:
teo_sarca 2008-02-18 08:49:00 +00:00
parent e28b0f338c
commit 0c7d4e1056
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
base/src/org/compiere/model/MCash.java
View File

@ -42,6 +42,7 @@ import org.compiere.util.TimeUtil;
* *
* @author Teo Sarca, SC ARHIPAC SERVICE SRL * @author Teo Sarca, SC ARHIPAC SERVICE SRL
* <li>BF [ 1831997 ] Cash journal allocation reversed * <li>BF [ 1831997 ] Cash journal allocation reversed
* <li>BF [ 1894524 ] Pay an reversed invoice
*/ */
public class MCash extends X_C_Cash implements DocAction public class MCash extends X_C_Cash implements DocAction
{ {
@ -499,6 +500,15 @@ public class MCash extends X_C_Cash implements DocAction
MCashLine line = lines[i]; MCashLine line = lines[i];
if (MCashLine.CASHTYPE_Invoice.equals(line.getCashType())) if (MCashLine.CASHTYPE_Invoice.equals(line.getCashType()))
{ {
// Check if the invoice is completed - teo_sarca BF [ 1894524 ]
MInvoice invoice = line.getInvoice();
if (!MInvoice.DOCSTATUS_Completed.equals(invoice.getDocStatus())
&& !MInvoice.DOCSTATUS_Closed.equals(invoice.getDocStatus()))
{
m_processMsg = "@Line@ "+line.getLine()+": @InvoiceCreateDocNotCompleted@";
return DocAction.STATUS_Invalid;
}
//
String name = Msg.translate(getCtx(), "C_Cash_ID") + ": " + getName() String name = Msg.translate(getCtx(), "C_Cash_ID") + ": " + getName()
+ " - " + Msg.translate(getCtx(), "Line") + " " + line.getLine(); + " - " + Msg.translate(getCtx(), "Line") + " " + line.getLine();
MAllocationHdr hdr = new MAllocationHdr(getCtx(), false, MAllocationHdr hdr = new MAllocationHdr(getCtx(), false,
@ -507,7 +517,7 @@ public class MCash extends X_C_Cash implements DocAction
hdr.setAD_Org_ID(getAD_Org_ID()); hdr.setAD_Org_ID(getAD_Org_ID());
if (!hdr.save()) if (!hdr.save())
{ {
m_processMsg = "Could not create Allocation Hdr"; m_processMsg = CLogger.retrieveErrorString("Could not create Allocation Hdr");
return DocAction.STATUS_Invalid; return DocAction.STATUS_Invalid;
} }
// Allocation Line // Allocation Line
@ -517,7 +527,7 @@ public class MCash extends X_C_Cash implements DocAction
aLine.setC_CashLine_ID(line.getC_CashLine_ID()); aLine.setC_CashLine_ID(line.getC_CashLine_ID());
if (!aLine.save()) if (!aLine.save())
{ {
m_processMsg = "Could not create Allocation Line"; m_processMsg = CLogger.retrieveErrorString("Could not create Allocation Line");
return DocAction.STATUS_Invalid; return DocAction.STATUS_Invalid;
} }
// Should start WF // Should start WF
@ -554,7 +564,7 @@ public class MCash extends X_C_Cash implements DocAction
pay.setProcessed(true); pay.setProcessed(true);
if (!pay.save()) if (!pay.save())
{ {
m_processMsg = "Could not create Payment"; m_processMsg = CLogger.retrieveErrorString("Could not create Payment");
return DocAction.STATUS_Invalid; return DocAction.STATUS_Invalid;
} }
} }