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

IDEMPIERE-2746 Invoice (customer) doesnt load Sales Rep from Business Partner

This commit is contained in:
tsvikruha 2015-08-03 08:25:10 +02:00
parent 6fc6bef52c
commit b493a2567d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,7 @@ public class CalloutInvoice extends CalloutEngine
+ " p.SO_Description,p.IsDiscountPrinted," + " p.SO_Description,p.IsDiscountPrinted,"
+ " p.SO_CreditLimit, p.SO_CreditLimit-p.SO_CreditUsed AS CreditAvailable," + " p.SO_CreditLimit, 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,"
+ " COALESCE(p.PO_PriceList_ID,g.PO_PriceList_ID) AS PO_PriceList_ID, p.PaymentRulePO,p.PO_PaymentTerm_ID " + " COALESCE(p.PO_PriceList_ID,g.PO_PriceList_ID) AS PO_PriceList_ID, p.PaymentRulePO,p.PO_PaymentTerm_ID, p.SalesRep_ID "
+ "FROM C_BPartner p" + "FROM C_BPartner p"
+ " INNER JOIN C_BP_Group g ON (p.C_BP_Group_ID=g.C_BP_Group_ID)" + " INNER JOIN C_BP_Group g ON (p.C_BP_Group_ID=g.C_BP_Group_ID)"
+ " LEFT OUTER JOIN C_BPartner_Location l ON (p.C_BPartner_ID=l.C_BPartner_ID AND l.IsBillTo='Y' AND l.IsActive='Y')" + " LEFT OUTER JOIN C_BPartner_Location l ON (p.C_BPartner_ID=l.C_BPartner_ID AND l.IsBillTo='Y' AND l.IsActive='Y')"
@ -151,6 +151,13 @@ public class CalloutInvoice extends CalloutEngine
// //
if (rs.next()) if (rs.next())
{ {
// Sales Rep - If BP has a default SalesRep then default it
Integer salesRep = rs.getInt("SalesRep_ID");
if (IsSOTrx && salesRep != 0 )
{
mTab.setValue("SalesRep_ID", salesRep);
}
// PriceList & IsTaxIncluded & Currency // PriceList & IsTaxIncluded & Currency
Integer ii = new Integer(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID")); Integer ii = new Integer(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID"));
if (!rs.wasNull()) if (!rs.wasNull())