From 2159c78d5d425ab871986d02cbc77f7e01617b6e Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 21 Apr 2015 15:57:46 -0500 Subject: [PATCH] IDEMPIERE-2589 Generate PO From Sales Order function and deliveryviarule field inconsistencies / based on patch provided by Redhuan (red1) --- .../src/org/compiere/process/OrderPOCreate.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/org.adempiere.base.process/src/org/compiere/process/OrderPOCreate.java b/org.adempiere.base.process/src/org/compiere/process/OrderPOCreate.java index 1d8f4943de..7e01ffc1d0 100644 --- a/org.adempiere.base.process/src/org/compiere/process/OrderPOCreate.java +++ b/org.adempiere.base.process/src/org/compiere/process/OrderPOCreate.java @@ -283,13 +283,14 @@ public class OrderPOCreate extends SvrProcess if ( p_IsDropShip ) { po.setIsDropShip(p_IsDropShip); - + po.setDeliveryViaRule(so.getDeliveryViaRule()); + po.setM_Shipper_ID(so.getM_Shipper_ID()); + if (so.isDropShip() && so.getDropShip_BPartner_ID() != 0 ) { po.setDropShip_BPartner_ID(so.getDropShip_BPartner_ID()); po.setDropShip_Location_ID(so.getDropShip_Location_ID()); po.setDropShip_User_ID(so.getDropShip_User_ID()); - } - else { + } else { po.setDropShip_BPartner_ID(so.getC_BPartner_ID()); po.setDropShip_Location_ID(so.getC_BPartner_Location_ID()); po.setDropShip_User_ID(so.getAD_User_ID());