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

Fixed [ 1867464 ] Incorrect Partner Location when create manual shipment 

http://sourceforge.net/tracker/index.php?func=detail&aid=1867464&group_id=176962&atid=879332
This commit is contained in:
vpj-cd 2008-01-09 05:46:45 +00:00
parent 863fdf174a
commit 3ccb80d06a
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
base/src/org/compiere/model/CalloutInOut.java
View File

@ -20,6 +20,7 @@ import java.math.*;
import java.sql.*; import java.sql.*;
import java.util.*; import java.util.*;
import java.util.logging.*; import java.util.logging.*;
import org.compiere.util.*; import org.compiere.util.*;
@ -28,6 +29,7 @@ import org.compiere.util.*;
* *
* @author Jorg Janke * @author Jorg Janke
* @version $Id: CalloutInOut.java,v 1.7 2006/07/30 00:51:05 jjanke Exp $ * @version $Id: CalloutInOut.java,v 1.7 2006/07/30 00:51:05 jjanke Exp $
* @author victor.perez@e-evolution.com www.e-evolution.com [ 1867464 ] http://sourceforge.net/tracker/index.php?func=detail&aid=1867464&group_id=176962&atid=879332
*/ */
public class CalloutInOut extends CalloutEngine public class CalloutInOut extends CalloutEngine
{ {
@ -71,6 +73,8 @@ public class CalloutInOut extends CalloutEngine
mTab.setValue("FreightAmt", order.getFreightAmt()); mTab.setValue("FreightAmt", order.getFreightAmt());
mTab.setValue("C_BPartner_ID", new Integer(order.getC_BPartner_ID())); mTab.setValue("C_BPartner_ID", new Integer(order.getC_BPartner_ID()));
//[ 1867464 ]
mTab.setValue("C_BPartner_Location_ID", new Integer(order.getC_BPartner_Location_ID())); mTab.setValue("C_BPartner_Location_ID", new Integer(order.getC_BPartner_Location_ID()));
mTab.setValue("AD_User_ID", new Integer(order.getAD_User_ID())); mTab.setValue("AD_User_ID", new Integer(order.getAD_User_ID()));
} }
@ -166,10 +170,6 @@ public class CalloutInOut extends CalloutEngine
if (C_BPartner_ID == null || C_BPartner_ID.intValue() == 0) if (C_BPartner_ID == null || C_BPartner_ID.intValue() == 0)
return ""; return "";
boolean IsSOTrx = "Y".equals(Env.getContext(ctx, WindowNo, "IsSOTrx"));
if (!IsSOTrx)
{
//When Is Receipt
String sql = "SELECT p.AD_Language,p.C_PaymentTerm_ID," String sql = "SELECT p.AD_Language,p.C_PaymentTerm_ID,"
+ "p.M_PriceList_ID,p.PaymentRule,p.POReference," + "p.M_PriceList_ID,p.PaymentRule,p.POReference,"
+ "p.SO_Description,p.IsDiscountPrinted," + "p.SO_Description,p.IsDiscountPrinted,"
@ -188,22 +188,26 @@ public class CalloutInOut extends CalloutEngine
BigDecimal bd; BigDecimal bd;
if (rs.next()) if (rs.next())
{ {
// Location //[ 1867464 ]
Integer ii = new Integer(rs.getInt("C_BPartner_Location_ID")); boolean IsSOTrx = Env.getContext(ctx, WindowNo, "IsSOTrx").equals("Y");
if (rs.wasNull()) if(!IsSOTrx)
mTab.setValue("C_BPartner_Location_ID", null); {
else // Location
mTab.setValue("C_BPartner_Location_ID", ii); Integer ii = new Integer(rs.getInt("C_BPartner_Location_ID"));
// Contact if (rs.wasNull())
ii = new Integer(rs.getInt("AD_User_ID")); mTab.setValue("C_BPartner_Location_ID", null);
if (rs.wasNull()) else
mTab.setValue("AD_User_ID", null); mTab.setValue("C_BPartner_Location_ID", ii);
else // Contact
mTab.setValue("AD_User_ID", ii); ii = new Integer(rs.getInt("AD_User_ID"));
if (rs.wasNull())
mTab.setValue("AD_User_ID", null);
else
mTab.setValue("AD_User_ID", ii);
}
//Bugs item #1679818: checking for SOTrx only //Bugs item #1679818: checking for SOTrx only
//boolean IsSOTrx = Env.getContext(ctx, WindowNo, "IsSOTrx").equals("Y"); //boolean IsSOTrx = Env.getContext(ctx, WindowNo, "IsSOTrx").equals("Y");
if (IsSOTrx) if (IsSOTrx)
{ {
// CreditAvailable // CreditAvailable
@ -222,11 +226,6 @@ public class CalloutInOut extends CalloutEngine
log.log(Level.SEVERE, sql, e); log.log(Level.SEVERE, sql, e);
return e.getLocalizedMessage(); return e.getLocalizedMessage();
} }
}
else
{
}
return ""; return "";
} // bpartner } // bpartner