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

IDEMPIERE-861 Online Shipment Process for International Shipment

This commit is contained in:
Elaine Tan 2013-04-16 16:00:42 +08:00
parent 9c8f5b7363
commit 30a05b2260
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
org.adempiere.base/src/org/compiere/model/MPackage.java
View File

@ -443,11 +443,23 @@ public class MPackage extends X_M_Package
sb.append("FROM M_InOutLine "); sb.append("FROM M_InOutLine ");
sb.append("WHERE M_InOut_ID = ?) "); sb.append("WHERE M_InOut_ID = ?) ");
sb.append("ORDER BY C_OrderLine_ID DESC"); sb.append("ORDER BY C_OrderLine_ID DESC");
int C_Invoice_ID = DB.getSQLValue(get_TrxName(), sb.toString(), getM_InOut_ID()); int C_Order_ID = DB.getSQLValue(get_TrxName(), sb.toString(), getM_InOut_ID());
if (C_Invoice_ID > 0) if (C_Order_ID > 0)
invoice = new MInvoice(getCtx(), C_Invoice_ID, get_TrxName()); order = new MOrder(getCtx(), C_Order_ID, get_TrxName());
} }
} }
if (invoice == null && order != null)
{
StringBuilder sb = new StringBuilder();
sb.append("SELECT C_Invoice_ID ");
sb.append("FROM C_Invoice ");
sb.append("WHERE C_Order_ID = ? ");
sb.append("ORDER BY C_Invoice_ID DESC");
int C_Invoice_ID = DB.getSQLValue(get_TrxName(), sb.toString(), order.getC_Order_ID());
if (C_Invoice_ID > 0)
invoice = new MInvoice(getCtx(), C_Invoice_ID, get_TrxName());
}
} }
MClientInfo ci = MClientInfo.get(getCtx(), getAD_Client_ID(), get_TrxName()); MClientInfo ci = MClientInfo.get(getCtx(), getAD_Client_ID(), get_TrxName());