From b542f8393ef997248a1fba6fde4262b4c6d5867a Mon Sep 17 00:00:00 2001
From: Elaine Tan <etan@trekglobal.com>
Date: Thu, 18 Apr 2013 19:43:13 +0800
Subject: [PATCH] IDEMPIERE-861 Online Shipment Process for International
 Shipment - save the shipping transaction record after process online

---
 .../adempiere/process/SalesOrderRateInquiryProcess.java  | 9 +--------
 org.adempiere.base/src/org/compiere/model/MOrder.java    | 9 +--------
 org.adempiere.base/src/org/compiere/model/MPackage.java  | 1 +
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/org.adempiere.base/src/org/adempiere/process/SalesOrderRateInquiryProcess.java b/org.adempiere.base/src/org/adempiere/process/SalesOrderRateInquiryProcess.java
index e732b3964e..d64de5189f 100644
--- a/org.adempiere.base/src/org/adempiere/process/SalesOrderRateInquiryProcess.java
+++ b/org.adempiere.base/src/org/adempiere/process/SalesOrderRateInquiryProcess.java
@@ -38,7 +38,6 @@ import org.compiere.model.MUOM;
 import org.compiere.process.ProcessInfoLog;
 import org.compiere.process.ProcessInfoParameter;
 import org.compiere.process.SvrProcess;
-import org.compiere.util.Trx;
 
 /**
  * 
@@ -100,25 +99,19 @@ public class SalesOrderRateInquiryProcess extends SvrProcess
 			}
 		}
 		
-		Trx trx = Trx.get(Trx.createTrxName("spt-"), true);
 		boolean ok = false;
 		MShippingTransaction st = null;
 		try
 		{			
 			st = createShippingTransaction(getCtx(), m_order, MShippingTransaction.ACTION_RateInquiry, p_IsPriviledgedRate, get_TrxName());
 			ok = st.processOnline();
+			st.saveEx();
 		}
 		catch (Exception e)
 		{
 			log.log(Level.SEVERE, "processOnline", e);
 		}
 		
-		if (trx != null)
-		{
-			trx.commit();
-			trx.close();
-		}
-		
 		if (ok)
 		{
 			MOrderLine freightLine = null;
diff --git a/org.adempiere.base/src/org/compiere/model/MOrder.java b/org.adempiere.base/src/org/compiere/model/MOrder.java
index 6ec34c99e1..e71c3fcf75 100644
--- a/org.adempiere.base/src/org/compiere/model/MOrder.java
+++ b/org.adempiere.base/src/org/compiere/model/MOrder.java
@@ -44,7 +44,6 @@ import org.compiere.process.ServerProcessCtl;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
-import org.compiere.util.Trx;
 import org.compiere.util.Util;
 import org.eevolution.model.MPPProductBOM;
 import org.eevolution.model.MPPProductBOMLine;
@@ -1503,25 +1502,19 @@ public class MOrder extends X_C_Order implements DocAction
 				}
 			}
 			
-			Trx trx = Trx.get(Trx.createTrxName("spt-"), true);
 			boolean ok = false;
 			MShippingTransaction st = null;
 			try
 			{			
 				st = SalesOrderRateInquiryProcess.createShippingTransaction(getCtx(), this, MShippingTransaction.ACTION_RateInquiry, isPriviledgedRate(), get_TrxName());
 				ok = st.processOnline();
+				st.saveEx();
 			}
 			catch (Exception e)
 			{
 				log.log(Level.SEVERE, "processOnline", e);
 			}
 			
-			if (trx != null)
-			{
-				trx.commit();
-				trx.close();
-			}
-			
 			if (ok)
 			{
 				if (freightLine == null)
diff --git a/org.adempiere.base/src/org/compiere/model/MPackage.java b/org.adempiere.base/src/org/compiere/model/MPackage.java
index c8783ba573..78f02a211b 100644
--- a/org.adempiere.base/src/org/compiere/model/MPackage.java
+++ b/org.adempiere.base/src/org/compiere/model/MPackage.java
@@ -282,6 +282,7 @@ public class MPackage extends X_M_Package
 		{			
 			MShippingTransaction st = createShippingTransaction(action, isPriviledgedRate, trx.getTrxName());
 			ok = st.processOnline();
+			st.saveEx();
 			
 			if (action.equals(MShippingTransaction.ACTION_ProcessShipment))
 			{