From f6a4dc5b8894068d289209ccacd09761a0f53104 Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Thu, 27 Dec 2012 18:59:13 +0800 Subject: [PATCH] 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 --- .../oracle/201212271855_TICKET-1001758.sql | 12 ++++++++++++ .../postgresql/201212271855_TICKET-1001758.sql | 12 ++++++++++++ .../src/org/compiere/model/MPackage.java | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 migration/i1.0a-release/oracle/201212271855_TICKET-1001758.sql create mode 100644 migration/i1.0a-release/postgresql/201212271855_TICKET-1001758.sql diff --git a/migration/i1.0a-release/oracle/201212271855_TICKET-1001758.sql b/migration/i1.0a-release/oracle/201212271855_TICKET-1001758.sql new file mode 100644 index 0000000000..0cab5acd26 --- /dev/null +++ b/migration/i1.0a-release/oracle/201212271855_TICKET-1001758.sql @@ -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 +; \ No newline at end of file diff --git a/migration/i1.0a-release/postgresql/201212271855_TICKET-1001758.sql b/migration/i1.0a-release/postgresql/201212271855_TICKET-1001758.sql new file mode 100644 index 0000000000..0f3cde6e16 --- /dev/null +++ b/migration/i1.0a-release/postgresql/201212271855_TICKET-1001758.sql @@ -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 +; \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/MPackage.java b/org.adempiere.base/src/org/compiere/model/MPackage.java index 0d4a8a2154..cc3c0c551c 100644 --- a/org.adempiere.base/src/org/compiere/model/MPackage.java +++ b/org.adempiere.base/src/org/compiere/model/MPackage.java @@ -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());