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

IDEMPIERE-861 Online Shipment Process for International Shipment - save the shipping transaction record after process online

This commit is contained in:
Elaine Tan 2013-04-18 19:43:13 +08:00
parent 305a23403a
commit b542f8393e
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.adempiere.base/src/org/adempiere/process/SalesOrderRateInquiryProcess.java
View File

@ -38,7 +38,6 @@ import org.compiere.model.MUOM;
import org.compiere.process.ProcessInfoLog; import org.compiere.process.ProcessInfoLog;
import org.compiere.process.ProcessInfoParameter; import org.compiere.process.ProcessInfoParameter;
import org.compiere.process.SvrProcess; 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; boolean ok = false;
MShippingTransaction st = null; MShippingTransaction st = null;
try try
{ {
st = createShippingTransaction(getCtx(), m_order, MShippingTransaction.ACTION_RateInquiry, p_IsPriviledgedRate, get_TrxName()); st = createShippingTransaction(getCtx(), m_order, MShippingTransaction.ACTION_RateInquiry, p_IsPriviledgedRate, get_TrxName());
ok = st.processOnline(); ok = st.processOnline();
st.saveEx();
} }
catch (Exception e) catch (Exception e)
{ {
log.log(Level.SEVERE, "processOnline", e); log.log(Level.SEVERE, "processOnline", e);
} }
if (trx != null)
{
trx.commit();
trx.close();
}
if (ok) if (ok)
{ {
MOrderLine freightLine = null; MOrderLine freightLine = null;

9
org.adempiere.base/src/org/compiere/model/MOrder.java
View File

@ -44,7 +44,6 @@ import org.compiere.process.ServerProcessCtl;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg; import org.compiere.util.Msg;
import org.compiere.util.Trx;
import org.compiere.util.Util; import org.compiere.util.Util;
import org.eevolution.model.MPPProductBOM; import org.eevolution.model.MPPProductBOM;
import org.eevolution.model.MPPProductBOMLine; 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; boolean ok = false;
MShippingTransaction st = null; MShippingTransaction st = null;
try try
{ {
st = SalesOrderRateInquiryProcess.createShippingTransaction(getCtx(), this, MShippingTransaction.ACTION_RateInquiry, isPriviledgedRate(), get_TrxName()); st = SalesOrderRateInquiryProcess.createShippingTransaction(getCtx(), this, MShippingTransaction.ACTION_RateInquiry, isPriviledgedRate(), get_TrxName());
ok = st.processOnline(); ok = st.processOnline();
st.saveEx();
} }
catch (Exception e) catch (Exception e)
{ {
log.log(Level.SEVERE, "processOnline", e); log.log(Level.SEVERE, "processOnline", e);
} }
if (trx != null)
{
trx.commit();
trx.close();
}
if (ok) if (ok)
{ {
if (freightLine == null) if (freightLine == null)

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

@ -282,6 +282,7 @@ public class MPackage extends X_M_Package
{ {
MShippingTransaction st = createShippingTransaction(action, isPriviledgedRate, trx.getTrxName()); MShippingTransaction st = createShippingTransaction(action, isPriviledgedRate, trx.getTrxName());
ok = st.processOnline(); ok = st.processOnline();
st.saveEx();
if (action.equals(MShippingTransaction.ACTION_ProcessShipment)) if (action.equals(MShippingTransaction.ACTION_ProcessShipment))
{ {