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

IDEMPIERE-569 Ticket #1001758: Improve shipping configuration to support external services 

- sender's company name should retrieved from organization's name instead of description
- sender's contact name should retrieved from sales rep's name instead of description
This commit is contained in:
Elaine Tan 2013-08-01 18:50:27 +08:00
parent af722e2fd5
commit c70293cb50
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.adempiere.base/src/org/compiere/model/MShippingTransaction.java
View File

@ -319,7 +319,7 @@ public class MShippingTransaction extends X_M_ShippingTransaction
/* StringBuilder sql = new StringBuilder(); /* StringBuilder sql = new StringBuilder();
sql.append("SELECT CompanyName, ContactName, PhoneNumber, EMail, C_Location_ID "); sql.append("SELECT CompanyName, ContactName, PhoneNumber, EMail, C_Location_ID ");
sql.append("FROM X_ShippingSenderInfo_V "); sql.append("FROM M_ShippingSenderInfo_V ");
sql.append("WHERE M_ShippingTransaction_ID = ?"); sql.append("WHERE M_ShippingTransaction_ID = ?");
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
@ -355,8 +355,8 @@ public class MShippingTransaction extends X_M_ShippingTransaction
MWarehouse warehouse = new MWarehouse(getCtx(), getM_Warehouse_ID(), get_TrxName()); MWarehouse warehouse = new MWarehouse(getCtx(), getM_Warehouse_ID(), get_TrxName());
partyInfo = new PartyInfo(); partyInfo = new PartyInfo();
partyInfo.setCompanyName(sender.getDescription()); partyInfo.setCompanyName(sender.getName());
partyInfo.setContactName(senderContact.getDescription()); partyInfo.setContactName(senderContact.getName());
partyInfo.setPhoneNumber(sender.getInfo().getPhone()); partyInfo.setPhoneNumber(sender.getInfo().getPhone());
partyInfo.setEmail(senderContact.getEMail()); partyInfo.setEmail(senderContact.getEMail());
partyInfo.setLocationId(warehouse.getC_Location_ID()); partyInfo.setLocationId(warehouse.getC_Location_ID());
@ -376,7 +376,7 @@ public class MShippingTransaction extends X_M_ShippingTransaction
/* StringBuilder sql = new StringBuilder(); /* StringBuilder sql = new StringBuilder();
sql.append("SELECT CompanyName, ContactName, PhoneNumber, EMail, C_Location_ID "); sql.append("SELECT CompanyName, ContactName, PhoneNumber, EMail, C_Location_ID ");
sql.append("FROM X_ShippingRecipientInfo_V "); sql.append("FROM M_ShippingRecipientInfo_V ");
sql.append("WHERE M_ShippingTransaction_ID = ?"); sql.append("WHERE M_ShippingTransaction_ID = ?");
PreparedStatement pstmt = null; PreparedStatement pstmt = null;