midsuit
/
core-jgi
1
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:30:47 +00:00
parent bca948a704
commit 863fdf174a
1 changed files with 58 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,6 +71,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()));
mTab.setValue("C_BPartner_Location_ID", new Integer(order.getC_BPartner_Location_ID()));
mTab.setValue("AD_User_ID", new Integer(order.getAD_User_ID()));
} }
return ""; return "";
} // order } // order
@ -164,13 +166,17 @@ 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,"
+ "p.SO_CreditLimit-p.SO_CreditUsed AS CreditAvailable," + "p.SO_CreditLimit-p.SO_CreditUsed AS CreditAvailable,"
+ "l.C_BPartner_Location_ID,c.AD_User_ID " + "l.C_BPartner_Location_ID,c.AD_User_ID "
+ "FROM C_BPartner p, C_BPartner_Location l, AD_User c " + "FROM C_BPartner p, C_BPartner_Location l, AD_User c "
+ "WHERE p.C_BPartner_ID=l.C_BPartner_ID(+)" + "WHERE l.IsActive='Y' AND p.C_BPartner_ID=l.C_BPartner_ID(+)"
+ " AND p.C_BPartner_ID=c.C_BPartner_ID(+)" + " AND p.C_BPartner_ID=c.C_BPartner_ID(+)"
+ " AND p.C_BPartner_ID=?"; // 1 + " AND p.C_BPartner_ID=?"; // 1
@ -196,7 +202,8 @@ public class CalloutInOut extends CalloutEngine
mTab.setValue("AD_User_ID", ii); 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
@ -215,6 +222,11 @@ 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