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

IDEMPIERE-918 Allow to choose the reversal document for invoice - peer review

This commit is contained in:
Carlos Ruiz 2019-07-26 18:50:30 +02:00
parent 33729acb64
commit 9d9eb132c4
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.adempiere.base.process/src/org/idempiere/process/InvoiceCreateCreditMemo.java
View File

@ -109,14 +109,8 @@ public class InvoiceCreateCreditMemo extends SvrProcess {
if (invoice.isCreditMemo()) { if (invoice.isCreditMemo()) {
throw new AdempiereException(Msg.getMsg(getCtx(), "CannotCreateCreditMemoFromCreditMemo")); throw new AdempiereException(Msg.getMsg(getCtx(), "CannotCreateCreditMemoFromCreditMemo"));
} }
// Validate if there is already another credit memo for this invoice (via POReference) // Validate if there is already another credit memo for this invoice
int id = DB.getSQLValueEx(get_TrxName(), "SELECT C_Invoice_ID FROM C_Invoice WHERE RelatedInvoice_ID = ?", invoice.getC_Invoice_ID());
// TODO Carlos : 2 ways - using invoice own field or searching a credit memo
int id = 0;
if (invoice.getRelatedInvoice_ID() > 0)
id = invoice.getRelatedInvoice_ID();
id = DB.getSQLValueEx(get_TrxName(), "SELECT C_Invoice_ID FROM C_Invoice WHERE RelatedInvoice_ID = ?", invoice.getC_Invoice_ID());
if (id > 0) { if (id > 0) {
MInvoice actualCreditMemo = MInvoice.get(getCtx(), id); MInvoice actualCreditMemo = MInvoice.get(getCtx(), id);
@ -127,12 +121,6 @@ public class InvoiceCreateCreditMemo extends SvrProcess {
MInvoice creditMemo = credit(); MInvoice creditMemo = credit();
if (creditMemo != null) { if (creditMemo != null) {
// TODO Carlos - remove those 2 lines it if you think it's not a good idea to fill the field for the invoice
invoice.setRelatedInvoice_ID(creditMemo.getC_Invoice_ID());
invoice.saveEx();
MDocType dtc = MDocType.get(getCtx(), creditMemo.getC_DocTypeTarget_ID()); MDocType dtc = MDocType.get(getCtx(), creditMemo.getC_DocTypeTarget_ID());
addLog(0, null, null, dtc.getName() + " " + creditMemo.getDocumentNo(), MInvoice.Table_ID, creditMemo.getC_Invoice_ID()); addLog(0, null, null, dtc.getName() + " " + creditMemo.getDocumentNo(), MInvoice.Table_ID, creditMemo.getC_Invoice_ID());
} }