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

IDEMPIERE-514 Match Invoice not created automatically for multiple receipts on single purchase order line

This commit is contained in:
Heng Sin Low 2012-12-03 18:18:09 +08:00
parent e5658fad56
commit b6fd81b23c
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1825,16 +1825,19 @@ public class MInvoice extends X_C_Invoice implements DocAction
MMatchPO po = MMatchPO.create (line, null, MMatchPO po = MMatchPO.create (line, null,
getDateInvoiced(), matchQty); getDateInvoiced(), matchQty);
boolean isNewMatchPO = false; boolean isNewMatchPO = false;
if (po.get_ID() == 0) if (po != null)
isNewMatchPO = true;
if (!po.save(get_TrxName()))
{ {
m_processMsg = "Could not create PO Matching"; if (po.get_ID() == 0)
return DocAction.STATUS_Invalid; isNewMatchPO = true;
if (!po.save(get_TrxName()))
{
m_processMsg = "Could not create PO Matching";
return DocAction.STATUS_Invalid;
}
matchPO++;
if (isNewMatchPO)
addDocsPostProcess(po);
} }
matchPO++;
if (isNewMatchPO)
addDocsPostProcess(po);
} }
} }

10
org.adempiere.ui/src/org/compiere/grid/CreateFromInvoice.java
View File

@ -474,11 +474,11 @@ public abstract class CreateFromInvoice extends CreateFrom
break; break;
} }
} }
if (inoutLine == null) // if (inoutLine == null)
{ // {
inoutLine = lines[0]; // first as default // inoutLine = lines[0]; // first as default
M_InOutLine_ID = inoutLine.getM_InOutLine_ID(); // M_InOutLine_ID = inoutLine.getM_InOutLine_ID();
} // }
} }
} }
else if (M_RMALine_ID != 0) else if (M_RMALine_ID != 0)