From 30a05b22600b9b77927a7339397cd951c11abce8 Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Tue, 16 Apr 2013 16:00:42 +0800 Subject: [PATCH] IDEMPIERE-861 Online Shipment Process for International Shipment --- .../src/org/compiere/model/MPackage.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MPackage.java b/org.adempiere.base/src/org/compiere/model/MPackage.java index cc3c0c551c..093e16b945 100644 --- a/org.adempiere.base/src/org/compiere/model/MPackage.java +++ b/org.adempiere.base/src/org/compiere/model/MPackage.java @@ -443,11 +443,23 @@ public class MPackage extends X_M_Package sb.append("FROM M_InOutLine "); sb.append("WHERE M_InOut_ID = ?) "); sb.append("ORDER BY C_OrderLine_ID DESC"); - int C_Invoice_ID = DB.getSQLValue(get_TrxName(), sb.toString(), getM_InOut_ID()); - if (C_Invoice_ID > 0) - invoice = new MInvoice(getCtx(), C_Invoice_ID, get_TrxName()); + int C_Order_ID = DB.getSQLValue(get_TrxName(), sb.toString(), getM_InOut_ID()); + if (C_Order_ID > 0) + 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());