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

Ticket #1001758: FedEx & UPS - Get Contact/User from order if shipment's Contact/User is not defined and fix the description of create package process

This commit is contained in:
Elaine Tan 2012-12-27 18:59:13 +08:00
parent 679b9ca1f9
commit f6a4dc5b88
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
migration/i1.0a-release/oracle/201212271855_TICKET-1001758.sql Normal file
View File

@ -0,0 +1,12 @@
-- Dec 27, 2012 6:53:37 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process SET Description='Create Package for Shipment',Updated=TO_DATE('2012-12-27 18:53:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=282
;
-- Dec 27, 2012 6:53:37 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Trl SET IsTranslated='N' WHERE AD_Process_ID=282
;
SELECT register_migration_script('201212271855_TICKET-1001758.sql') FROM dual
;

12
migration/i1.0a-release/postgresql/201212271855_TICKET-1001758.sql Normal file
View File

@ -0,0 +1,12 @@
-- Dec 27, 2012 6:53:37 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process SET Description='Create Package for Shipment',Updated=TO_TIMESTAMP('2012-12-27 18:53:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=282
;
-- Dec 27, 2012 6:53:37 PM SGT
-- Ticket 1001758: FedEx & UPS
UPDATE AD_Process_Trl SET IsTranslated='N' WHERE AD_Process_ID=282
;
SELECT register_migration_script('201212271855_TICKET-1001758.sql') FROM dual
;

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

@ -482,7 +482,7 @@ public class MPackage extends X_M_Package
st.setAction(action);
st.setAD_Client_ID(getAD_Client_ID());
st.setAD_Org_ID(getAD_Org_ID());
st.setAD_User_ID(ioOut.getAD_User_ID());
st.setAD_User_ID(ioOut.getAD_User_ID() > 0 ? ioOut.getAD_User_ID() : order.getAD_User_ID());
st.setBill_Location_ID(getC_BPartner_Location_ID());
st.setBoxCount(getBoxCount());
st.setC_BP_ShippingAcct_ID(getC_BP_ShippingAcct_ID());