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

Merge 574380d24685

This commit is contained in:
Heng Sin Low 2013-04-26 21:00:38 +08:00
parent 1490253871 8c47a32a69
commit d6086f7df5
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,7 +319,7 @@ public class MPackage extends X_M_Package
if (line.getM_PackageMPS_ID() == 0)
continue;
MPackageMPS packageMPS = new MPackageMPS(getCtx(), line.getM_PackageMPS_ID(), get_TrxName());
MPackageMPS packageMPS = new MPackageMPS(getCtx(), line.getM_PackageMPS_ID(), null);
packageMPS.setMasterTrackingNo(line.getMasterTrackingNo());
packageMPS.setTrackingNo(line.getTrackingNo());
packageMPS.setPrice(line.getPrice());
@ -369,11 +369,13 @@ public class MPackage extends X_M_Package
log.log(Level.SEVERE, "processOnline", e);
setErrorMessage(Msg.getMsg(Env.getCtx(), "ShippingNotProcessed") + ": " + e.getMessage());
}
if (trx != null)
{
trx.commit();
trx.close();
finally
{
if (trx != null)
{
trx.commit();
trx.close();
}
}
return ok;

2
org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/Process.java
View File

@ -342,6 +342,7 @@ public class Process {
if (!processOK || pi.isError())
{
r.setSummary(pi.getSummary());
r.setError(pi.getSummary());
r.setLogInfo(pi.getLogInfo(true));
r.setIsError( true );
processOK = false;
@ -349,6 +350,7 @@ public class Process {
else
{
r.setSummary(pi.getSummary());
r.setError(pi.getSummary());
r.setLogInfo(pi.getLogInfo(true));
r.setIsError( false );
}