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

IDEMPIERE-2692 Copy lines process doesn't handle org properly

This commit is contained in:
tsvikruha 2019-01-26 13:07:21 +01:00
parent 9d3355d6b2
commit 42f0399bae
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.base.process/src/org/compiere/process/CopyFromInvoice.java
View File

@ -65,7 +65,7 @@ public class CopyFromInvoice extends SvrProcess
MInvoice from = new MInvoice (getCtx(), m_C_Invoice_ID, get_TrxName()); MInvoice from = new MInvoice (getCtx(), m_C_Invoice_ID, get_TrxName());
MInvoice to = new MInvoice (getCtx(), To_C_Invoice_ID, get_TrxName()); MInvoice to = new MInvoice (getCtx(), To_C_Invoice_ID, get_TrxName());
// //
int no = to.copyLinesFrom (from, false, false); int no = to.copyLinesFrom (from, false, false, false);
// //
return "@Copied@=" + no; return "@Copied@=" + no;
} // doIt } // doIt

20
org.adempiere.base/src/org/compiere/model/MInvoice.java
View File

@ -68,7 +68,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
/** /**
* *
*/ */
private static final long serialVersionUID = -9210893813732918522L; private static final long serialVersionUID = -3191227310812025813L;
/** /**
* Get Payments Of BPartner * Get Payments Of BPartner
@ -725,7 +725,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
} }
m_lines = null; m_lines = null;
} // renumberLines } // renumberLines
/** /**
* Copy Lines From other Invoice. * Copy Lines From other Invoice.
* @param otherInvoice invoice * @param otherInvoice invoice
@ -733,7 +733,19 @@ public class MInvoice extends X_C_Invoice implements DocAction
* @param setOrder set order links * @param setOrder set order links
* @return number of lines copied * @return number of lines copied
*/ */
public int copyLinesFrom (MInvoice otherInvoice, boolean counter, boolean setOrder) public int copyLinesFrom (MInvoice otherInvoice, boolean counter, boolean setOrder){
return copyLinesFrom (otherInvoice, counter, setOrder, true);
}
/**
* Copy Lines From other Invoice.
* @param otherInvoice invoice
* @param counter create counter links
* @param setOrder set order links
* @param copyClientOrg copy also Client and Org
* @return number of lines copied
*/
public int copyLinesFrom (MInvoice otherInvoice, boolean counter, boolean setOrder, boolean copyClientOrg)
{ {
if (isProcessed() || isPosted() || otherInvoice == null) if (isProcessed() || isPosted() || otherInvoice == null)
return 0; return 0;
@ -743,7 +755,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
{ {
MInvoiceLine line = new MInvoiceLine (getCtx(), 0, get_TrxName()); MInvoiceLine line = new MInvoiceLine (getCtx(), 0, get_TrxName());
MInvoiceLine fromLine = fromLines[i]; MInvoiceLine fromLine = fromLines[i];
if (counter) // header if (counter || !copyClientOrg) // header
PO.copyValues (fromLine, line, getAD_Client_ID(), getAD_Org_ID()); PO.copyValues (fromLine, line, getAD_Client_ID(), getAD_Org_ID());
else else
PO.copyValues (fromLine, line, fromLine.getAD_Client_ID(), fromLine.getAD_Org_ID()); PO.copyValues (fromLine, line, fromLine.getAD_Client_ID(), fromLine.getAD_Org_ID());