Ticket #1001758: FedEx & UPS

org.adempiere.base.callout/src/org/compiere/model/CalloutPackage.java

@@ -0,0 +1,167 @@
+package org.compiere.model;
+
+import java.util.Properties;
+
+import org.adempiere.util.ShippingUtil;
+import org.compiere.util.Env;
+
+/**
+ * User: cruiz - idalica
+ * Date: Apr 16, 2008
+ * <p/>
+ * Packages - Callouts
+ */
+public class CalloutPackage extends CalloutEngine
+{
+    public String afterShipper(Properties ctx, int windowNo, GridTab mTab, GridField mField, Object value, Object oldValue)
+    {
+        if (isCalloutActive())
+            return "";
+
+        int inout_id = Env.getContextAsInt(ctx, windowNo, "M_InOut_ID");
+        if (inout_id > 0) 
+        {
+        	String shipperAccount = null;
+        	String dutiesShipperAccount = null;
+        	MInOut inout = new MInOut(ctx, inout_id, null);
+
+        	if (inout.getFreightCharges().equals(MInOut.FREIGHTCHARGES_Prepaid) || inout.getFreightCharges().equals(MInOut.FREIGHTCHARGES_PrepaidAndBill)) 
+        	{
+        		// 2. For charging to Velocity
+        		// ** If M_InOut.FreightCharges In ( D_PP, E_PPB)  -- prepaid or prepaid and bill
+        		// --  then set M_Package.ShipperAccount = C_BP_ShippingAcct.ShipperAccount
+        		// Where C_BP_ShippingAcct.C_BPartner_ID = M_Shipper.C_BPartner_ID  AND M_Package.AD_Org_ID= C_BP_ShippingAcct.AD_Org_ID
+                int shipper_id = Env.getContextAsInt(ctx, windowNo, "M_Shipper_ID");
+                if (shipper_id > 0) 
+                {
+                    int org_id = Env.getContextAsInt(ctx, windowNo, "AD_Org_ID");
+                    shipperAccount = ShippingUtil.getSenderShipperAccount(shipper_id, org_id);
+                    dutiesShipperAccount = ShippingUtil.getSenderDutiesShipperAccount(shipper_id, org_id);
+                }
+        	} 
+        	else 
+        	{
+        		// 1.  For charging the customers account
+        		// ** If M_InOut.FreightCharges  Not In ( D_PP, E_PPB)  -- prepaid or prepaid and bill
+        		// -- then set M_Package.ShipperAccount = M_InOut.ShipAcctNo
+        		shipperAccount = inout.getShipperAccount();
+        	}
+
+        	if (shipperAccount != null)
+        		mTab.setValue(MPackage.COLUMNNAME_ShipperAccount, shipperAccount);
+        	if (dutiesShipperAccount != null)
+        		mTab.setValue(MPackage.COLUMNNAME_DutiesShipperAccount, dutiesShipperAccount);
+        }
+
+        return "";
+    }
+
+    public String afterShipperSetDefaults(Properties ctx, int windowNo, GridTab mTab, GridField mField, Object value, Object oldValue)
+    {
+        if (isCalloutActive())
+            return "";
+
+        // value is M_Shipper_ID
+        if (value != null && ((Integer)value).intValue() > 0) 
+        {
+        	int shipper_id = ((Integer)value).intValue();
+
+/*        	if(value != oldValue)
+        	{
+	        	if (Ini.isClient())
+				{
+	        		try
+	                {
+	                    Class cl = Class.forName("org.compiere.apps.ADialog");
+	                    Class paramTypes[] = {int.class, Container.class, String.class, String.class};
+	                    Object params[] = {windowNo, Env.getWindow(windowNo), "Update Shipment Method", "Are you sure you want to apply this Shipment Method to the Shipment?"};
+	                    Method method = cl.getDeclaredMethod("ask", paramTypes);
+	                    Boolean ok = (Boolean) method.invoke(null, params);
+	                    
+	                    if(!ok)
+		                {
+		                    // don't update the shipper of shipment record but continue with default values setting
+		                    //return "";
+		                }
+		                else
+		                {
+		                    int inout_id = Env.getContextAsInt(ctx, windowNo, "M_InOut_ID");
+		                    String sql = "update M_InOut set M_Shipper_ID=? where M_InOut_ID=?";
+		                    DB.executeUpdate(sql, new Object[] { shipper_id, inout_id }, false, null);
+		                }
+	                }
+	                catch (Exception ex)
+	                {
+	                	throw new AdempiereException(ex);
+	                }
+				}
+				else
+				{
+					try
+					{
+						ClassLoader loader = Thread.currentThread().getContextClassLoader();
+						if (loader == null)
+							loader = this.getClass().getClassLoader();
+		    	    	Class<?> clazz = loader.loadClass("org.adempiere.webui.window.FDialog");
+		    	    	Class<?> clazz1 = loader.loadClass("org.zkoss.zk.ui.Component");
+		    		      
+		    	    	Method m = clazz.getMethod("ask", Integer.TYPE, clazz1, String.class, String.class);
+		    	    	Boolean returnCode = (Boolean)m.invoke(null, 0, null, "Update Shipment Method",
+                                "Are you sure you want to apply this Shipment Method to the Shipment?");
+		    		    
+		    	    	if(!returnCode)
+		                {
+		                    // don't update the shipper of shipment record but continue with default values setting
+		                    //return "";		    	    		
+		                }
+		    	    	else
+		    	    	{
+		    	    		int inout_id = Env.getContextAsInt(ctx, windowNo, "M_InOut_ID");
+		                    String sql = "update M_InOut set M_Shipper_ID=? where M_InOut_ID=?";
+		                    DB.executeUpdate(sql, new Object[] { shipper_id, inout_id }, false, null);
+		    	    	}
+					} 
+					catch (Exception e)
+					{
+						throw new AdempiereException(e);
+					}
+				}
+            }
+*/        
+        	String whereClause = "M_Shipper_ID = " + shipper_id + " AND IsDefault='Y' AND IsActive='Y'";
+    		int[] ids = MShipperLabels.getAllIDs(MShipperLabels.Table_Name, whereClause, null);
+    		if (ids.length > 0)
+    			mTab.setValue(MPackage.COLUMNNAME_M_ShipperLabels_ID, ids[0]);
+
+    		ids = MShipperPackaging.getAllIDs(MShipperPackaging.Table_Name, whereClause, null);
+    		if (ids.length > 0)
+    			mTab.setValue(MPackage.COLUMNNAME_M_ShipperPackaging_ID, ids[0]);
+
+    		ids = MShipperPickupTypes.getAllIDs(MShipperPickupTypes.Table_Name, whereClause, null);
+    		if (ids.length > 0)
+    			mTab.setValue(MPackage.COLUMNNAME_M_ShipperPickupTypes_ID, ids[0]);
+
+            // Get the business partner location for shipper account
+            // First try to get c_bpartner_location_id from C_BP_ShippingAcct
+            int c_bpartner_id = Env.getContextAsInt(ctx, windowNo, "C_BPartner_ID");
+            int ad_org_id = Env.getContextAsInt(ctx, windowNo, "AD_Org_ID");
+            int inout_id = Env.getContextAsInt(ctx, windowNo, "M_InOut_ID");
+            int accountLocationId = ShippingUtil.findRecipientAccountLocationId(shipper_id, c_bpartner_id, ad_org_id, inout_id, 0);
+            // Assign it if found
+            if (accountLocationId > 0)
+                mTab.setValue(MPackage.COLUMNNAME_C_BPartner_Location_ID, accountLocationId);
+
+            if (shipper_id > 0)
+            {
+            	MShipper shipper = new MShipper(ctx, shipper_id, null);
+
+            	mTab.setValue(MPackage.COLUMNNAME_TrackingInfo, shipper.getTrackingURL());
+            	mTab.setValue(MPackage.COLUMNNAME_IsResidential, shipper.isResidential());
+            	mTab.setValue(MPackage.COLUMNNAME_IsSaturdayDelivery, shipper.isSaturdayDelivery());
+            }
+        }
+
+        return "";
+    }
+    
+}

org.adempiere.base.callout/src/org/compiere/model/CalloutShipper.java

@@ -0,0 +1,89 @@
+/******************************************************************************
+ * Copyright (C) 2012 Elaine Tan                                              *
+ * Copyright (C) 2012 Trek Global
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.util.Properties;
+
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+
+/**
+ * 
+ * @author Elaine
+ *
+ */
+public class CalloutShipper extends CalloutEngine
+{
+	public String shipper(Properties ctx, int WindowNo, GridTab mTab, GridField mField, Object value)
+	{
+		Integer X_Shipper_ID = (Integer)value;
+		if (X_Shipper_ID == null || X_Shipper_ID.intValue() == 0)
+			return "";
+		
+		StringBuilder sb = new StringBuilder();
+		sb.append("SELECT sp.M_ShippingProcessor_ID ");
+		sb.append("FROM M_ShippingProcessor sp, X_ShippingProcessor xsp, X_Shipper xs ");
+		sb.append("WHERE sp.X_ShippingProcessor_ID = xsp.X_ShippingProcessor_ID ");
+		sb.append("AND xsp.X_ShippingProcessor_ID = xs.X_ShippingProcessor_ID ");
+		sb.append("AND sp.IsActive = 'Y' ");
+		sb.append("AND sp.AD_Client_ID = ? ");
+		sb.append("AND sp.AD_Org_ID IN (0, ?) ");
+		sb.append("AND xs.X_Shipper_ID = ? ");
+		sb.append("ORDER BY sp.AD_Org_ID DESC");
+
+		int M_ShippingProcessor_ID = DB.getSQLValue(null, sb.toString(), Env.getAD_Client_ID(ctx), Env.getAD_Org_ID(ctx), X_Shipper_ID);
+		if (M_ShippingProcessor_ID > 0)
+			mTab.setValue(MShipper.COLUMNNAME_M_ShippingProcessor_ID, M_ShippingProcessor_ID);
+		
+		return null;
+	}
+	
+	public String shipperLabels(Properties ctx, int WindowNo, GridTab mTab, GridField mField, Object value)
+	{
+		Integer X_ShipperLabels_ID = (Integer)value;
+		if (X_ShipperLabels_ID == null || X_ShipperLabels_ID.intValue() == 0)
+			return "";
+		
+		X_X_ShipperLabels sl = new X_X_ShipperLabels(ctx, X_ShipperLabels_ID, null);
+		mTab.setValue(MShipperLabels.COLUMNNAME_LabelPrintMethod, sl.getLabelPrintMethod());
+		mTab.setValue(MShipperLabels.COLUMNNAME_IsDefault, sl.isDefault());
+		
+		return null;		
+	}
+	
+	public String shipperPackaging(Properties ctx, int WindowNo, GridTab mTab, GridField mField, Object value)
+	{
+		Integer X_ShipperPackaging_ID = (Integer)value;
+		if (X_ShipperPackaging_ID == null || X_ShipperPackaging_ID.intValue() == 0)
+			return "";
+		
+		X_X_ShipperPackaging sp = new X_X_ShipperPackaging(ctx, X_ShipperPackaging_ID, null);
+		mTab.setValue(MShipperPackaging.COLUMNNAME_IsDefault, sp.isDefault());
+		mTab.setValue(MShipperPackaging.COLUMNNAME_Weight, sp.getWeight());
+		
+		return null;
+	}
+	
+	public String shipperPickupTypes(Properties ctx, int WindowNo, GridTab mTab, GridField mField, Object value)
+	{
+		Integer X_ShipperPickupTypes_ID = (Integer)value;
+		if (X_ShipperPickupTypes_ID == null || X_ShipperPickupTypes_ID.intValue() == 0)
+			return "";
+		
+		X_X_ShipperPickupTypes spt = new X_X_ShipperPickupTypes(ctx, X_ShipperPickupTypes_ID, null);
+		mTab.setValue(MShipperLabels.COLUMNNAME_IsDefault, spt.isDefault());
+		
+		return null;
+	}
+}

org.adempiere.base.process/src/org/compiere/process/PackageCreate.java

@@ -34,6 +34,8 @@ public class PackageCreate extends SvrProcess
 	private int		p_M_Shipper_ID = 0;
 	/** Parent				*/
 	private int		p_M_InOut_ID = 0;
+	/** No of Packages 		*/
+	private int 	p_no_of_packages = 0;
 	
 
 	/**
@@ -51,6 +53,8 @@ public class PackageCreate extends SvrProcess
 				p_M_Shipper_ID = para[i].getParameterAsInt();
 			else if (name.equals("M_InOut_ID")) // BF [ 1754889 ] Create Package error
 				p_M_InOut_ID = para[i].getParameterAsInt();
+			else if (name.equals("NoOfPackages"))
+				p_no_of_packages = para[i].getParameterAsInt();
 			else
 				log.log(Level.SEVERE, "prepare - Unknown Parameter: " + name);
 		}
@@ -74,6 +78,7 @@ public class PackageCreate extends SvrProcess
 			throw new IllegalArgumentException("No Shipment");
 		if (p_M_Shipper_ID == 0)
 			throw new IllegalArgumentException("No Shipper");
+		
 		MInOut shipment = new MInOut (getCtx(), p_M_InOut_ID, null);
 		if (shipment.get_ID() != p_M_InOut_ID)
 			throw new IllegalArgumentException("Cannot find Shipment ID=" + p_M_InOut_ID);
@@ -82,9 +87,29 @@ public class PackageCreate extends SvrProcess
 			throw new IllegalArgumentException("Cannot find Shipper ID=" + p_M_InOut_ID);
 		//
 		
-		MPackage pack = MPackage.create (shipment, shipper, null);
+		if (p_no_of_packages == 0)
+			p_no_of_packages = shipment.getNoPackages();
+		if (p_no_of_packages <= 0)
+			throw new IllegalArgumentException("No of Packages should not be 0");
 		
-		return pack.getDocumentNo();
+		StringBuilder info = new StringBuilder();
+		if (p_no_of_packages == 1)
+		{
+			MPackage pack = MPackage.create (shipment, shipper, null);
+			info.append(pack.getDocumentNo());
+		}
+		else
+		{
+			for (int i = 0; i < p_no_of_packages; i++)
+			{
+				MPackage pack = MPackage.createPackage (shipment, shipper, null);
+				if (i != 0)
+					info.append(", ");
+				info.append(pack.getDocumentNo());
+			}
+		}
+		
+		return info.toString();
 	}	//	doIt
 	
 }	//	PackageCreate

org.adempiere.base/plugin.xml

@@ -15,6 +15,7 @@
    <extension-point id="org.adempiere.base.IGridTabImporter" name="Grid data import extension" schema="schema/org.adempiere.base.IGridTabImporter.exsd"/>
    <extension-point id="org.compiere.model.PaymentProcessor" name="Payment Processor" schema="schema/org.compiere.model.PaymentProcessor.exsd"/>
    <extension-point id="org.compiere.model.Callout" name="Callout" schema="schema/org.compiere.model.Callout.exsd"/>
+   <extension-point id="org.adempiere.model.IShipmentProcessor" name="Shipment Processor" schema="schema/org.adempiere.model.IShipmentProcessor.exsd"/>
    <extension
          id="org.adempiere.impexp.GridTabXlsExporter"
          name="Grid data excel exporter"

org.adempiere.base/schema/org.adempiere.model.IShipmentProcessor.exsd

@@ -0,0 +1,113 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.adempiere.base" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.adempiere.base" id="org.adempiere.model.IShipmentProcessor" name="Shipment Processor"/>
+      </appinfo>
+      <documentation>
+         Extension to provide shipping integration through specific shipping processor implementation
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <choice>
+            <element ref="processor"/>
+         </choice>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="processor">
+      <complexType>
+         <attribute name="priority" type="string">
+            <annotation>
+               <documentation>
+                  numeric priority value, higher value is of higher priority
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.adempiere.model.IShipmentProcessor"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         1.0.0
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         &lt;pre&gt;
+&lt;extension
+         id=&quot;org.adempiere.model.FedexShipmentProcessor&quot;
+         name=&quot;FedEx&quot;
+         point=&quot;org.adempiere.model.IShipmentProcessor&quot;&gt;
+      &lt;processor
+            class=&quot;org.adempiere.model.FedexShipmentProcessor&quot;
+            priority=&quot;0&quot;&gt;
+      &lt;/processor&gt;
+&lt;/extension&gt;
+
+X_ShippingProcessor.ShippingProcessorClass=&quot;org.adempiere.model.FedexShipmentProcessor&quot;
+&lt;/pre&gt;
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         The class attribute must implement the org.adempiere.model.IShipmentProcessor class.
+      </documentation>
+   </annotation>
+
+
+
+</schema>

org.adempiere.base/src/org/adempiere/base/Core.java

@@ -24,6 +24,8 @@ import java.net.URL;
 import java.util.List;
 import java.util.logging.Level;
 
+import org.adempiere.model.IShipmentProcessor;
+import org.adempiere.model.MShipperFacade;
 import org.compiere.model.MBankAccountProcessor;
 import org.compiere.model.MPaymentProcessor;
 import org.compiere.model.ModelValidator;
@@ -145,4 +147,46 @@ public class Core {
 		//
 		return myProcessor;
 	}
+	
+	public static IShipmentProcessor getShipmentProcessor(MShipperFacade sf) 
+	{
+		if (s_log.isLoggable(Level.FINE))
+			s_log.fine("create for " + sf);
+		
+		String className = sf.getShippingProcessorClass();
+		if (className == null || className.length() == 0) 
+		{
+			s_log.log(Level.SEVERE, "Shipment processor class not define for shipper " + sf);
+			return null;
+		}
+		
+		IShipmentProcessor myProcessor = Service.locator().locate(IShipmentProcessor.class, className, null).getService();
+		if (myProcessor == null) 
+		{
+			//fall back to dynamic java class loadup
+			try 
+			{
+				Class<?> ppClass = Class.forName(className);
+				if (ppClass != null)
+					myProcessor = (IShipmentProcessor) ppClass.newInstance();
+			} 
+			catch (Error e1) 
+			{   //  NoClassDefFound
+				s_log.log(Level.SEVERE, className + " - Error=" + e1.getMessage());
+				return null;
+			} 
+			catch (Exception e2) 
+			{
+				s_log.log(Level.SEVERE, className, e2);
+				return null;
+			}
+		}
+		if (myProcessor == null) 
+		{
+			s_log.log(Level.SEVERE, "Not found in service/extension registry and classpath");
+			return null;
+		}
+		
+		return myProcessor;
+	}
 }

org.adempiere.base/src/org/adempiere/model/IShipmentProcessor.java

@@ -0,0 +1,33 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 2008 Low Heng Sin											  *
+ * Copyright (C) 2008 Idalica              									  *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.model;
+
+import java.util.Properties;
+
+import org.compiere.model.MShippingTransaction;
+
+/**
+ * 
+ * @author Low Heng Sin
+ *
+ */
+public interface IShipmentProcessor 
+{	
+	public boolean processShipment(Properties ctx, MShippingTransaction shippingTransaction, String trxName);
+	
+	public boolean rateInquiry(Properties ctx, MShippingTransaction shippingTransaction, boolean isPriviledgedRate, String trxName);
+
+	public boolean voidShipment(Properties ctx, MShippingTransaction shippingTransaction, String get_TrxName);
+}

org.adempiere.base/src/org/adempiere/model/MShipperFacade.java

@@ -0,0 +1,168 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 2008 Low Heng Sin											  *
+ * Copyright (C) 2008 Idalica              									  *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.model;
+
+import org.compiere.model.MShipper;
+import org.compiere.model.MShippingProcessor;
+import org.compiere.util.DB;
+
+/**
+ * Facade for MShipper, providing accessor method for custom field
+ * @author Low Heng Sin
+ *
+ */
+public class MShipperFacade 
+{
+	private MShipper m_shipper;
+	private MShippingProcessor m_processor;
+
+	public MShipperFacade(MShipper shipper)
+	{
+		m_shipper = shipper;
+		m_processor = getShippingProcessor();
+	}
+	
+	public MShipper getMShipper()
+	{
+		return m_shipper;
+	}
+	
+	private MShippingProcessor getShippingProcessor() 
+	{
+		if (m_shipper.getM_ShippingProcessor_ID() > 0)
+			return new MShippingProcessor(m_shipper.getCtx(), m_shipper.getM_ShippingProcessor_ID(), m_shipper.get_TrxName());
+		return null;
+	}
+	
+	public String getShippingProcessorClass() 
+	{
+		return m_processor.getShippingProcessorClass();
+	}
+		
+	public String getConnectionKey() 
+	{
+		return m_processor.getConnectionKey();
+	}
+	
+	public String getConnectionPassword() 
+	{
+		return m_processor.getConnectionPassword();
+	}
+	
+	public String getUserID() 
+	{
+		return m_processor.getUserID();
+	}
+	
+	public String getHostAddress() 
+	{
+		return m_processor.getHostAddress();
+	}
+	
+	public String getProxyAddress() 
+	{
+		return m_processor.getProxyAddress();
+	}
+	
+	public int getHostPort() 
+	{
+		return m_processor.getHostPort();
+	}
+	
+	public String getProxyLogon()
+	{		
+		return m_processor.getProxyLogon();
+	}
+	
+	public String getProxyPassword() 
+	{		
+		return m_processor.getProxyPassword();
+	}	
+	
+	public int getProxyPort() 
+	{		
+		return m_processor.getProxyPort();
+	}
+	
+	public String getServicePath() 
+	{		
+		return m_processor.getServicePath();
+	}	
+	
+	public String getShippingServiceCode() 
+	{
+		return m_shipper.getShippingServiceCode();
+	}
+	
+	public String getShipperAccount(int AD_Org_ID) 
+	{
+		StringBuilder sql = new StringBuilder();
+		sql.append("Select ShipperAccount From C_BP_ShippingAcct ")
+		   .append("Where C_BPartner_ID = ? ")
+		   .append(" AND AD_Org_ID In (0, ").append(AD_Org_ID).append(") ")
+		   .append(" Order By AD_Org_ID Desc ");
+		String ac = DB.getSQLValueString(null, sql.toString(), m_shipper.getC_BPartner_ID());
+		if (ac != null) {
+			ac = ac.replaceAll("[-]", "");
+			ac = ac.replaceAll(" ", "");
+		}
+		return ac;
+	}
+	
+	public String getDutiesShipperAccount(int AD_Org_ID) 
+	{
+		StringBuilder sql = new StringBuilder();
+		sql.append("Select DutiesShipperAccount From C_BP_ShippingAcct ")
+		   .append("Where C_BPartner_ID = ? ")
+		   .append(" AND AD_Org_ID In (0, ").append(AD_Org_ID).append(") ")
+		   .append(" Order By AD_Org_ID Desc ");
+		String ac = DB.getSQLValueString(null, sql.toString(), m_shipper.getC_BPartner_ID());
+		if (ac != null) {
+			ac = ac.replaceAll("[-]", "");
+			ac = ac.replaceAll(" ", "");
+		}
+		return ac;
+	}
+	
+	/**
+	 * get Meter Number associated with Account Number, use by the Fedex interface
+	 * @param shipment
+	 * @return Shipper Meter Number
+	 */
+	public String getShipperMeter(int AD_Org_ID) 
+	{
+		StringBuilder sql = new StringBuilder();
+		sql.append("Select ShipperMeter From C_BP_ShippingAcct ")
+		   .append("Where C_BPartner_ID = ? ")
+		   .append(" AND AD_Org_ID In (0, ").append(AD_Org_ID).append(") ")
+		   .append(" Order By AD_Org_ID Desc ");
+		return DB.getSQLValueString(null, sql.toString(), m_shipper.getC_BPartner_ID());
+	}
+	
+	public boolean isResidential() 
+	{
+		return m_shipper.isResidential();
+	}
+	
+	public boolean isSaturdayDelivery()
+	{
+		return m_shipper.isSaturdayDelivery();
+	}
+	
+	public boolean isInternational()
+	{
+		return m_shipper.isInternational();
+	}
+}

org.adempiere.base/src/org/adempiere/process/IPrintShippingLabel.java

@@ -0,0 +1,12 @@
+package org.adempiere.process;
+
+import org.compiere.model.MAttachment;
+import org.compiere.model.MShipperLabels;
+
+public interface IPrintShippingLabel {
+
+	public String printToLabelPrinter(MAttachment attachment, MShipperLabels labelType) throws Exception;
+	
+	public String printImageLabel(MAttachment attachment, MShipperLabels labelType, String title) throws Exception;
+	
+}

org.adempiere.base/src/org/adempiere/process/OnlineShipmentProcess.java

@@ -0,0 +1,123 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 2008 Low Heng Sin											  *
+ * Copyright (C) 2008 Idalica              									  *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.process;
+
+import java.sql.Timestamp;
+import java.util.logging.Level;
+
+import org.compiere.model.MPackage;
+import org.compiere.model.MShippingTransaction;
+import org.compiere.process.ProcessInfoLog;
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.SvrProcess;
+
+/**
+ * 
+ * @author Low Heng Sin
+ *
+ */
+public class OnlineShipmentProcess extends SvrProcess 
+{
+	@Override
+	protected void prepare() 
+	{
+		ProcessInfoParameter[] para = getParameter();
+		for (int i = 0; i < para.length; i++)
+		{
+			String name = para[i].getParameterName();
+			if (para[i].getParameter() == null)
+				;
+			else
+				log.log(Level.SEVERE, "prepare - Unknown Parameter: " + name);
+		}
+    }
+	
+	@Override
+	protected String doIt() throws Exception 
+	{
+		MPackage m_package = new MPackage(getCtx(), getRecord_ID(), get_TrxName());
+		boolean ok = m_package.processOnline(MShippingTransaction.ACTION_ProcessShipment, false);
+		m_package.saveEx();
+		if (!ok)
+		{
+			getProcessInfo().setError(true);
+			getProcessInfo().addLog(new ProcessInfoLog(getProcessInfo().getAD_Process_ID(), 
+					new Timestamp(System.currentTimeMillis()), null, m_package.getErrorMessage()));
+			return m_package.getErrorMessage();
+		}
+		getProcessInfo().addLog(new ProcessInfoLog(getProcessInfo().getAD_Process_ID(), 
+				new Timestamp(System.currentTimeMillis()), null, m_package.getShippingRespMessage()));
+		return m_package.getShippingRespMessage();
+	}
+
+/*	
+    private void validatePackage() throws Exception
+    {
+        if(m_package == null)
+            throw new Exception("No Package");
+
+        //Yvonne
+        if( m_package.get_Value(X_Shipping.COLUMN_IS_SHIP_ITN_REQ)!=null?((Boolean)m_package.get_Value(X_Shipping.COLUMN_IS_SHIP_ITN_REQ)).booleanValue():false && ( m_package.get_Value(X_Shipping.COLUMN_ITN) == null || ((String)m_package.get_Value(X_Shipping.COLUMN_ITN)).trim().length() == 0 ) )
+        {
+            int windowNo = X_Shipping.m_Window_No;
+            
+            if (Ini.isClient())
+			{
+            	try
+                {
+                    Class cl = Class.forName("org.compiere.apps.ADialog");
+                    Class paramTypes[] = {int.class, Container.class, String.class, String.class};
+                    Object params[] = {windowNo, Env.getWindow(windowNo), "Package ITN for this shipment is blank.", "Are you sure you want to continue?"};
+                    Method method = cl.getDeclaredMethod("ask", paramTypes);
+                    Boolean ok = (Boolean) method.invoke(null, params);
+                    
+                    if(!ok)
+                	{
+                		throw new Exception("Online shipment processing canceled by user.");
+                	}
+                }
+                catch (Exception ex)
+                {
+                	throw new AdempiereException(ex);
+                }
+			}
+			else
+			{
+				try
+				{
+					ClassLoader loader = Thread.currentThread().getContextClassLoader();
+					if (loader == null)
+						loader = this.getClass().getClassLoader();
+	    	    	Class<?> clazz = loader.loadClass("org.adempiere.webui.window.FDialog");
+	    	    	Class<?> clazz1 = loader.loadClass("org.zkoss.zk.ui.Component");
+	    		      
+	    	    	Method m = clazz.getMethod("ask", Integer.TYPE, clazz1, String.class, String.class);
+	    	    	Boolean returnCode = (Boolean)m.invoke(null, 0, null, "Packaget ITN for this shipment is blank.",
+                            "Are you sure you want to continue?");
+	    		    
+	    	    	if(!returnCode)
+	                {
+	    	    		throw new Exception("Online shipment processing canceled by user.");
+	                }
+				} 
+				catch (Exception e)
+				{
+					throw new AdempiereException(e);
+				}
+			}            
+        }     
+    }
+*/    
+}

org.adempiere.base/src/org/adempiere/process/PrintShippingLabel.java

@@ -0,0 +1,42 @@
+package org.adempiere.process;
+
+import org.adempiere.base.Service;
+import org.compiere.model.MAttachment;
+import org.compiere.model.MPackage;
+import org.compiere.model.MShipperLabels;
+import org.compiere.process.SvrProcess;
+
+public class PrintShippingLabel extends SvrProcess 
+{
+	private MPackage m_package;
+	
+	@Override
+	protected void prepare() 
+	{
+		m_package = new MPackage(getCtx(), getRecord_ID(), get_TrxName());
+	}
+
+	@Override
+	protected String doIt() throws Exception 
+	{
+		MAttachment attachment = m_package.getAttachment(true);
+		if (attachment == null)
+			return "No labels";
+
+		int labelId = m_package.getM_ShipperLabels_ID();
+		if (labelId <= 0)
+			return "Label format not defined.";
+
+		IPrintShippingLabel service = Service.locator().locate(IPrintShippingLabel.class).getService();
+		if (service != null)
+		{
+			MShipperLabels label = new MShipperLabels(getCtx(), labelId, get_TrxName());		
+			if (MShipperLabels.LABELPRINTMETHOD_Image.equals(label.getLabelPrintMethod()))
+				return service.printImageLabel(attachment, label, getProcessInfo().getTitle());
+			else
+				return service.printToLabelPrinter(attachment, label);
+		}
+		else
+			return "Not found in service/extension registry and classpath";
+	}
+}

org.adempiere.base/src/org/adempiere/process/RateInquiryProcess.java

@@ -0,0 +1,49 @@
+package org.adempiere.process;
+
+import java.sql.Timestamp;
+import java.util.logging.Level;
+
+import org.compiere.model.MPackage;
+import org.compiere.model.MShippingTransaction;
+import org.compiere.process.ProcessInfoLog;
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.SvrProcess;
+
+public class RateInquiryProcess extends SvrProcess 
+{
+	private boolean p_IsPriviledgedRate = false;
+	
+	@Override
+	protected void prepare() 
+	{
+		ProcessInfoParameter[] para = getParameter();
+		for (int i = 0; i < para.length; i++)
+		{
+			String name = para[i].getParameterName();
+			if (para[i].getParameter() == null)
+				;
+			else if (name.equals(MShippingTransaction.COLUMNNAME_IsPriviledgedRate))
+				p_IsPriviledgedRate = ((String)para[i].getParameter()).equals("Y");
+			else
+				log.log(Level.SEVERE, "prepare - Unknown Parameter: " + name);
+		}
+    }
+	
+	@Override
+	protected String doIt() throws Exception 
+	{
+		MPackage m_package = new MPackage(getCtx(), getRecord_ID(), get_TrxName());
+		boolean ok = m_package.processOnline(MShippingTransaction.ACTION_RateInquiry, p_IsPriviledgedRate);
+		m_package.saveEx();
+		if (!ok)
+		{
+			getProcessInfo().setError(true);
+			getProcessInfo().addLog(new ProcessInfoLog(getProcessInfo().getAD_Process_ID(), 
+					new Timestamp(System.currentTimeMillis()), null, m_package.getErrorMessage()));			
+			return m_package.getErrorMessage();
+		}
+		getProcessInfo().addLog(new ProcessInfoLog(getProcessInfo().getAD_Process_ID(), 
+				new Timestamp(System.currentTimeMillis()), null, m_package.getRateInquiryMessage()));
+		return m_package.getRateInquiryMessage();
+	}
+}

org.adempiere.base/src/org/adempiere/process/SalesOrderRateInquiryProcess.java

@@ -0,0 +1,431 @@
+package org.adempiere.process;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.logging.Level;
+
+import org.adempiere.exceptions.AdempiereException;
+import org.adempiere.exceptions.FillMandatoryException;
+import org.adempiere.util.ShippingUtil;
+import org.compiere.model.MClientInfo;
+import org.compiere.model.MOrder;
+import org.compiere.model.MOrderLine;
+import org.compiere.model.MProduct;
+import org.compiere.model.MShipper;
+import org.compiere.model.MShipperLabels;
+import org.compiere.model.MShipperPackaging;
+import org.compiere.model.MShipperPickupTypes;
+import org.compiere.model.MShippingTransaction;
+import org.compiere.model.MShippingTransactionLine;
+import org.compiere.model.MSysConfig;
+import org.compiere.model.MUOM;
+import org.compiere.process.ProcessInfoLog;
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.SvrProcess;
+import org.compiere.util.Trx;
+
+public class SalesOrderRateInquiryProcess extends SvrProcess 
+{
+	private boolean p_IsPriviledgedRate = false;
+	
+	@Override
+	protected void prepare() 
+	{
+		ProcessInfoParameter[] para = getParameter();
+		for (int i = 0; i < para.length; i++)
+		{
+			String name = para[i].getParameterName();
+			if (para[i].getParameter() == null)
+				;
+			else if (name.equals(MShippingTransaction.COLUMNNAME_IsPriviledgedRate))
+				p_IsPriviledgedRate = ((String)para[i].getParameter()).equals("Y");
+			else
+				log.log(Level.SEVERE, "prepare - Unknown Parameter: " + name);
+		}
+    }
+	
+	@Override
+	protected String doIt() throws Exception 
+	{
+		MOrder m_order = new MOrder(getCtx(), getRecord_ID(), get_TrxName());
+		
+		if (m_order.getM_Shipper_ID() == 0)
+			throw new FillMandatoryException(MOrder.COLUMNNAME_M_Shipper_ID);
+		
+		MClientInfo ci = MClientInfo.get(getCtx(), getAD_Client_ID(), get_TrxName());
+		if (ci.getC_ChargeFreight_ID() == 0 && ci.getM_ProductFreight_ID() == 0)
+			throw new AdempiereException("Product or Charge for Freight is not defined at Client window > Client Info tab");
+		if (ci.getC_UOM_Weight_ID() == 0)
+			throw new AdempiereException("UOM for Weight is not defined at Client window > Client Info tab");
+		if (ci.getC_UOM_Length_ID() == 0)
+			throw new AdempiereException("UOM for Length is not defined at Client window > Client Info tab");
+		
+		MOrderLine[] ols = m_order.getLines(false, MOrderLine.COLUMNNAME_Line);
+		if (ols.length == 0)
+			throw new AdempiereException("@NoLines@");
+		
+		for (MOrderLine ol : ols)
+		{
+			if ((ol.getM_Product_ID() > 0 && ol.getM_Product_ID() == ci.getM_ProductFreight_ID()) ||
+					(ol.getC_Charge_ID() > 0 && ol.getC_Charge_ID() == ci.getC_ChargeFreight_ID()))
+				continue;
+			else if (ol.getM_Product_ID() > 0)
+			{
+				MProduct product = new MProduct(getCtx(), ol.getM_Product_ID(), get_TrxName());
+				
+				BigDecimal weight = product.getWeight();
+				if (weight == null || weight.compareTo(BigDecimal.ZERO) == 0)
+					throw new AdempiereException("No weight defined for product " + product.toString());
+			}
+		}
+		
+		Trx trx = Trx.get(Trx.createTrxName("spt-"), true);
+		boolean ok = false;
+		MShippingTransaction st = null;
+		try
+		{			
+			st = createShippingTransaction(m_order, MShippingTransaction.ACTION_RateInquiry, get_TrxName());
+			ok = st.processOnline();
+		}
+		catch (Exception e)
+		{
+			log.log(Level.SEVERE, "processOnline", e);
+		}
+		
+		if (trx != null)
+		{
+			trx.commit();
+			trx.close();
+		}
+		
+		if (ok)
+		{
+			MOrderLine freightLine = null;
+			for (MOrderLine ol : ols)
+			{
+				if ((ol.getM_Product_ID() > 0 && ol.getM_Product_ID() == ci.getM_ProductFreight_ID()) ||
+						(ol.getC_Charge_ID() > 0 && ol.getC_Charge_ID() == ci.getC_ChargeFreight_ID()))
+				{
+					freightLine = ol;
+					break;
+				}
+			}
+			
+			if (freightLine == null)
+			{
+				freightLine = new MOrderLine(m_order);
+			
+				if (ci.getC_ChargeFreight_ID() > 0)
+					freightLine.setC_Charge_ID(ci.getC_ChargeFreight_ID());
+				else if (ci.getM_ProductFreight_ID() > 0)
+					freightLine.setM_Product_ID(ci.getM_ProductFreight_ID());
+				else
+					throw new AdempiereException("Product or Charge for Freight is not defined at Client window > Client Info tab");
+			}
+			
+			freightLine.setC_BPartner_Location_ID(m_order.getC_BPartner_Location_ID());
+			freightLine.setM_Shipper_ID(m_order.getM_Shipper_ID());
+			freightLine.setQty(BigDecimal.ONE);
+			freightLine.setPrice(st.getPrice());
+			freightLine.saveEx();
+		}
+		else
+		{
+			getProcessInfo().setError(true);
+			getProcessInfo().addLog(new ProcessInfoLog(getProcessInfo().getAD_Process_ID(), 
+					new Timestamp(System.currentTimeMillis()), null, st.getErrorMessage()));
+			return st.getErrorMessage();
+		}
+		
+		getProcessInfo().addLog(new ProcessInfoLog(getProcessInfo().getAD_Process_ID(), 
+				new Timestamp(System.currentTimeMillis()), null, st.getShippingRespMessage()));
+		return st.getShippingRespMessage();
+	}
+	
+	private MShippingTransaction createShippingTransaction(MOrder m_order, String action, String trxName)
+	{
+		MShipper shipper = new MShipper(getCtx(), m_order.getM_Shipper_ID(), get_TrxName());
+		String whereClause = "M_Shipper_ID = " + shipper.getM_Shipper_ID() + " AND IsDefault='Y' AND IsActive='Y'";
+		int M_ShipperLabels_ID = 0;
+		int[] ids = MShipperLabels.getAllIDs(MShipperLabels.Table_Name, whereClause, get_TrxName());
+		if (ids.length > 0)
+			M_ShipperLabels_ID = ids[0];
+
+		int M_ShipperPackaging_ID = 0;
+		ids = MShipperPackaging.getAllIDs(MShipperPackaging.Table_Name, whereClause, get_TrxName());
+		if (ids.length > 0)
+			M_ShipperPackaging_ID = ids[0];
+
+		int M_ShipperPickupTypes_ID = 0;
+		ids = MShipperPickupTypes.getAllIDs(MShipperPickupTypes.Table_Name, whereClause, get_TrxName());
+		if (ids.length > 0)
+			M_ShipperPickupTypes_ID = ids[0];
+		
+		String ShipperAccount = ShippingUtil.getSenderShipperAccount(shipper.getM_Shipper_ID(), shipper.getAD_Org_ID());
+		String DutiesShipperAccount = ShippingUtil.getSenderDutiesShipperAccount(shipper.getM_Shipper_ID(), shipper.getAD_Org_ID());
+		
+		// 1 kg = 2.20462 lb
+		MClientInfo ci = MClientInfo.get(getCtx(), getAD_Client_ID(), get_TrxName());
+		MUOM uom = new MUOM(getCtx(), ci.getC_UOM_Weight_ID(), null);
+		String unit = uom.getX12DE355();
+		boolean isPound = false;
+		if (unit != null)
+		{
+			unit = unit.toUpperCase();
+			if (unit.equals("LB") || unit.equals("LBS"))
+				isPound = true;
+		}
+		
+		MShipperPackaging sp = new MShipperPackaging(getCtx(), M_ShipperPackaging_ID, get_TrxName());
+		BigDecimal WeightPerPackage = sp.getWeight().multiply(isPound ? new BigDecimal(2.20462) : BigDecimal.ONE);
+		
+		if (WeightPerPackage == null || WeightPerPackage.compareTo(BigDecimal.ZERO) == 0)
+		{
+			BigDecimal defaultWeightPerPackage = new BigDecimal(MSysConfig.getDoubleValue(MSysConfig.SHIPPING_DEFAULT_WEIGHT_PER_PACKAGE, 30));
+			WeightPerPackage = defaultWeightPerPackage.multiply(isPound ? new BigDecimal(2.20462) : BigDecimal.ONE);
+		}
+		
+		BigDecimal CODAmount = m_order.getGrandTotal();
+		BigDecimal CustomsValue = BigDecimal.ZERO;
+		BigDecimal FreightAmt = BigDecimal.ZERO;
+		BigDecimal TotalWeight = BigDecimal.ZERO;
+		
+		ArrayList<ShippingPackage> packages = new ArrayList<ShippingPackage>();
+		BigDecimal TotalPackageWeight = BigDecimal.ZERO;
+		ArrayList<MProduct> products = new ArrayList<MProduct>();
+		MOrderLine[] ols = m_order.getLines(false, MOrderLine.COLUMNNAME_Line);
+		for (MOrderLine ol : ols)
+		{
+			if ((ol.getM_Product_ID() > 0 && ol.getM_Product_ID() == ci.getM_ProductFreight_ID()) ||
+					(ol.getC_Charge_ID() > 0 && ol.getC_Charge_ID() == ci.getC_ChargeFreight_ID()))
+			{
+//				FreightAmt = FreightAmt.add(ol.getLineNetAmt());
+				continue;
+			}
+			else if (ol.getM_Product_ID() > 0)
+			{
+				MProduct product = new MProduct(getCtx(), ol.getM_Product_ID(), get_TrxName());
+				
+				BigDecimal weight = product.getWeight();
+				if (weight == null || weight.compareTo(BigDecimal.ZERO) == 0)
+					throw new AdempiereException("No weight defined for product " + product.toString());
+				
+				BigDecimal qty = ol.getQtyEntered();
+				if (qty == null)
+					qty = BigDecimal.ZERO;
+				
+				if (product.isOwnBox())
+				{
+					ArrayList<MProduct> ownBoxProducts = new ArrayList<MProduct>();
+					ownBoxProducts.add(product);
+					
+					BigDecimal remainingQty = qty;
+					for(int i = 0; i < qty.doubleValue(); i++)
+					{
+						remainingQty = remainingQty.subtract(BigDecimal.ONE);
+						
+						ShippingPackage shippingPackage = new ShippingPackage();
+						shippingPackage.setWeight(weight.multiply(remainingQty));
+						shippingPackage.setProducts(ownBoxProducts);
+						shippingPackage.setHeight(product.getShelfHeight());
+						shippingPackage.setWidth(new BigDecimal(product.getShelfWidth()));
+						shippingPackage.setLength(new BigDecimal(product.getShelfDepth()));
+						packages.add(shippingPackage);
+					}
+				}
+				else
+				{
+					products.add(product);
+					
+					if ((weight.multiply(qty)).add(TotalPackageWeight).compareTo(WeightPerPackage) > 0)
+					{
+						ShippingPackage shippingPackage = new ShippingPackage();
+						shippingPackage.setWeight(TotalPackageWeight);
+						shippingPackage.setProducts(products);
+						packages.add(shippingPackage);
+						products.clear();
+						TotalPackageWeight = weight.multiply(qty);
+					}
+					else
+						TotalPackageWeight = TotalPackageWeight.add(weight.multiply(qty));
+				}
+					
+				TotalWeight = TotalWeight.add(weight.multiply(qty));
+			}
+		}
+		
+		if (TotalPackageWeight.compareTo(BigDecimal.ZERO) > 0)
+		{
+			ShippingPackage shippingPackage = new ShippingPackage();
+			shippingPackage.setWeight(TotalPackageWeight);
+			shippingPackage.setProducts(products);
+			packages.add(shippingPackage);
+		}
+		
+		CustomsValue = CODAmount.subtract(FreightAmt);
+		
+		int BoxCount = packages.size();
+		
+		MShippingTransaction st = new MShippingTransaction(getCtx(), 0, trxName);
+		st.setAction(action);
+//		st.setAD_Client_ID(m_order.getAD_Client_ID());
+		st.setAD_Org_ID(m_order.getAD_Org_ID());
+		st.setAD_User_ID(m_order.getAD_User_ID());
+		st.setBill_Location_ID(m_order.getBill_Location_ID());
+		st.setBoxCount(BoxCount);
+//		st.setC_BP_ShippingAcct_ID(getC_BP_ShippingAcct_ID());
+		st.setC_BPartner_ID(m_order.getC_BPartner_ID());
+		st.setC_BPartner_Location_ID(m_order.getC_BPartner_Location_ID());
+		st.setC_Currency_ID(m_order.getC_Currency_ID());
+//		st.setC_Invoice_ID(0);
+		st.setC_Order_ID(m_order.getC_Order_ID());
+		st.setC_UOM_Length_ID(ci.getC_UOM_Length_ID());
+		st.setC_UOM_Weight_ID(ci.getC_UOM_Weight_ID());
+//		st.setCashOnDelivery(isCashOnDelivery());
+		st.setCODAmount(CODAmount);
+		st.setCustomsValue(CustomsValue);
+//		st.setDateReceived(getDateReceived());
+//		st.setDeliveryConfirmation(isDeliveryConfirmation());
+//		st.setDeliveryConfirmationType(getDeliveryConfirmationType());
+//		st.setDescription(getDescription());
+//		st.setDotHazardClassOrDivision(getDotHazardClassOrDivision());
+//		st.setDryIceWeight(getDryIceWeight());
+		st.setDutiesShipperAccount(DutiesShipperAccount);
+//		st.setFOB(getFOB());
+		st.setFreightAmt(FreightAmt);
+		st.setFreightCharges(MShippingTransaction.FREIGHTCHARGES_PrepaidAndBill);
+//		st.setHandlingCharge(getHandlingCharge());
+//		st.setHeight(getHeight());
+//		st.setHoldAddress(getHoldAddress());
+//		st.setHomeDeliveryPremiumDate(getHomeDeliveryPremiumDate());
+//		st.setHomeDeliveryPremiumPhone(getHomeDeliveryPremiumPhone());
+//		st.setHomeDeliveryPremiumType(getHomeDeliveryPremiumType());
+//		st.setInsurance(getInsurance());
+//		st.setInsuredAmount(getInsuredAmount());
+//		st.setIsAccessible(isAccessible());
+		st.setIsActive(m_order.isActive());
+//		st.setIsAddedHandling(isAddedHandling());
+//		st.setIsAlternateReturnAddress(isAlternateReturnAddress());
+//		st.setIsCargoAircraftOnly(isCargoAircraftOnly());
+//		st.setIsDryIce(isDryIce());
+//		st.setIsDutiable(isDutiable());
+//		st.setIsFutureDayShipment(isFutureDayShipment());
+//		st.setIsHazMat(isHazMat());
+//		st.setIsHoldAtLocation(isHoldAtLocation());
+//		st.setIsIgnoreZipNotFound(isIgnoreZipNotFound());
+//		st.setIsIgnoreZipStateNotMatch(isIgnoreZipStateNotMatch());
+		st.setIsPriviledgedRate(p_IsPriviledgedRate);
+		st.setIsResidential(shipper.isResidential());
+		st.setIsSaturdayDelivery(shipper.isSaturdayDelivery());
+//		st.setIsSaturdayPickup(isSaturdayPickup());
+//		st.setIsVerbalConfirmation(isVerbalConfirmation());
+//		st.setLatestPickupTime(getLatestPickupTime());
+//		st.setLength(getLength());
+//		st.setM_InOut_ID(0);
+//		st.setM_Package_ID(getM_Package_ID());
+		st.setM_Shipper_ID(m_order.getM_Shipper_ID());
+		st.setM_ShipperLabels_ID(M_ShipperLabels_ID);
+		st.setM_ShipperPackaging_ID(M_ShipperPackaging_ID);
+		st.setM_ShipperPickupTypes_ID(M_ShipperPickupTypes_ID);
+		st.setM_ShippingProcessor_ID(shipper.getM_ShippingProcessor_ID());
+		st.setM_Warehouse_ID(m_order.getM_Warehouse_ID());
+//		st.setNotificationMessage(getNotificationMessage());
+//		st.setNotificationType(getNotificationType());
+		st.setPaymentRule(m_order.getPaymentRule());
+		st.setPOReference(m_order.getPOReference());
+//		st.setPrice(getPrice());
+//		st.setPriceActual(getPriceActual());
+//		st.setProcessed(isProcessed());
+//		st.setReceivedInfo(getReceivedInfo());
+//		st.setReturnBPartner_ID(getReturnBPartner_ID());
+//		st.setReturnLocation_ID(getReturnLocation_ID());
+//		st.setReturnUser_ID(getReturnUser_ID());
+		st.setSalesRep_ID(m_order.getSalesRep_ID());
+		st.setShipDate(m_order.getDatePromised());
+		st.setShipperAccount(ShipperAccount);
+//		st.setShippingRespMessage(ShippingRespMessage);
+//		st.setSurcharges(getSurcharges());
+		st.setTrackingInfo(shipper.getTrackingURL());
+//		st.setTrackingNo(getTrackingNo());
+		st.setWeight(TotalWeight);
+//		st.setWidth(getWidth());
+		st.saveEx();
+		
+		for (int i = 0; i < packages.size(); i++)
+		{
+			ShippingPackage shippingPackage = packages.get(i);
+			
+			MShippingTransactionLine stl = new MShippingTransactionLine(st.getCtx(), 0, st.get_TrxName());
+//			stl.setAD_Client_ID(m_order.getAD_Client_ID());
+			stl.setAD_Org_ID(m_order.getAD_Org_ID());
+			stl.setC_UOM_Length_ID(ci.getC_UOM_Length_ID());
+			stl.setC_UOM_Weight_ID(ci.getC_UOM_Weight_ID());
+//			stl.setDescription(getDescription());
+			stl.setHeight(shippingPackage.getHeight());
+			stl.setIsActive(m_order.isActive());
+			stl.setLength(shippingPackage.getLength());
+//			stl.setM_PackageMPS_ID(0);
+			stl.setM_ShippingTransaction_ID(st.getM_ShippingTransaction_ID());
+//			stl.setMasterTrackingNo(getMasterTrackingNo());
+//			stl.setPrice(getPrice());
+//			stl.setProcessed(isProcessed());
+			stl.setSeqNo((i+1) * 10);
+//			stl.setTrackingNo(getTrackingNo());
+			stl.setWeight(shippingPackage.getWeight());
+			stl.setWidth(shippingPackage.getWidth());
+			stl.saveEx();
+		}
+		
+		return st;
+	}
+	
+	class ShippingPackage
+	{
+		private BigDecimal weight;
+		private BigDecimal height;
+		private BigDecimal length;
+		private BigDecimal width;
+		private ArrayList<MProduct> products;
+		
+		public BigDecimal getWeight() {
+			return weight;
+		}
+		
+		public void setWeight(BigDecimal weight) {
+			this.weight = weight;
+		}
+		
+		public BigDecimal getHeight() {
+			return height;
+		}
+		
+		public void setHeight(BigDecimal height) {
+			this.height = height;
+		}
+		
+		public BigDecimal getLength() {
+			return length;
+		}
+		
+		public void setLength(BigDecimal length) {
+			this.length = length;
+		}
+		
+		public BigDecimal getWidth() {
+			return width;
+		}
+		
+		public void setWidth(BigDecimal width) {
+			this.width = width;
+		}
+		
+		public ArrayList<MProduct> getProducts() {
+			return products;
+		}
+		
+		public void setProducts(ArrayList<MProduct> products) {
+			this.products = products;
+		}
+	}
+}

org.adempiere.base/src/org/adempiere/process/ShipperCopyFrom.java

@@ -0,0 +1,129 @@
+package org.adempiere.process;
+
+import java.math.BigDecimal;
+import java.util.logging.Level;
+
+import org.compiere.model.X_X_Shipper;
+import org.compiere.model.X_X_ShipperLabels;
+import org.compiere.model.X_X_ShipperPackaging;
+import org.compiere.model.X_X_ShipperPickupTypes;
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.SvrProcess;
+
+public class ShipperCopyFrom extends SvrProcess
+{
+	private int		p_X_Shipper_ID = 0;
+
+	@Override
+	protected void prepare() 
+	{
+		ProcessInfoParameter[] para = getParameter();
+		for (int i = 0; i < para.length; i++)
+		{
+			String name = para[i].getParameterName();
+			if (para[i].getParameter() == null)
+				;
+			else if (name.equals(X_X_Shipper.COLUMNNAME_X_Shipper_ID))
+				p_X_Shipper_ID = ((BigDecimal)para[i].getParameter()).intValue();
+			else
+				log.log(Level.SEVERE, "Unknown Parameter: " + name);
+		}
+	}
+
+	@Override
+	protected String doIt() throws Exception 
+	{
+		int To_X_Shipper_ID = getRecord_ID();
+		log.info("From X_Shipper_ID=" + p_X_Shipper_ID + " to " + To_X_Shipper_ID);
+		if (To_X_Shipper_ID == 0)
+			throw new IllegalArgumentException("Target X_Shipper_ID == 0");
+		if (p_X_Shipper_ID == 0)
+			throw new IllegalArgumentException("Source X_Shipper_ID == 0");
+		
+		createShipperPackaging(To_X_Shipper_ID);
+		createShipperLabels(To_X_Shipper_ID);
+		createShipperPickupTypes(To_X_Shipper_ID);
+		
+		return "OK";
+	}
+	
+	private void createShipperPackaging(int To_X_Shipper_ID)
+	{
+		StringBuilder whereClause = new StringBuilder();
+		whereClause.append("X_Shipper_ID=" + p_X_Shipper_ID + " ");
+		whereClause.append("AND IsActive='Y' ");
+		whereClause.append("AND X_ShipperPackaging_ID NOT IN ( ");
+		whereClause.append("SELECT X_ShipperPackaging_ID ");
+		whereClause.append("FROM X_ShipperPackaging ");
+		whereClause.append("WHERE X_Shipper_ID=" + To_X_Shipper_ID + ")");
+		
+		int[] xspIds = X_X_ShipperPackaging.getAllIDs(X_X_ShipperPackaging.Table_Name, whereClause.toString(), get_TrxName());		
+		for (int xspId : xspIds)
+		{
+			X_X_ShipperPackaging xsp = new X_X_ShipperPackaging(getCtx(), xspId, get_TrxName());
+			X_X_ShipperPackaging sp = new X_X_ShipperPackaging(getCtx(), 0, null);
+			sp.setDescription(xsp.getDescription());
+			sp.setIsActive(xsp.isActive());
+			sp.setIsDefault(xsp.isDefault());
+			sp.setName(xsp.getName());
+			sp.setValue(xsp.getValue());
+			sp.setWeight(xsp.getWeight());
+			sp.setX_Shipper_ID(To_X_Shipper_ID);
+			sp.saveEx();				
+		}
+	}
+	
+	private void createShipperLabels(int To_X_Shipper_ID)
+	{
+		StringBuilder whereClause = new StringBuilder();
+		whereClause.append("X_Shipper_ID=" + p_X_Shipper_ID + " ");
+		whereClause.append("AND IsActive='Y' ");
+		whereClause.append("AND X_ShipperLabels_ID NOT IN ( ");
+		whereClause.append("SELECT X_ShipperLabels_ID ");
+		whereClause.append("FROM X_ShipperLabels ");
+		whereClause.append("WHERE X_Shipper_ID=" + To_X_Shipper_ID + ")");
+		
+		int[] xslIds = X_X_ShipperLabels.getAllIDs(X_X_ShipperLabels.Table_Name, whereClause.toString(), get_TrxName());		
+		for (int xslId : xslIds)
+		{
+			X_X_ShipperLabels xsl = new X_X_ShipperLabels(getCtx(), xslId, get_TrxName());
+			X_X_ShipperLabels sl = new X_X_ShipperLabels(getCtx(), 0, null);
+			sl.setDescription(xsl.getDescription());
+			sl.setHeight(xsl.getHeight());
+			sl.setIsActive(xsl.isActive());
+			sl.setIsDefault(xsl.isDefault());
+			sl.setLabelPrintMethod(xsl.getLabelPrintMethod());
+			sl.setName(xsl.getName());
+			sl.setValue(xsl.getValue());
+			sl.setWidth(xsl.getWidth());
+			sl.setX_Shipper_ID(To_X_Shipper_ID);
+			sl.saveEx();				
+		}
+	}
+	
+	private void createShipperPickupTypes(int To_X_Shipper_ID)
+	{
+		StringBuilder whereClause = new StringBuilder();
+		whereClause.append("X_Shipper_ID=" + p_X_Shipper_ID + " ");
+		whereClause.append("AND IsActive='Y' ");
+		whereClause.append("AND X_ShipperPickupTypes_ID NOT IN ( ");
+		whereClause.append("SELECT X_ShipperPickupTypes_ID ");
+		whereClause.append("FROM X_ShipperPickupTypes ");
+		whereClause.append("WHERE X_Shipper_ID=" + To_X_Shipper_ID + ")");
+		
+		int[] xsptIds = X_X_ShipperPickupTypes.getAllIDs(X_X_ShipperPickupTypes.Table_Name, whereClause.toString(), get_TrxName());		
+		for (int xsptId : xsptIds)
+		{
+			X_X_ShipperPickupTypes xspt = new X_X_ShipperPickupTypes(getCtx(), xsptId, get_TrxName());
+			X_X_ShipperPickupTypes spt = new X_X_ShipperPickupTypes(getCtx(), 0, null);
+			spt.setDescription(xspt.getDescription());
+			spt.setIsActive(xspt.isActive());
+			spt.setIsDefault(xspt.isDefault());
+			spt.setName(xspt.getName());
+			spt.setValue(xspt.getValue());
+			spt.setX_Shipper_ID(To_X_Shipper_ID);			
+			spt.saveEx();				
+		}
+	}
+
+}

org.adempiere.base/src/org/adempiere/process/ShipperCreateFrom.java

@@ -0,0 +1,100 @@
+package org.adempiere.process;
+
+import org.compiere.model.MShipper;
+import org.compiere.model.MShipperLabels;
+import org.compiere.model.MShipperPackaging;
+import org.compiere.model.MShipperPickupTypes;
+import org.compiere.model.X_X_ShipperLabels;
+import org.compiere.model.X_X_ShipperPackaging;
+import org.compiere.model.X_X_ShipperPickupTypes;
+import org.compiere.process.SvrProcess;
+
+public class ShipperCreateFrom extends SvrProcess
+{
+	private MShipper m_shipper;
+
+	@Override
+	protected void prepare() 
+	{
+		m_shipper = new MShipper(getCtx(), getRecord_ID(), get_TrxName());
+	}
+
+	@Override
+	protected String doIt() throws Exception 
+	{		
+		createShipperPackaging();
+		createShipperLabels();
+		createShipperPickupTypes();
+		
+		return "OK";
+	}
+	
+	private void createShipperPackaging()
+	{
+		StringBuilder whereClause = new StringBuilder();
+		whereClause.append("X_Shipper_ID=" + m_shipper.getX_Shipper_ID() + " ");
+		whereClause.append("AND IsActive='Y' ");
+		whereClause.append("AND X_ShipperPackaging_ID NOT IN ( ");
+		whereClause.append("SELECT X_ShipperPackaging_ID ");
+		whereClause.append("FROM M_ShipperPackaging ");
+		whereClause.append("WHERE M_Shipper_ID=" + m_shipper.getM_Shipper_ID() + ")");
+		
+		int[] xspIds = X_X_ShipperPackaging.getAllIDs(X_X_ShipperPackaging.Table_Name, whereClause.toString(), get_TrxName());		
+		for (int xspId : xspIds)
+		{
+			X_X_ShipperPackaging xsp = new X_X_ShipperPackaging(getCtx(), xspId, get_TrxName());
+			MShipperPackaging sp = new MShipperPackaging(getCtx(), 0, null);
+			sp.setM_Shipper_ID(m_shipper.getM_Shipper_ID());
+			sp.setX_ShipperPackaging_ID(xsp.getX_ShipperPackaging_ID());
+			sp.setIsDefault(xsp.isDefault());
+			sp.setWeight(xsp.getWeight());
+			sp.saveEx();				
+		}
+	}
+	
+	private void createShipperLabels()
+	{
+		StringBuilder whereClause = new StringBuilder();
+		whereClause.append("X_Shipper_ID=" + m_shipper.getX_Shipper_ID() + " ");
+		whereClause.append("AND IsActive='Y' ");
+		whereClause.append("AND X_ShipperLabels_ID NOT IN ( ");
+		whereClause.append("SELECT X_ShipperLabels_ID ");
+		whereClause.append("FROM M_ShipperLabels ");
+		whereClause.append("WHERE M_Shipper_ID=" + m_shipper.getM_Shipper_ID() + ")");
+		
+		int[] xslIds = X_X_ShipperLabels.getAllIDs(X_X_ShipperLabels.Table_Name, whereClause.toString(), get_TrxName());		
+		for (int xslId : xslIds)
+		{
+			X_X_ShipperLabels xsl = new X_X_ShipperLabels(getCtx(), xslId, get_TrxName());
+			MShipperLabels sl = new MShipperLabels(getCtx(), 0, null);
+			sl.setM_Shipper_ID(m_shipper.getM_Shipper_ID());
+			sl.setX_ShipperLabels_ID(xsl.getX_ShipperLabels_ID());
+			sl.setIsDefault(xsl.isDefault());
+			sl.setLabelPrintMethod(xsl.getLabelPrintMethod());
+			sl.saveEx();				
+		}
+	}
+	
+	private void createShipperPickupTypes()
+	{
+		StringBuilder whereClause = new StringBuilder();
+		whereClause.append("X_Shipper_ID=" + m_shipper.getX_Shipper_ID() + " ");
+		whereClause.append("AND IsActive='Y' ");
+		whereClause.append("AND X_ShipperPickupTypes_ID NOT IN ( ");
+		whereClause.append("SELECT X_ShipperPickupTypes_ID ");
+		whereClause.append("FROM M_ShipperPickupTypes ");
+		whereClause.append("WHERE M_Shipper_ID=" + m_shipper.getM_Shipper_ID() + ")");
+		
+		int[] xsptIds = X_X_ShipperPickupTypes.getAllIDs(X_X_ShipperPickupTypes.Table_Name, whereClause.toString(), get_TrxName());		
+		for (int xsptId : xsptIds)
+		{
+			X_X_ShipperPickupTypes xspt = new X_X_ShipperPickupTypes(getCtx(), xsptId, get_TrxName());
+			MShipperPickupTypes spt = new MShipperPickupTypes(getCtx(), 0, null);
+			spt.setM_Shipper_ID(m_shipper.getM_Shipper_ID());
+			spt.setX_ShipperPickupTypes_ID(xspt.getX_ShipperPickupTypes_ID());
+			spt.setIsDefault(xspt.isDefault());
+			spt.saveEx();				
+		}
+	}
+
+}

org.adempiere.base/src/org/adempiere/process/VoidShipmentProcess.java

@@ -0,0 +1,71 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 2008 Carlos Ruiz											  *
+ * Copyright (C) 2008 Idalica              									  *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.process;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.logging.Level;
+
+import org.compiere.model.MPackage;
+import org.compiere.model.MShippingTransaction;
+import org.compiere.process.ProcessInfoLog;
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.SvrProcess;
+
+/**
+ * 
+ * @author Low Heng Sin
+ *
+ */
+public class VoidShipmentProcess extends SvrProcess 
+{
+	@Override
+	protected void prepare() 
+	{
+		ProcessInfoParameter[] para = getParameter();
+		for (int i = 0; i < para.length; i++)
+		{
+			String name = para[i].getParameterName();
+			if (para[i].getParameter() == null)
+				;
+			else
+				log.log(Level.SEVERE, "prepare - Unknown Parameter: " + name);
+		}
+    }
+	
+	@Override
+	protected String doIt() throws Exception 
+	{
+		MPackage m_package = new MPackage(getCtx(), getRecord_ID(), get_TrxName());
+		boolean ok = m_package.processOnline(MShippingTransaction.ACTION_VoidShipment, false);
+		m_package.saveEx();
+		if (!ok)
+		{
+			getProcessInfo().setError(true);
+			getProcessInfo().addLog(new ProcessInfoLog(getProcessInfo().getAD_Process_ID(), 
+					new Timestamp(System.currentTimeMillis()), null, m_package.getErrorMessage()));
+			return m_package.getErrorMessage();
+		}
+		else
+		{
+			m_package.setPrice(BigDecimal.ZERO);
+			m_package.setSurcharges(BigDecimal.ZERO);
+			m_package.saveEx();
+		}
+		getProcessInfo().addLog(new ProcessInfoLog(getProcessInfo().getAD_Process_ID(), 
+				new Timestamp(System.currentTimeMillis()), null, m_package.getShippingRespMessage()));
+		return m_package.getShippingRespMessage();
+	}
+}

org.adempiere.base/src/org/adempiere/util/ShippingUtil.java

@@ -0,0 +1,92 @@
+package org.adempiere.util;
+
+import org.compiere.util.DB;
+
+
+public class ShippingUtil 
+{
+	public static String getSenderShipperAccount(int shipper_id, int org_id)
+	{
+		StringBuilder sb = new StringBuilder();
+    	sb.append("SELECT sa.ShipperAccount ");
+    	sb.append("FROM C_BP_ShippingAcct sa, M_Shipper s ");
+    	sb.append("WHERE s.M_Shipper_ID= ? ");
+    	sb.append("AND sa.IsActive = 'Y' ");
+    	sb.append("AND sa.C_BPartner_ID = s.C_BPartner_ID ");
+    	sb.append("AND sa.AD_Org_ID= ? ");
+    	return DB.getSQLValueString(null, sb.toString(), shipper_id, org_id);
+	}
+	
+	public static String getSenderDutiesShipperAccount(int shipper_id, int org_id)
+	{
+		StringBuilder sb = new StringBuilder();
+    	sb.append("SELECT sa.DutiesShipperAccount ");
+    	sb.append("FROM C_BP_ShippingAcct sa, M_Shipper s ");
+    	sb.append("WHERE s.M_Shipper_ID= ? ");
+    	sb.append("AND sa.IsActive = 'Y' ");
+    	sb.append("AND sa.C_BPartner_ID = s.C_BPartner_ID ");
+    	sb.append("AND sa.AD_Org_ID= ? ");
+    	return DB.getSQLValueString(null, sb.toString(), shipper_id, org_id);
+	}
+	
+	public static int findRecipientAccountLocationId(int shipper_id, int c_bpartner_id, int ad_org_id, int inout_id, int order_id) 
+	{
+		int accountLocationId= DB.getSQLValue(null, 
+				"SELECT C_BPartner_Location_ID "
+			 + "  FROM C_BP_ShippingAcct "
+			 + " WHERE C_BPartner_ID = ? "
+			 + "   AND AD_Org_ID = " + ad_org_id
+			 + " AND M_ShippingProcessor_ID IN (SELECT DISTINCT M_ShippingProcessor_ID FROM M_Shipper WHERE M_Shipper_ID = " + shipper_id + ")"
+//			 + "   AND M_Shipper_ID = " + shipper_id
+			 + "   AND C_BPartner_Location_ID Is Not Null", c_bpartner_id);
+		if (accountLocationId <= 0) 
+		{
+			// Try without organization
+		    accountLocationId = DB.getSQLValue(null, 
+		   			"SELECT bps.C_BPartner_Location_ID"
+		   		 + "  FROM C_BP_ShippingAcct bps, C_BPartner_Location bpl, C_Location l "
+		   		 + " WHERE bps.C_BPartner_ID = ? "
+				 + " AND bps.M_ShippingProcessor_ID IN (SELECT DISTINCT M_ShippingProcessor_ID FROM M_Shipper WHERE M_Shipper_ID = " + shipper_id + ")"
+//		   		 + "   AND bps.M_Shipper_ID = " + shipper_id
+		   		 + "   AND bps.C_BPartner_Location_ID = bpl.C_BPartner_Location_ID "
+		   		 + "   AND bpl.C_Location_ID = l.C_Location_ID "
+		   		 + "   AND l.Postal IS NOT NULL ", c_bpartner_id);
+		}
+		// if not found then try to get it from the order invoice location, or from the invoice location
+		if (accountLocationId <= 0) 
+		{
+			if (inout_id > 0) 
+			{
+			    accountLocationId = DB.getSQLValue(null, 
+			    		"SELECT bpl.C_BPartner_Location_ID"
+			    		 + "  FROM M_InOut io, C_Order o, C_BPartner_Location bpl, C_Location l "
+			    		 + " WHERE io.M_InOut_ID = ? "
+			    		 + "   AND io.C_Order_ID = o.C_Order_ID "
+			    		 + "   AND o.Bill_Location_ID = bpl.C_BPartner_Location_ID "
+			    		 + "   AND bpl.C_Location_ID = l.C_Location_ID "
+			    		 + "   AND l.Postal IS NOT NULL ", inout_id);
+			    if (accountLocationId <= 0) {
+			        accountLocationId = DB.getSQLValue(null, 
+			        		"SELECT bpl.C_BPartner_Location_ID"
+			        		 + "  FROM M_InOut io, C_Invoice i, C_BPartner_Location bpl, C_Location l "
+			        		 + " WHERE io.M_InOut_ID = ? "
+			        		 + "   AND io.C_Invoice_ID = i.C_Invoice_ID "
+			        		 + "   AND i.C_BPartner_Location_ID = bpl.C_BPartner_Location_ID "
+			        		 + "   AND bpl.C_Location_ID = l.C_Location_ID "
+			        		 + "   AND l.Postal IS NOT NULL ", inout_id);
+			    }
+			} 
+			else 
+			{
+				accountLocationId = DB.getSQLValue(null, 
+			    		"SELECT bpl.C_BPartner_Location_ID"
+			    		 + "  FROM C_Order o, C_BPartner_Location bpl, C_Location l "
+			    		 + "   WHERE o.C_Order_ID = ?"
+			    		 + "   AND o.Bill_Location_ID = bpl.C_BPartner_Location_ID "
+			    		 + "   AND bpl.C_Location_ID = l.C_Location_ID "
+			    		 + "   AND l.Postal IS NOT NULL ", order_id);
+			}
+		}
+		return accountLocationId;
+	}
+}

org.adempiere.base/src/org/compiere/model/I_AD_ClientInfo.java

@@ -247,21 +247,16 @@ public interface I_AD_ClientInfo
 
 	public org.compiere.model.I_C_Calendar getC_Calendar() throws RuntimeException;
 
-    /** Column name Created */
-    public static final String COLUMNNAME_Created = "Created";
+    /** Column name C_ChargeFreight_ID */
+    public static final String COLUMNNAME_C_ChargeFreight_ID = "C_ChargeFreight_ID";
 
-	/** Get Created.
-	  * Date this record was created
-	  */
-	public Timestamp getCreated();
+	/** Set Charge for Freight	  */
+	public void setC_ChargeFreight_ID (int C_ChargeFreight_ID);
 
-    /** Column name CreatedBy */
-    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+	/** Get Charge for Freight	  */
+	public int getC_ChargeFreight_ID();
 
-	/** Get Created By.
-	  * User who created this records
-	  */
-	public int getCreatedBy();
+	public org.compiere.model.I_C_Charge getC_ChargeFreight() throws RuntimeException;
 
     /** Column name C_UOM_Length_ID */
     public static final String COLUMNNAME_C_UOM_Length_ID = "C_UOM_Length_ID";
@@ -323,6 +318,22 @@ public interface I_AD_ClientInfo
 
 	public org.compiere.model.I_C_UOM getC_UOM_Weight() throws RuntimeException;
 
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
+
+	/** Get Created.
+	  * Date this record was created
+	  */
+	public Timestamp getCreated();
+
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
+	  */
+	public int getCreatedBy();
+
     /** Column name IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
@@ -403,10 +414,10 @@ public interface I_AD_ClientInfo
     /** Column name StorageArchive_ID */
     public static final String COLUMNNAME_StorageArchive_ID = "StorageArchive_ID";
 
-	/** Set StorageArchive_ID	  */
+	/** Set Archive Store	  */
 	public void setStorageArchive_ID (int StorageArchive_ID);
 
-	/** Get StorageArchive_ID	  */
+	/** Get Archive Store	  */
 	public int getStorageArchive_ID();
 
 	public org.compiere.model.I_AD_StorageProvider getStorageArchive() throws RuntimeException;

org.adempiere.base/src/org/compiere/model/I_C_BP_ShippingAcct.java

@@ -0,0 +1,195 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Interface for C_BP_ShippingAcct
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a
+ */
+public interface I_C_BP_ShippingAcct 
+{
+
+    /** TableName=C_BP_ShippingAcct */
+    public static final String Table_Name = "C_BP_ShippingAcct";
+
+    /** AD_Table_ID=200043 */
+    public static final int Table_ID = 200043;
+
+    KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
+
+    /** AccessLevel = 3 - Client - Org 
+     */
+    BigDecimal accessLevel = BigDecimal.valueOf(3);
+
+    /** Load Meta Data */
+
+    /** Column name AD_Client_ID */
+    public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
+
+	/** Get Client.
+	  * Client/Tenant for this installation.
+	  */
+	public int getAD_Client_ID();
+
+    /** Column name AD_Org_ID */
+    public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
+
+	/** Set Organization.
+	  * Organizational entity within client
+	  */
+	public void setAD_Org_ID (int AD_Org_ID);
+
+	/** Get Organization.
+	  * Organizational entity within client
+	  */
+	public int getAD_Org_ID();
+
+    /** Column name C_BP_ShippingAcct_ID */
+    public static final String COLUMNNAME_C_BP_ShippingAcct_ID = "C_BP_ShippingAcct_ID";
+
+	/** Set Business Partner Shipping Account	  */
+	public void setC_BP_ShippingAcct_ID (int C_BP_ShippingAcct_ID);
+
+	/** Get Business Partner Shipping Account	  */
+	public int getC_BP_ShippingAcct_ID();
+
+    /** Column name C_BP_ShippingAcct_UU */
+    public static final String COLUMNNAME_C_BP_ShippingAcct_UU = "C_BP_ShippingAcct_UU";
+
+	/** Set C_BP_ShippingAcct_UU	  */
+	public void setC_BP_ShippingAcct_UU (String C_BP_ShippingAcct_UU);
+
+	/** Get C_BP_ShippingAcct_UU	  */
+	public String getC_BP_ShippingAcct_UU();
+
+    /** Column name C_BPartner_ID */
+    public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
+
+	/** Set Business Partner .
+	  * Identifies a Business Partner
+	  */
+	public void setC_BPartner_ID (int C_BPartner_ID);
+
+	/** Get Business Partner .
+	  * Identifies a Business Partner
+	  */
+	public int getC_BPartner_ID();
+
+	public org.compiere.model.I_C_BPartner getC_BPartner() throws RuntimeException;
+
+    /** Column name C_BPartner_Location_ID */
+    public static final String COLUMNNAME_C_BPartner_Location_ID = "C_BPartner_Location_ID";
+
+	/** Set Partner Location.
+	  * Identifies the (ship to) address for this Business Partner
+	  */
+	public void setC_BPartner_Location_ID (int C_BPartner_Location_ID);
+
+	/** Get Partner Location.
+	  * Identifies the (ship to) address for this Business Partner
+	  */
+	public int getC_BPartner_Location_ID();
+
+	public org.compiere.model.I_C_BPartner_Location getC_BPartner_Location() throws RuntimeException;
+
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
+
+	/** Get Created.
+	  * Date this record was created
+	  */
+	public Timestamp getCreated();
+
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
+	  */
+	public int getCreatedBy();
+
+    /** Column name DutiesShipperAccount */
+    public static final String COLUMNNAME_DutiesShipperAccount = "DutiesShipperAccount";
+
+	/** Set Duties Shipper Account	  */
+	public void setDutiesShipperAccount (String DutiesShipperAccount);
+
+	/** Get Duties Shipper Account	  */
+	public String getDutiesShipperAccount();
+
+    /** Column name IsActive */
+    public static final String COLUMNNAME_IsActive = "IsActive";
+
+	/** Set Active.
+	  * The record is active in the system
+	  */
+	public void setIsActive (boolean IsActive);
+
+	/** Get Active.
+	  * The record is active in the system
+	  */
+	public boolean isActive();
+
+    /** Column name M_ShippingProcessor_ID */
+    public static final String COLUMNNAME_M_ShippingProcessor_ID = "M_ShippingProcessor_ID";
+
+	/** Set Shipping Processor	  */
+	public void setM_ShippingProcessor_ID (int M_ShippingProcessor_ID);
+
+	/** Get Shipping Processor	  */
+	public int getM_ShippingProcessor_ID();
+
+	public org.compiere.model.I_M_ShippingProcessor getM_ShippingProcessor() throws RuntimeException;
+
+    /** Column name ShipperAccount */
+    public static final String COLUMNNAME_ShipperAccount = "ShipperAccount";
+
+	/** Set Shipper Account Number	  */
+	public void setShipperAccount (String ShipperAccount);
+
+	/** Get Shipper Account Number	  */
+	public String getShipperAccount();
+
+    /** Column name ShipperMeter */
+    public static final String COLUMNNAME_ShipperMeter = "ShipperMeter";
+
+	/** Set Shipper Meter	  */
+	public void setShipperMeter (String ShipperMeter);
+
+	/** Get Shipper Meter	  */
+	public String getShipperMeter();
+
+    /** Column name Updated */
+    public static final String COLUMNNAME_Updated = "Updated";
+
+	/** Get Updated.
+	  * Date this record was updated
+	  */
+	public Timestamp getUpdated();
+
+    /** Column name UpdatedBy */
+    public static final String COLUMNNAME_UpdatedBy = "UpdatedBy";
+
+	/** Get Updated By.
+	  * User who updated this records
+	  */
+	public int getUpdatedBy();
+}

org.adempiere.base/src/org/compiere/model/I_C_Order.java

@@ -314,32 +314,6 @@ public interface I_C_Order
 
 	public org.compiere.model.I_C_DocType getC_DocTypeTarget() throws RuntimeException;
 
-    /** Column name ChargeAmt */
-    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
-
-	/** Set Charge amount.
-	  * Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt);
-
-	/** Get Charge amount.
-	  * Charge Amount
-	  */
-	public BigDecimal getChargeAmt();
-
-    /** Column name CopyFrom */
-    public static final String COLUMNNAME_CopyFrom = "CopyFrom";
-
-	/** Set Copy From.
-	  * Copy From Record
-	  */
-	public void setCopyFrom (String CopyFrom);
-
-	/** Get Copy From.
-	  * Copy From Record
-	  */
-	public String getCopyFrom();
-
     /** Column name C_Order_ID */
     public static final String COLUMNNAME_C_Order_ID = "C_Order_ID";
 
@@ -353,6 +327,15 @@ public interface I_C_Order
 	  */
 	public int getC_Order_ID();
 
+    /** Column name C_Order_UU */
+    public static final String COLUMNNAME_C_Order_UU = "C_Order_UU";
+
+	/** Set C_Order_UU	  */
+	public void setC_Order_UU (String C_Order_UU);
+
+	/** Get C_Order_UU	  */
+	public String getC_Order_UU();
+
     /** Column name C_OrderSource_ID */
     public static final String COLUMNNAME_C_OrderSource_ID = "C_OrderSource_ID";
 
@@ -364,15 +347,6 @@ public interface I_C_Order
 
 	public org.compiere.model.I_C_OrderSource getC_OrderSource() throws RuntimeException;
 
-    /** Column name C_Order_UU */
-    public static final String COLUMNNAME_C_Order_UU = "C_Order_UU";
-
-	/** Set C_Order_UU	  */
-	public void setC_Order_UU (String C_Order_UU);
-
-	/** Get C_Order_UU	  */
-	public String getC_Order_UU();
-
     /** Column name C_Payment_ID */
     public static final String COLUMNNAME_C_Payment_ID = "C_Payment_ID";
 
@@ -433,6 +407,32 @@ public interface I_C_Order
 
 	public org.compiere.model.I_C_Project getC_Project() throws RuntimeException;
 
+    /** Column name ChargeAmt */
+    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
+
+	/** Set Charge amount.
+	  * Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt);
+
+	/** Get Charge amount.
+	  * Charge Amount
+	  */
+	public BigDecimal getChargeAmt();
+
+    /** Column name CopyFrom */
+    public static final String COLUMNNAME_CopyFrom = "CopyFrom";
+
+	/** Set Copy From.
+	  * Copy From Record
+	  */
+	public void setCopyFrom (String CopyFrom);
+
+	/** Get Copy From.
+	  * Copy From Record
+	  */
+	public String getCopyFrom();
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -1107,6 +1107,15 @@ public interface I_C_Order
 	  */
 	public boolean isSendEMail();
 
+    /** Column name ShippingRateInquiry */
+    public static final String COLUMNNAME_ShippingRateInquiry = "ShippingRateInquiry";
+
+	/** Set Rate Inquiry	  */
+	public void setShippingRateInquiry (String ShippingRateInquiry);
+
+	/** Get Rate Inquiry	  */
+	public String getShippingRateInquiry();
+
     /** Column name TotalLines */
     public static final String COLUMNNAME_TotalLines = "TotalLines";
 

org.adempiere.base/src/org/compiere/model/I_M_InOut.java

@@ -180,19 +180,6 @@ public interface I_M_InOut
 
 	public org.compiere.model.I_C_DocType getC_DocType() throws RuntimeException;
 
-    /** Column name ChargeAmt */
-    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
-
-	/** Set Charge amount.
-	  * Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt);
-
-	/** Get Charge amount.
-	  * Charge Amount
-	  */
-	public BigDecimal getChargeAmt();
-
     /** Column name C_Invoice_ID */
     public static final String COLUMNNAME_C_Invoice_ID = "C_Invoice_ID";
 
@@ -238,6 +225,19 @@ public interface I_M_InOut
 
 	public org.compiere.model.I_C_Project getC_Project() throws RuntimeException;
 
+    /** Column name ChargeAmt */
+    public static final String COLUMNNAME_ChargeAmt = "ChargeAmt";
+
+	/** Set Charge amount.
+	  * Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt);
+
+	/** Get Charge amount.
+	  * Charge Amount
+	  */
+	public BigDecimal getChargeAmt();
+
     /** Column name CreateConfirm */
     public static final String COLUMNNAME_CreateConfirm = "CreateConfirm";
 
@@ -460,6 +460,15 @@ public interface I_M_InOut
 
 	public org.compiere.model.I_AD_User getDropShip_User() throws RuntimeException;
 
+    /** Column name FOB */
+    public static final String COLUMNNAME_FOB = "FOB";
+
+	/** Set Freight Terms	  */
+	public void setFOB (String FOB);
+
+	/** Get Freight Terms	  */
+	public String getFOB();
+
     /** Column name FreightAmt */
     public static final String COLUMNNAME_FreightAmt = "FreightAmt";
 
@@ -473,6 +482,15 @@ public interface I_M_InOut
 	  */
 	public BigDecimal getFreightAmt();
 
+    /** Column name FreightCharges */
+    public static final String COLUMNNAME_FreightCharges = "FreightCharges";
+
+	/** Set Freight Charges	  */
+	public void setFreightCharges (String FreightCharges);
+
+	/** Get Freight Charges	  */
+	public String getFreightCharges();
+
     /** Column name FreightCostRule */
     public static final String COLUMNNAME_FreightCostRule = "FreightCostRule";
 
@@ -499,6 +517,15 @@ public interface I_M_InOut
 	  */
 	public String getGenerateTo();
 
+    /** Column name Insurance */
+    public static final String COLUMNNAME_Insurance = "Insurance";
+
+	/** Set Insurance	  */
+	public void setInsurance (String Insurance);
+
+	/** Get Insurance	  */
+	public String getInsurance();
+
     /** Column name IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
@@ -512,6 +539,15 @@ public interface I_M_InOut
 	  */
 	public boolean isActive();
 
+    /** Column name IsAlternateReturnAddress */
+    public static final String COLUMNNAME_IsAlternateReturnAddress = "IsAlternateReturnAddress";
+
+	/** Set Alternate Return Address	  */
+	public void setIsAlternateReturnAddress (boolean IsAlternateReturnAddress);
+
+	/** Get Alternate Return Address	  */
+	public boolean isAlternateReturnAddress();
+
     /** Column name IsApproved */
     public static final String COLUMNNAME_IsApproved = "IsApproved";
 
@@ -612,32 +648,6 @@ public interface I_M_InOut
 	/** Get M_InOut_UU	  */
 	public String getM_InOut_UU();
 
-    /** Column name MovementDate */
-    public static final String COLUMNNAME_MovementDate = "MovementDate";
-
-	/** Set Movement Date.
-	  * Date a product was moved in or out of inventory
-	  */
-	public void setMovementDate (Timestamp MovementDate);
-
-	/** Get Movement Date.
-	  * Date a product was moved in or out of inventory
-	  */
-	public Timestamp getMovementDate();
-
-    /** Column name MovementType */
-    public static final String COLUMNNAME_MovementType = "MovementType";
-
-	/** Set Movement Type.
-	  * Method of moving the inventory
-	  */
-	public void setMovementType (String MovementType);
-
-	/** Get Movement Type.
-	  * Method of moving the inventory
-	  */
-	public String getMovementType();
-
     /** Column name M_RMA_ID */
     public static final String COLUMNNAME_M_RMA_ID = "M_RMA_ID";
 
@@ -683,6 +693,32 @@ public interface I_M_InOut
 
 	public org.compiere.model.I_M_Warehouse getM_Warehouse() throws RuntimeException;
 
+    /** Column name MovementDate */
+    public static final String COLUMNNAME_MovementDate = "MovementDate";
+
+	/** Set Movement Date.
+	  * Date a product was moved in or out of inventory
+	  */
+	public void setMovementDate (Timestamp MovementDate);
+
+	/** Get Movement Date.
+	  * Date a product was moved in or out of inventory
+	  */
+	public Timestamp getMovementDate();
+
+    /** Column name MovementType */
+    public static final String COLUMNNAME_MovementType = "MovementType";
+
+	/** Set Movement Type.
+	  * Method of moving the inventory
+	  */
+	public void setMovementType (String MovementType);
+
+	/** Get Movement Type.
+	  * Method of moving the inventory
+	  */
+	public String getMovementType();
+
     /** Column name NoPackages */
     public static final String COLUMNNAME_NoPackages = "NoPackages";
 
@@ -792,6 +828,39 @@ public interface I_M_InOut
 	/** Get Referenced Shipment	  */
 	public int getRef_InOut_ID();
 
+    /** Column name ReturnBPartner_ID */
+    public static final String COLUMNNAME_ReturnBPartner_ID = "ReturnBPartner_ID";
+
+	/** Set Return Partner	  */
+	public void setReturnBPartner_ID (int ReturnBPartner_ID);
+
+	/** Get Return Partner	  */
+	public int getReturnBPartner_ID();
+
+	public org.compiere.model.I_C_BPartner getReturnBPartner() throws RuntimeException;
+
+    /** Column name ReturnLocation_ID */
+    public static final String COLUMNNAME_ReturnLocation_ID = "ReturnLocation_ID";
+
+	/** Set Return Location	  */
+	public void setReturnLocation_ID (int ReturnLocation_ID);
+
+	/** Get Return Location	  */
+	public int getReturnLocation_ID();
+
+	public org.compiere.model.I_C_BPartner_Location getReturnLocation() throws RuntimeException;
+
+    /** Column name ReturnUser_ID */
+    public static final String COLUMNNAME_ReturnUser_ID = "ReturnUser_ID";
+
+	/** Set Return User/Contact	  */
+	public void setReturnUser_ID (int ReturnUser_ID);
+
+	/** Get Return User/Contact	  */
+	public int getReturnUser_ID();
+
+	public org.compiere.model.I_AD_User getReturnUser() throws RuntimeException;
+
     /** Column name Reversal_ID */
     public static final String COLUMNNAME_Reversal_ID = "Reversal_ID";
 
@@ -848,6 +917,15 @@ public interface I_M_InOut
 	  */
 	public Timestamp getShipDate();
 
+    /** Column name ShipperAccount */
+    public static final String COLUMNNAME_ShipperAccount = "ShipperAccount";
+
+	/** Set Shipper Account Number	  */
+	public void setShipperAccount (String ShipperAccount);
+
+	/** Get Shipper Account Number	  */
+	public String getShipperAccount();
+
     /** Column name TrackingNo */
     public static final String COLUMNNAME_TrackingNo = "TrackingNo";
 

org.adempiere.base/src/org/compiere/model/I_M_Package.java

@@ -62,6 +62,95 @@ public interface I_M_Package
 	  */
 	public int getAD_Org_ID();
 
+    /** Column name BoxCount */
+    public static final String COLUMNNAME_BoxCount = "BoxCount";
+
+	/** Set Box Count	  */
+	public void setBoxCount (int BoxCount);
+
+	/** Get Box Count	  */
+	public int getBoxCount();
+
+    /** Column name C_BP_ShippingAcct_ID */
+    public static final String COLUMNNAME_C_BP_ShippingAcct_ID = "C_BP_ShippingAcct_ID";
+
+	/** Set Business Partner Shipping Account	  */
+	public void setC_BP_ShippingAcct_ID (int C_BP_ShippingAcct_ID);
+
+	/** Get Business Partner Shipping Account	  */
+	public int getC_BP_ShippingAcct_ID();
+
+	public org.compiere.model.I_C_BP_ShippingAcct getC_BP_ShippingAcct() throws RuntimeException;
+
+    /** Column name C_BPartner_Location_ID */
+    public static final String COLUMNNAME_C_BPartner_Location_ID = "C_BPartner_Location_ID";
+
+	/** Set Partner Location.
+	  * Identifies the (ship to) address for this Business Partner
+	  */
+	public void setC_BPartner_Location_ID (int C_BPartner_Location_ID);
+
+	/** Get Partner Location.
+	  * Identifies the (ship to) address for this Business Partner
+	  */
+	public int getC_BPartner_Location_ID();
+
+	public org.compiere.model.I_C_BPartner_Location getC_BPartner_Location() throws RuntimeException;
+
+    /** Column name C_Currency_ID */
+    public static final String COLUMNNAME_C_Currency_ID = "C_Currency_ID";
+
+	/** Set Currency.
+	  * The Currency for this record
+	  */
+	public void setC_Currency_ID (int C_Currency_ID);
+
+	/** Get Currency.
+	  * The Currency for this record
+	  */
+	public int getC_Currency_ID();
+
+	public org.compiere.model.I_C_Currency getC_Currency() throws RuntimeException;
+
+    /** Column name C_UOM_Length_ID */
+    public static final String COLUMNNAME_C_UOM_Length_ID = "C_UOM_Length_ID";
+
+	/** Set UOM for Length.
+	  * Standard Unit of Measure for Length
+	  */
+	public void setC_UOM_Length_ID (int C_UOM_Length_ID);
+
+	/** Get UOM for Length.
+	  * Standard Unit of Measure for Length
+	  */
+	public int getC_UOM_Length_ID();
+
+	public org.compiere.model.I_C_UOM getC_UOM_Length() throws RuntimeException;
+
+    /** Column name C_UOM_Weight_ID */
+    public static final String COLUMNNAME_C_UOM_Weight_ID = "C_UOM_Weight_ID";
+
+	/** Set UOM for Weight.
+	  * Standard Unit of Measure for Weight
+	  */
+	public void setC_UOM_Weight_ID (int C_UOM_Weight_ID);
+
+	/** Get UOM for Weight.
+	  * Standard Unit of Measure for Weight
+	  */
+	public int getC_UOM_Weight_ID();
+
+	public org.compiere.model.I_C_UOM getC_UOM_Weight() throws RuntimeException;
+
+    /** Column name CashOnDelivery */
+    public static final String COLUMNNAME_CashOnDelivery = "CashOnDelivery";
+
+	/** Set COD	  */
+	public void setCashOnDelivery (boolean CashOnDelivery);
+
+	/** Get COD	  */
+	public boolean isCashOnDelivery();
+
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -91,6 +180,28 @@ public interface I_M_Package
 	  */
 	public Timestamp getDateReceived();
 
+    /** Column name DeliveryConfirmation */
+    public static final String COLUMNNAME_DeliveryConfirmation = "DeliveryConfirmation";
+
+	/** Set Delivery Confirmation.
+	  * EMail Delivery confirmation
+	  */
+	public void setDeliveryConfirmation (boolean DeliveryConfirmation);
+
+	/** Get Delivery Confirmation.
+	  * EMail Delivery confirmation
+	  */
+	public boolean isDeliveryConfirmation();
+
+    /** Column name DeliveryConfirmationType */
+    public static final String COLUMNNAME_DeliveryConfirmationType = "DeliveryConfirmationType";
+
+	/** Set Delivery Confirmation Type	  */
+	public void setDeliveryConfirmationType (String DeliveryConfirmationType);
+
+	/** Get Delivery Confirmation Type	  */
+	public String getDeliveryConfirmationType();
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
@@ -117,6 +228,143 @@ public interface I_M_Package
 	  */
 	public String getDocumentNo();
 
+    /** Column name DotHazardClassOrDivision */
+    public static final String COLUMNNAME_DotHazardClassOrDivision = "DotHazardClassOrDivision";
+
+	/** Set Dot Hazard Class or Division	  */
+	public void setDotHazardClassOrDivision (String DotHazardClassOrDivision);
+
+	/** Get Dot Hazard Class or Division	  */
+	public String getDotHazardClassOrDivision();
+
+    /** Column name DryIceWeight */
+    public static final String COLUMNNAME_DryIceWeight = "DryIceWeight";
+
+	/** Set Dry Ice Weight	  */
+	public void setDryIceWeight (BigDecimal DryIceWeight);
+
+	/** Get Dry Ice Weight	  */
+	public BigDecimal getDryIceWeight();
+
+    /** Column name DutiesShipperAccount */
+    public static final String COLUMNNAME_DutiesShipperAccount = "DutiesShipperAccount";
+
+	/** Set Duties Shipper Account	  */
+	public void setDutiesShipperAccount (String DutiesShipperAccount);
+
+	/** Get Duties Shipper Account	  */
+	public String getDutiesShipperAccount();
+
+    /** Column name EstimatedWeight */
+    public static final String COLUMNNAME_EstimatedWeight = "EstimatedWeight";
+
+	/** Set Estimated Weight	  */
+	public void setEstimatedWeight (BigDecimal EstimatedWeight);
+
+	/** Get Estimated Weight	  */
+	public BigDecimal getEstimatedWeight();
+
+    /** Column name FOB */
+    public static final String COLUMNNAME_FOB = "FOB";
+
+	/** Set Freight Terms	  */
+	public void setFOB (String FOB);
+
+	/** Get Freight Terms	  */
+	public String getFOB();
+
+    /** Column name FreightCharges */
+    public static final String COLUMNNAME_FreightCharges = "FreightCharges";
+
+	/** Set Freight Charges	  */
+	public void setFreightCharges (String FreightCharges);
+
+	/** Get Freight Charges	  */
+	public String getFreightCharges();
+
+    /** Column name HandlingCharge */
+    public static final String COLUMNNAME_HandlingCharge = "HandlingCharge";
+
+	/** Set Handling Charge	  */
+	public void setHandlingCharge (BigDecimal HandlingCharge);
+
+	/** Get Handling Charge	  */
+	public BigDecimal getHandlingCharge();
+
+    /** Column name Height */
+    public static final String COLUMNNAME_Height = "Height";
+
+	/** Set Height	  */
+	public void setHeight (BigDecimal Height);
+
+	/** Get Height	  */
+	public BigDecimal getHeight();
+
+    /** Column name HoldAddress */
+    public static final String COLUMNNAME_HoldAddress = "HoldAddress";
+
+	/** Set Hold Address	  */
+	public void setHoldAddress (int HoldAddress);
+
+	/** Get Hold Address	  */
+	public int getHoldAddress();
+
+	public org.compiere.model.I_C_BPartner_Location getHoldAddr() throws RuntimeException;
+
+    /** Column name HomeDeliveryPremiumDate */
+    public static final String COLUMNNAME_HomeDeliveryPremiumDate = "HomeDeliveryPremiumDate";
+
+	/** Set Date	  */
+	public void setHomeDeliveryPremiumDate (Timestamp HomeDeliveryPremiumDate);
+
+	/** Get Date	  */
+	public Timestamp getHomeDeliveryPremiumDate();
+
+    /** Column name HomeDeliveryPremiumPhone */
+    public static final String COLUMNNAME_HomeDeliveryPremiumPhone = "HomeDeliveryPremiumPhone";
+
+	/** Set Phone Number	  */
+	public void setHomeDeliveryPremiumPhone (String HomeDeliveryPremiumPhone);
+
+	/** Get Phone Number	  */
+	public String getHomeDeliveryPremiumPhone();
+
+    /** Column name HomeDeliveryPremiumType */
+    public static final String COLUMNNAME_HomeDeliveryPremiumType = "HomeDeliveryPremiumType";
+
+	/** Set Home Delivery Premium Type	  */
+	public void setHomeDeliveryPremiumType (String HomeDeliveryPremiumType);
+
+	/** Get Home Delivery Premium Type	  */
+	public String getHomeDeliveryPremiumType();
+
+    /** Column name Insurance */
+    public static final String COLUMNNAME_Insurance = "Insurance";
+
+	/** Set Insurance	  */
+	public void setInsurance (String Insurance);
+
+	/** Get Insurance	  */
+	public String getInsurance();
+
+    /** Column name InsuredAmount */
+    public static final String COLUMNNAME_InsuredAmount = "InsuredAmount";
+
+	/** Set Insured Amount	  */
+	public void setInsuredAmount (BigDecimal InsuredAmount);
+
+	/** Get Insured Amount	  */
+	public BigDecimal getInsuredAmount();
+
+    /** Column name IsAccessible */
+    public static final String COLUMNNAME_IsAccessible = "IsAccessible";
+
+	/** Set Accessible	  */
+	public void setIsAccessible (boolean IsAccessible);
+
+	/** Get Accessible	  */
+	public boolean isAccessible();
+
     /** Column name IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
@@ -130,6 +378,150 @@ public interface I_M_Package
 	  */
 	public boolean isActive();
 
+    /** Column name IsAddedHandling */
+    public static final String COLUMNNAME_IsAddedHandling = "IsAddedHandling";
+
+	/** Set Added Handling	  */
+	public void setIsAddedHandling (boolean IsAddedHandling);
+
+	/** Get Added Handling	  */
+	public boolean isAddedHandling();
+
+    /** Column name IsCargoAircraftOnly */
+    public static final String COLUMNNAME_IsCargoAircraftOnly = "IsCargoAircraftOnly";
+
+	/** Set Cargo Aircraft Only	  */
+	public void setIsCargoAircraftOnly (boolean IsCargoAircraftOnly);
+
+	/** Get Cargo Aircraft Only	  */
+	public boolean isCargoAircraftOnly();
+
+    /** Column name IsDryIce */
+    public static final String COLUMNNAME_IsDryIce = "IsDryIce";
+
+	/** Set Dry Ice	  */
+	public void setIsDryIce (boolean IsDryIce);
+
+	/** Get Dry Ice	  */
+	public boolean isDryIce();
+
+    /** Column name IsDutiable */
+    public static final String COLUMNNAME_IsDutiable = "IsDutiable";
+
+	/** Set Dutiable	  */
+	public void setIsDutiable (boolean IsDutiable);
+
+	/** Get Dutiable	  */
+	public boolean isDutiable();
+
+    /** Column name IsFutureDayShipment */
+    public static final String COLUMNNAME_IsFutureDayShipment = "IsFutureDayShipment";
+
+	/** Set Future Day Shipment	  */
+	public void setIsFutureDayShipment (boolean IsFutureDayShipment);
+
+	/** Get Future Day Shipment	  */
+	public boolean isFutureDayShipment();
+
+    /** Column name IsHazMat */
+    public static final String COLUMNNAME_IsHazMat = "IsHazMat";
+
+	/** Set Hazardous Materials	  */
+	public void setIsHazMat (boolean IsHazMat);
+
+	/** Get Hazardous Materials	  */
+	public boolean isHazMat();
+
+    /** Column name IsHoldAtLocation */
+    public static final String COLUMNNAME_IsHoldAtLocation = "IsHoldAtLocation";
+
+	/** Set Hold At Location	  */
+	public void setIsHoldAtLocation (boolean IsHoldAtLocation);
+
+	/** Get Hold At Location	  */
+	public boolean isHoldAtLocation();
+
+    /** Column name IsIgnoreZipNotFound */
+    public static final String COLUMNNAME_IsIgnoreZipNotFound = "IsIgnoreZipNotFound";
+
+	/** Set Ignore Zip Not Found	  */
+	public void setIsIgnoreZipNotFound (boolean IsIgnoreZipNotFound);
+
+	/** Get Ignore Zip Not Found	  */
+	public boolean isIgnoreZipNotFound();
+
+    /** Column name IsIgnoreZipStateNotMatch */
+    public static final String COLUMNNAME_IsIgnoreZipStateNotMatch = "IsIgnoreZipStateNotMatch";
+
+	/** Set Ignore Zip State Not Match	  */
+	public void setIsIgnoreZipStateNotMatch (boolean IsIgnoreZipStateNotMatch);
+
+	/** Get Ignore Zip State Not Match	  */
+	public boolean isIgnoreZipStateNotMatch();
+
+    /** Column name IsResidential */
+    public static final String COLUMNNAME_IsResidential = "IsResidential";
+
+	/** Set Residential	  */
+	public void setIsResidential (boolean IsResidential);
+
+	/** Get Residential	  */
+	public boolean isResidential();
+
+    /** Column name IsSaturdayDelivery */
+    public static final String COLUMNNAME_IsSaturdayDelivery = "IsSaturdayDelivery";
+
+	/** Set Saturday Delivery	  */
+	public void setIsSaturdayDelivery (boolean IsSaturdayDelivery);
+
+	/** Get Saturday Delivery	  */
+	public boolean isSaturdayDelivery();
+
+    /** Column name IsSaturdayPickup */
+    public static final String COLUMNNAME_IsSaturdayPickup = "IsSaturdayPickup";
+
+	/** Set Saturday Pickup	  */
+	public void setIsSaturdayPickup (boolean IsSaturdayPickup);
+
+	/** Get Saturday Pickup	  */
+	public boolean isSaturdayPickup();
+
+    /** Column name IsVerbalConfirmation */
+    public static final String COLUMNNAME_IsVerbalConfirmation = "IsVerbalConfirmation";
+
+	/** Set Verbal Confirmation	  */
+	public void setIsVerbalConfirmation (boolean IsVerbalConfirmation);
+
+	/** Get Verbal Confirmation	  */
+	public boolean isVerbalConfirmation();
+
+    /** Column name LabelPrint */
+    public static final String COLUMNNAME_LabelPrint = "LabelPrint";
+
+	/** Set Label Print	  */
+	public void setLabelPrint (String LabelPrint);
+
+	/** Get Label Print	  */
+	public String getLabelPrint();
+
+    /** Column name LatestPickupTime */
+    public static final String COLUMNNAME_LatestPickupTime = "LatestPickupTime";
+
+	/** Set Latest Pickup Time	  */
+	public void setLatestPickupTime (Timestamp LatestPickupTime);
+
+	/** Get Latest Pickup Time	  */
+	public Timestamp getLatestPickupTime();
+
+    /** Column name Length */
+    public static final String COLUMNNAME_Length = "Length";
+
+	/** Set Length	  */
+	public void setLength (BigDecimal Length);
+
+	/** Get Length	  */
+	public BigDecimal getLength();
+
     /** Column name M_InOut_ID */
     public static final String COLUMNNAME_M_InOut_ID = "M_InOut_ID";
 
@@ -182,6 +574,146 @@ public interface I_M_Package
 
 	public org.compiere.model.I_M_Shipper getM_Shipper() throws RuntimeException;
 
+    /** Column name M_ShipperLabels_ID */
+    public static final String COLUMNNAME_M_ShipperLabels_ID = "M_ShipperLabels_ID";
+
+	/** Set Shipper Labels	  */
+	public void setM_ShipperLabels_ID (int M_ShipperLabels_ID);
+
+	/** Get Shipper Labels	  */
+	public int getM_ShipperLabels_ID();
+
+	public org.compiere.model.I_M_ShipperLabels getM_ShipperLabels() throws RuntimeException;
+
+    /** Column name M_ShipperPackaging_ID */
+    public static final String COLUMNNAME_M_ShipperPackaging_ID = "M_ShipperPackaging_ID";
+
+	/** Set Shipper Packaging	  */
+	public void setM_ShipperPackaging_ID (int M_ShipperPackaging_ID);
+
+	/** Get Shipper Packaging	  */
+	public int getM_ShipperPackaging_ID();
+
+	public org.compiere.model.I_M_ShipperPackaging getM_ShipperPackaging() throws RuntimeException;
+
+    /** Column name M_ShipperPickupTypes_ID */
+    public static final String COLUMNNAME_M_ShipperPickupTypes_ID = "M_ShipperPickupTypes_ID";
+
+	/** Set Shipper Pickup Types	  */
+	public void setM_ShipperPickupTypes_ID (int M_ShipperPickupTypes_ID);
+
+	/** Get Shipper Pickup Types	  */
+	public int getM_ShipperPickupTypes_ID();
+
+	public org.compiere.model.I_M_ShipperPickupTypes getM_ShipperPickupTypes() throws RuntimeException;
+
+    /** Column name M_ShippingProcessor_ID */
+    public static final String COLUMNNAME_M_ShippingProcessor_ID = "M_ShippingProcessor_ID";
+
+	/** Set Shipping Processor	  */
+	public void setM_ShippingProcessor_ID (int M_ShippingProcessor_ID);
+
+	/** Get Shipping Processor	  */
+	public int getM_ShippingProcessor_ID();
+
+	public org.compiere.model.I_M_ShippingProcessor getM_ShippingProcessor() throws RuntimeException;
+
+    /** Column name NotificationMessage */
+    public static final String COLUMNNAME_NotificationMessage = "NotificationMessage";
+
+	/** Set Notification Message	  */
+	public void setNotificationMessage (String NotificationMessage);
+
+	/** Get Notification Message	  */
+	public String getNotificationMessage();
+
+    /** Column name NotificationType */
+    public static final String COLUMNNAME_NotificationType = "NotificationType";
+
+	/** Set Notification Type.
+	  * Type of Notifications
+	  */
+	public void setNotificationType (String NotificationType);
+
+	/** Get Notification Type.
+	  * Type of Notifications
+	  */
+	public String getNotificationType();
+
+    /** Column name OProcessing */
+    public static final String COLUMNNAME_OProcessing = "OProcessing";
+
+	/** Set Online Processing.
+	  * This payment can be processed online
+	  */
+	public void setOProcessing (String OProcessing);
+
+	/** Get Online Processing.
+	  * This payment can be processed online
+	  */
+	public String getOProcessing();
+
+    /** Column name PaymentRule */
+    public static final String COLUMNNAME_PaymentRule = "PaymentRule";
+
+	/** Set Payment Rule.
+	  * How you pay the invoice
+	  */
+	public void setPaymentRule (String PaymentRule);
+
+	/** Get Payment Rule.
+	  * How you pay the invoice
+	  */
+	public String getPaymentRule();
+
+    /** Column name Price */
+    public static final String COLUMNNAME_Price = "Price";
+
+	/** Set Price.
+	  * Price
+	  */
+	public void setPrice (BigDecimal Price);
+
+	/** Get Price.
+	  * Price
+	  */
+	public BigDecimal getPrice();
+
+    /** Column name PriceActual */
+    public static final String COLUMNNAME_PriceActual = "PriceActual";
+
+	/** Set Unit Price.
+	  * Actual Price 
+	  */
+	public void setPriceActual (BigDecimal PriceActual);
+
+	/** Get Unit Price.
+	  * Actual Price 
+	  */
+	public BigDecimal getPriceActual();
+
+    /** Column name Processed */
+    public static final String COLUMNNAME_Processed = "Processed";
+
+	/** Set Processed.
+	  * The document has been processed
+	  */
+	public void setProcessed (boolean Processed);
+
+	/** Get Processed.
+	  * The document has been processed
+	  */
+	public boolean isProcessed();
+
+    /** Column name RateInquiryMessage */
+    public static final String COLUMNNAME_RateInquiryMessage = "RateInquiryMessage";
+
+	/** Set Rate Inquiry Message	  */
+	public void setRateInquiryMessage (String RateInquiryMessage);
+
+	/** Get Rate Inquiry Message	  */
+	public String getRateInquiryMessage();
+
     /** Column name ReceivedInfo */
     public static final String COLUMNNAME_ReceivedInfo = "ReceivedInfo";
 
@@ -208,6 +740,51 @@ public interface I_M_Package
 	  */
 	public Timestamp getShipDate();
 
+    /** Column name ShipperAccount */
+    public static final String COLUMNNAME_ShipperAccount = "ShipperAccount";
+
+	/** Set Shipper Account Number	  */
+	public void setShipperAccount (String ShipperAccount);
+
+	/** Get Shipper Account Number	  */
+	public String getShipperAccount();
+
+    /** Column name ShippingRateInquiry */
+    public static final String COLUMNNAME_ShippingRateInquiry = "ShippingRateInquiry";
+
+	/** Set Rate Inquiry	  */
+	public void setShippingRateInquiry (String ShippingRateInquiry);
+
+	/** Get Rate Inquiry	  */
+	public String getShippingRateInquiry();
+
+    /** Column name ShippingRespMessage */
+    public static final String COLUMNNAME_ShippingRespMessage = "ShippingRespMessage";
+
+	/** Set Response Message	  */
+	public void setShippingRespMessage (String ShippingRespMessage);
+
+	/** Get Response Message	  */
+	public String getShippingRespMessage();
+
+    /** Column name Surcharges */
+    public static final String COLUMNNAME_Surcharges = "Surcharges";
+
+	/** Set Surcharges	  */
+	public void setSurcharges (BigDecimal Surcharges);
+
+	/** Get Surcharges	  */
+	public BigDecimal getSurcharges();
+
+    /** Column name TotalPrice */
+    public static final String COLUMNNAME_TotalPrice = "TotalPrice";
+
+	/** Set Total Price	  */
+	public void setTotalPrice (BigDecimal TotalPrice);
+
+	/** Get Total Price	  */
+	public BigDecimal getTotalPrice();
+
     /** Column name TrackingInfo */
     public static final String COLUMNNAME_TrackingInfo = "TrackingInfo";
 
@@ -217,6 +794,19 @@ public interface I_M_Package
 	/** Get Tracking Info	  */
 	public String getTrackingInfo();
 
+    /** Column name TrackingNo */
+    public static final String COLUMNNAME_TrackingNo = "TrackingNo";
+
+	/** Set Tracking No.
+	  * Number to track the shipment
+	  */
+	public void setTrackingNo (String TrackingNo);
+
+	/** Get Tracking No.
+	  * Number to track the shipment
+	  */
+	public String getTrackingNo();
+
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
 
@@ -232,4 +822,35 @@ public interface I_M_Package
 	  * User who updated this records
 	  */
 	public int getUpdatedBy();
+
+    /** Column name VoidIt */
+    public static final String COLUMNNAME_VoidIt = "VoidIt";
+
+	/** Set Void It	  */
+	public void setVoidIt (String VoidIt);
+
+	/** Get Void It	  */
+	public String getVoidIt();
+
+    /** Column name Weight */
+    public static final String COLUMNNAME_Weight = "Weight";
+
+	/** Set Weight.
+	  * Weight of a product
+	  */
+	public void setWeight (BigDecimal Weight);
+
+	/** Get Weight.
+	  * Weight of a product
+	  */
+	public BigDecimal getWeight();
+
+    /** Column name Width */
+    public static final String COLUMNNAME_Width = "Width";
+
+	/** Set Width	  */
+	public void setWidth (BigDecimal Width);
+
+	/** Get Width	  */
+	public BigDecimal getWidth();
 }

org.adempiere.base/src/org/compiere/model/I_M_PackageLine.java

@@ -156,6 +156,32 @@ public interface I_M_PackageLine
 	/** Get M_PackageLine_UU	  */
 	public String getM_PackageLine_UU();
 
+    /** Column name M_PackageMPS_ID */
+    public static final String COLUMNNAME_M_PackageMPS_ID = "M_PackageMPS_ID";
+
+	/** Set Package MPS	  */
+	public void setM_PackageMPS_ID (int M_PackageMPS_ID);
+
+	/** Get Package MPS	  */
+	public int getM_PackageMPS_ID();
+
+	public org.compiere.model.I_M_PackageMPS getM_PackageMPS() throws RuntimeException;
+
+    /** Column name M_Product_ID */
+    public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
+
+	/** Set Product.
+	  * Product, Service, Item
+	  */
+	public void setM_Product_ID (int M_Product_ID);
+
+	/** Get Product.
+	  * Product, Service, Item
+	  */
+	public int getM_Product_ID();
+
+	public org.compiere.model.I_M_Product getM_Product() throws RuntimeException;
+
     /** Column name Qty */
     public static final String COLUMNNAME_Qty = "Qty";
 

org.adempiere.base/src/org/compiere/model/I_M_PackageMPS.java

@@ -0,0 +1,310 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Interface for M_PackageMPS
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a
+ */
+public interface I_M_PackageMPS 
+{
+
+    /** TableName=M_PackageMPS */
+    public static final String Table_Name = "M_PackageMPS";
+
+    /** AD_Table_ID=200044 */
+    public static final int Table_ID = 200044;
+
+    KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
+
+    /** AccessLevel = 3 - Client - Org 
+     */
+    BigDecimal accessLevel = BigDecimal.valueOf(3);
+
+    /** Load Meta Data */
+
+    /** Column name AD_Client_ID */
+    public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
+
+	/** Get Client.
+	  * Client/Tenant for this installation.
+	  */
+	public int getAD_Client_ID();
+
+    /** Column name AD_Org_ID */
+    public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
+
+	/** Set Organization.
+	  * Organizational entity within client
+	  */
+	public void setAD_Org_ID (int AD_Org_ID);
+
+	/** Get Organization.
+	  * Organizational entity within client
+	  */
+	public int getAD_Org_ID();
+
+    /** Column name C_UOM_Length_ID */
+    public static final String COLUMNNAME_C_UOM_Length_ID = "C_UOM_Length_ID";
+
+	/** Set UOM for Length.
+	  * Standard Unit of Measure for Length
+	  */
+	public void setC_UOM_Length_ID (int C_UOM_Length_ID);
+
+	/** Get UOM for Length.
+	  * Standard Unit of Measure for Length
+	  */
+	public int getC_UOM_Length_ID();
+
+	public org.compiere.model.I_C_UOM getC_UOM_Length() throws RuntimeException;
+
+    /** Column name C_UOM_Weight_ID */
+    public static final String COLUMNNAME_C_UOM_Weight_ID = "C_UOM_Weight_ID";
+
+	/** Set UOM for Weight.
+	  * Standard Unit of Measure for Weight
+	  */
+	public void setC_UOM_Weight_ID (int C_UOM_Weight_ID);
+
+	/** Get UOM for Weight.
+	  * Standard Unit of Measure for Weight
+	  */
+	public int getC_UOM_Weight_ID();
+
+	public org.compiere.model.I_C_UOM getC_UOM_Weight() throws RuntimeException;
+
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
+
+	/** Get Created.
+	  * Date this record was created
+	  */
+	public Timestamp getCreated();
+
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
+	  */
+	public int getCreatedBy();
+
+    /** Column name CreateFrom */
+    public static final String COLUMNNAME_CreateFrom = "CreateFrom";
+
+	/** Set Create lines from.
+	  * Process which will generate a new document lines based on an existing document
+	  */
+	public void setCreateFrom (String CreateFrom);
+
+	/** Get Create lines from.
+	  * Process which will generate a new document lines based on an existing document
+	  */
+	public String getCreateFrom();
+
+    /** Column name Description */
+    public static final String COLUMNNAME_Description = "Description";
+
+	/** Set Description.
+	  * Optional short description of the record
+	  */
+	public void setDescription (String Description);
+
+	/** Get Description.
+	  * Optional short description of the record
+	  */
+	public String getDescription();
+
+    /** Column name EstimatedWeight */
+    public static final String COLUMNNAME_EstimatedWeight = "EstimatedWeight";
+
+	/** Set Estimated Weight	  */
+	public void setEstimatedWeight (BigDecimal EstimatedWeight);
+
+	/** Get Estimated Weight	  */
+	public BigDecimal getEstimatedWeight();
+
+    /** Column name Height */
+    public static final String COLUMNNAME_Height = "Height";
+
+	/** Set Height	  */
+	public void setHeight (BigDecimal Height);
+
+	/** Get Height	  */
+	public BigDecimal getHeight();
+
+    /** Column name IsActive */
+    public static final String COLUMNNAME_IsActive = "IsActive";
+
+	/** Set Active.
+	  * The record is active in the system
+	  */
+	public void setIsActive (boolean IsActive);
+
+	/** Get Active.
+	  * The record is active in the system
+	  */
+	public boolean isActive();
+
+    /** Column name Length */
+    public static final String COLUMNNAME_Length = "Length";
+
+	/** Set Length	  */
+	public void setLength (BigDecimal Length);
+
+	/** Get Length	  */
+	public BigDecimal getLength();
+
+    /** Column name M_Package_ID */
+    public static final String COLUMNNAME_M_Package_ID = "M_Package_ID";
+
+	/** Set Package.
+	  * Shipment Package
+	  */
+	public void setM_Package_ID (int M_Package_ID);
+
+	/** Get Package.
+	  * Shipment Package
+	  */
+	public int getM_Package_ID();
+
+	public org.compiere.model.I_M_Package getM_Package() throws RuntimeException;
+
+    /** Column name M_PackageMPS_ID */
+    public static final String COLUMNNAME_M_PackageMPS_ID = "M_PackageMPS_ID";
+
+	/** Set Package MPS	  */
+	public void setM_PackageMPS_ID (int M_PackageMPS_ID);
+
+	/** Get Package MPS	  */
+	public int getM_PackageMPS_ID();
+
+    /** Column name M_PackageMPS_UU */
+    public static final String COLUMNNAME_M_PackageMPS_UU = "M_PackageMPS_UU";
+
+	/** Set M_PackageMPS_UU	  */
+	public void setM_PackageMPS_UU (String M_PackageMPS_UU);
+
+	/** Get M_PackageMPS_UU	  */
+	public String getM_PackageMPS_UU();
+
+    /** Column name MasterTrackingNo */
+    public static final String COLUMNNAME_MasterTrackingNo = "MasterTrackingNo";
+
+	/** Set Master Tracking No	  */
+	public void setMasterTrackingNo (String MasterTrackingNo);
+
+	/** Get Master Tracking No	  */
+	public String getMasterTrackingNo();
+
+    /** Column name Price */
+    public static final String COLUMNNAME_Price = "Price";
+
+	/** Set Price.
+	  * Price
+	  */
+	public void setPrice (BigDecimal Price);
+
+	/** Get Price.
+	  * Price
+	  */
+	public BigDecimal getPrice();
+
+    /** Column name Processed */
+    public static final String COLUMNNAME_Processed = "Processed";
+
+	/** Set Processed.
+	  * The document has been processed
+	  */
+	public void setProcessed (boolean Processed);
+
+	/** Get Processed.
+	  * The document has been processed
+	  */
+	public boolean isProcessed();
+
+    /** Column name SeqNo */
+    public static final String COLUMNNAME_SeqNo = "SeqNo";
+
+	/** Set Sequence.
+	  * Method of ordering records;
+ lowest number comes first
+	  */
+	public void setSeqNo (int SeqNo);
+
+	/** Get Sequence.
+	  * Method of ordering records;
+ lowest number comes first
+	  */
+	public int getSeqNo();
+
+    /** Column name TrackingNo */
+    public static final String COLUMNNAME_TrackingNo = "TrackingNo";
+
+	/** Set Tracking No.
+	  * Number to track the shipment
+	  */
+	public void setTrackingNo (String TrackingNo);
+
+	/** Get Tracking No.
+	  * Number to track the shipment
+	  */
+	public String getTrackingNo();
+
+    /** Column name Updated */
+    public static final String COLUMNNAME_Updated = "Updated";
+
+	/** Get Updated.
+	  * Date this record was updated
+	  */
+	public Timestamp getUpdated();
+
+    /** Column name UpdatedBy */
+    public static final String COLUMNNAME_UpdatedBy = "UpdatedBy";
+
+	/** Get Updated By.
+	  * User who updated this records
+	  */
+	public int getUpdatedBy();
+
+    /** Column name Weight */
+    public static final String COLUMNNAME_Weight = "Weight";
+
+	/** Set Weight.
+	  * Weight of a product
+	  */
+	public void setWeight (BigDecimal Weight);
+
+	/** Get Weight.
+	  * Weight of a product
+	  */
+	public BigDecimal getWeight();
+
+    /** Column name Width */
+    public static final String COLUMNNAME_Width = "Width";
+
+	/** Set Width	  */
+	public void setWidth (BigDecimal Width);
+
+	/** Get Width	  */
+	public BigDecimal getWidth();
+}

org.adempiere.base/src/org/compiere/model/I_M_Product.java

@@ -62,61 +62,6 @@ public interface I_M_Product
 	  */
 	public int getAD_Org_ID();
 
-    /** Column name Classification */
-    public static final String COLUMNNAME_Classification = "Classification";
-
-	/** Set Classification.
-	  * Classification for grouping
-	  */
-	public void setClassification (String Classification);
-
-	/** Get Classification.
-	  * Classification for grouping
-	  */
-	public String getClassification();
-
-    /** Column name CopyFrom */
-    public static final String COLUMNNAME_CopyFrom = "CopyFrom";
-
-	/** Set Copy From.
-	  * Copy From Record
-	  */
-	public void setCopyFrom (String CopyFrom);
-
-	/** Get Copy From.
-	  * Copy From Record
-	  */
-	public String getCopyFrom();
-
-    /** Column name CostStandard */
-    public static final String COLUMNNAME_CostStandard = "CostStandard";
-
-	/** Set Standard Cost.
-	  * Standard Costs
-	  */
-	public void setCostStandard (BigDecimal CostStandard);
-
-	/** Get Standard Cost.
-	  * Standard Costs
-	  */
-	public BigDecimal getCostStandard();
-
-    /** Column name Created */
-    public static final String COLUMNNAME_Created = "Created";
-
-	/** Get Created.
-	  * Date this record was created
-	  */
-	public Timestamp getCreated();
-
-    /** Column name CreatedBy */
-    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
-
-	/** Get Created By.
-	  * User who created this records
-	  */
-	public int getCreatedBy();
-
     /** Column name C_RevenueRecognition_ID */
     public static final String COLUMNNAME_C_RevenueRecognition_ID = "C_RevenueRecognition_ID";
 
@@ -177,6 +122,61 @@ public interface I_M_Product
 
 	public org.compiere.model.I_C_UOM getC_UOM() throws RuntimeException;
 
+    /** Column name Classification */
+    public static final String COLUMNNAME_Classification = "Classification";
+
+	/** Set Classification.
+	  * Classification for grouping
+	  */
+	public void setClassification (String Classification);
+
+	/** Get Classification.
+	  * Classification for grouping
+	  */
+	public String getClassification();
+
+    /** Column name CopyFrom */
+    public static final String COLUMNNAME_CopyFrom = "CopyFrom";
+
+	/** Set Copy From.
+	  * Copy From Record
+	  */
+	public void setCopyFrom (String CopyFrom);
+
+	/** Get Copy From.
+	  * Copy From Record
+	  */
+	public String getCopyFrom();
+
+    /** Column name CostStandard */
+    public static final String COLUMNNAME_CostStandard = "CostStandard";
+
+	/** Set Standard Cost.
+	  * Standard Costs
+	  */
+	public void setCostStandard (BigDecimal CostStandard);
+
+	/** Get Standard Cost.
+	  * Standard Costs
+	  */
+	public BigDecimal getCostStandard();
+
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
+
+	/** Get Created.
+	  * Date this record was created
+	  */
+	public Timestamp getCreated();
+
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
+	  */
+	public int getCreatedBy();
+
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
 
@@ -403,6 +403,15 @@ public interface I_M_Product
 	  */
 	public boolean isManufactured();
 
+    /** Column name IsOwnBox */
+    public static final String COLUMNNAME_IsOwnBox = "IsOwnBox";
+
+	/** Set Own Box	  */
+	public void setIsOwnBox (boolean IsOwnBox);
+
+	/** Get Own Box	  */
+	public boolean isOwnBox();
+
     /** Column name IsPhantom */
     public static final String COLUMNNAME_IsPhantom = "IsPhantom";
 
@@ -691,21 +700,6 @@ public interface I_M_Product
 
 	public org.compiere.model.I_R_MailText getR_MailText() throws RuntimeException;
 
-    /** Column name SalesRep_ID */
-    public static final String COLUMNNAME_SalesRep_ID = "SalesRep_ID";
-
-	/** Set Sales Representative.
-	  * Sales Representative or Company Agent
-	  */
-	public void setSalesRep_ID (int SalesRep_ID);
-
-	/** Get Sales Representative.
-	  * Sales Representative or Company Agent
-	  */
-	public int getSalesRep_ID();
-
-	public org.compiere.model.I_AD_User getSalesRep() throws RuntimeException;
-
     /** Column name S_ExpenseType_ID */
     public static final String COLUMNNAME_S_ExpenseType_ID = "S_ExpenseType_ID";
 
@@ -721,6 +715,36 @@ public interface I_M_Product
 
 	public org.compiere.model.I_S_ExpenseType getS_ExpenseType() throws RuntimeException;
 
+    /** Column name S_Resource_ID */
+    public static final String COLUMNNAME_S_Resource_ID = "S_Resource_ID";
+
+	/** Set Resource.
+	  * Resource
+	  */
+	public void setS_Resource_ID (int S_Resource_ID);
+
+	/** Get Resource.
+	  * Resource
+	  */
+	public int getS_Resource_ID();
+
+	public org.compiere.model.I_S_Resource getS_Resource() throws RuntimeException;
+
+    /** Column name SalesRep_ID */
+    public static final String COLUMNNAME_SalesRep_ID = "SalesRep_ID";
+
+	/** Set Sales Representative.
+	  * Sales Representative or Company Agent
+	  */
+	public void setSalesRep_ID (int SalesRep_ID);
+
+	/** Get Sales Representative.
+	  * Sales Representative or Company Agent
+	  */
+	public int getSalesRep_ID();
+
+	public org.compiere.model.I_AD_User getSalesRep() throws RuntimeException;
+
     /** Column name ShelfDepth */
     public static final String COLUMNNAME_ShelfDepth = "ShelfDepth";
 
@@ -773,21 +797,6 @@ public interface I_M_Product
 	  */
 	public String getSKU();
 
-    /** Column name S_Resource_ID */
-    public static final String COLUMNNAME_S_Resource_ID = "S_Resource_ID";
-
-	/** Set Resource.
-	  * Resource
-	  */
-	public void setS_Resource_ID (int S_Resource_ID);
-
-	/** Get Resource.
-	  * Resource
-	  */
-	public int getS_Resource_ID();
-
-	public org.compiere.model.I_S_Resource getS_Resource() throws RuntimeException;
-
     /** Column name UnitsPerPack */
     public static final String COLUMNNAME_UnitsPerPack = "UnitsPerPack";
 

org.adempiere.base/src/org/compiere/model/I_M_Shipper.java

@@ -93,19 +93,6 @@ public interface I_M_Shipper
 	  */
 	public int getCreatedBy();
 
-    /** Column name Description */
-    public static final String COLUMNNAME_Description = "Description";
-
-	/** Set Description.
-	  * Optional short description of the record
-	  */
-	public void setDescription (String Description);
-
-	/** Get Description.
-	  * Optional short description of the record
-	  */
-	public String getDescription();
-
     /** Column name IsActive */
     public static final String COLUMNNAME_IsActive = "IsActive";
 
@@ -141,31 +128,16 @@ public interface I_M_Shipper
 	/** Get M_Shipper_UU	  */
 	public String getM_Shipper_UU();
 
-    /** Column name Name */
-    public static final String COLUMNNAME_Name = "Name";
+    /** Column name M_ShippingProcessor_ID */
+    public static final String COLUMNNAME_M_ShippingProcessor_ID = "M_ShippingProcessor_ID";
 
-	/** Set Name.
-	  * Alphanumeric identifier of the entity
-	  */
-	public void setName (String Name);
+	/** Set Shipping Processor	  */
+	public void setM_ShippingProcessor_ID (int M_ShippingProcessor_ID);
 
-	/** Get Name.
-	  * Alphanumeric identifier of the entity
-	  */
-	public String getName();
+	/** Get Shipping Processor	  */
+	public int getM_ShippingProcessor_ID();
 
-    /** Column name TrackingURL */
-    public static final String COLUMNNAME_TrackingURL = "TrackingURL";
-
-	/** Set Tracking URL.
-	  * URL of the shipper to track shipments
-	  */
-	public void setTrackingURL (String TrackingURL);
-
-	/** Get Tracking URL.
-	  * URL of the shipper to track shipments
-	  */
-	public String getTrackingURL();
+	public org.compiere.model.I_M_ShippingProcessor getM_ShippingProcessor() throws RuntimeException;
 
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
@@ -182,4 +154,15 @@ public interface I_M_Shipper
 	  * User who updated this records
 	  */
 	public int getUpdatedBy();
+
+    /** Column name X_Shipper_ID */
+    public static final String COLUMNNAME_X_Shipper_ID = "X_Shipper_ID";
+
+	/** Set Shipper	  */
+	public void setX_Shipper_ID (int X_Shipper_ID);
+
+	/** Get Shipper	  */
+	public int getX_Shipper_ID();
+
+	public org.compiere.model.I_X_Shipper getX_Shipper() throws RuntimeException;
 }

org.adempiere.base/src/org/compiere/model/I_M_ShipperLabels.java

@@ -0,0 +1,175 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Interface for M_ShipperLabels
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a
+ */
+public interface I_M_ShipperLabels 
+{
+
+    /** TableName=M_ShipperLabels */
+    public static final String Table_Name = "M_ShipperLabels";
+
+    /** AD_Table_ID=200040 */
+    public static final int Table_ID = 200040;
+
+    KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
+
+    /** AccessLevel = 3 - Client - Org 
+     */
+    BigDecimal accessLevel = BigDecimal.valueOf(3);
+
+    /** Load Meta Data */
+
+    /** Column name AD_Client_ID */
+    public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
+
+	/** Get Client.
+	  * Client/Tenant for this installation.
+	  */
+	public int getAD_Client_ID();
+
+    /** Column name AD_Org_ID */
+    public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
+
+	/** Set Organization.
+	  * Organizational entity within client
+	  */
+	public void setAD_Org_ID (int AD_Org_ID);
+
+	/** Get Organization.
+	  * Organizational entity within client
+	  */
+	public int getAD_Org_ID();
+
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
+
+	/** Get Created.
+	  * Date this record was created
+	  */
+	public Timestamp getCreated();
+
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
+	  */
+	public int getCreatedBy();
+
+    /** Column name IsActive */
+    public static final String COLUMNNAME_IsActive = "IsActive";
+
+	/** Set Active.
+	  * The record is active in the system
+	  */
+	public void setIsActive (boolean IsActive);
+
+	/** Get Active.
+	  * The record is active in the system
+	  */
+	public boolean isActive();
+
+    /** Column name IsDefault */
+    public static final String COLUMNNAME_IsDefault = "IsDefault";
+
+	/** Set Default.
+	  * Default value
+	  */
+	public void setIsDefault (boolean IsDefault);
+
+	/** Get Default.
+	  * Default value
+	  */
+	public boolean isDefault();
+
+    /** Column name LabelPrintMethod */
+    public static final String COLUMNNAME_LabelPrintMethod = "LabelPrintMethod";
+
+	/** Set Label Print Method	  */
+	public void setLabelPrintMethod (String LabelPrintMethod);
+
+	/** Get Label Print Method	  */
+	public String getLabelPrintMethod();
+
+    /** Column name M_Shipper_ID */
+    public static final String COLUMNNAME_M_Shipper_ID = "M_Shipper_ID";
+
+	/** Set Shipper.
+	  * Method or manner of product delivery
+	  */
+	public void setM_Shipper_ID (int M_Shipper_ID);
+
+	/** Get Shipper.
+	  * Method or manner of product delivery
+	  */
+	public int getM_Shipper_ID();
+
+	public org.compiere.model.I_M_Shipper getM_Shipper() throws RuntimeException;
+
+    /** Column name M_ShipperLabels_ID */
+    public static final String COLUMNNAME_M_ShipperLabels_ID = "M_ShipperLabels_ID";
+
+	/** Set Shipper Labels	  */
+	public void setM_ShipperLabels_ID (int M_ShipperLabels_ID);
+
+	/** Get Shipper Labels	  */
+	public int getM_ShipperLabels_ID();
+
+    /** Column name M_ShipperLabels_UU */
+    public static final String COLUMNNAME_M_ShipperLabels_UU = "M_ShipperLabels_UU";
+
+	/** Set M_ShipperLabels_UU	  */
+	public void setM_ShipperLabels_UU (String M_ShipperLabels_UU);
+
+	/** Get M_ShipperLabels_UU	  */
+	public String getM_ShipperLabels_UU();
+
+    /** Column name Updated */
+    public static final String COLUMNNAME_Updated = "Updated";
+
+	/** Get Updated.
+	  * Date this record was updated
+	  */
+	public Timestamp getUpdated();
+
+    /** Column name UpdatedBy */
+    public static final String COLUMNNAME_UpdatedBy = "UpdatedBy";
+
+	/** Get Updated By.
+	  * User who updated this records
+	  */
+	public int getUpdatedBy();
+
+    /** Column name X_ShipperLabels_ID */
+    public static final String COLUMNNAME_X_ShipperLabels_ID = "X_ShipperLabels_ID";
+
+	/** Set Shipper Labels	  */
+	public void setX_ShipperLabels_ID (int X_ShipperLabels_ID);
+
+	/** Get Shipper Labels	  */
+	public int getX_ShipperLabels_ID();
+
+	public org.compiere.model.I_X_ShipperLabels getX_ShipperLabels() throws RuntimeException;
+}

org.adempiere.base/src/org/compiere/model/I_M_ShipperPackaging.java

@@ -0,0 +1,179 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Interface for M_ShipperPackaging
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a
+ */
+public interface I_M_ShipperPackaging 
+{
+
+    /** TableName=M_ShipperPackaging */
+    public static final String Table_Name = "M_ShipperPackaging";
+
+    /** AD_Table_ID=200041 */
+    public static final int Table_ID = 200041;
+
+    KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
+
+    /** AccessLevel = 3 - Client - Org 
+     */
+    BigDecimal accessLevel = BigDecimal.valueOf(3);
+
+    /** Load Meta Data */
+
+    /** Column name AD_Client_ID */
+    public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
+
+	/** Get Client.
+	  * Client/Tenant for this installation.
+	  */
+	public int getAD_Client_ID();
+
+    /** Column name AD_Org_ID */
+    public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
+
+	/** Set Organization.
+	  * Organizational entity within client
+	  */
+	public void setAD_Org_ID (int AD_Org_ID);
+
+	/** Get Organization.
+	  * Organizational entity within client
+	  */
+	public int getAD_Org_ID();
+
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
+
+	/** Get Created.
+	  * Date this record was created
+	  */
+	public Timestamp getCreated();
+
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
+	  */
+	public int getCreatedBy();
+
+    /** Column name IsActive */
+    public static final String COLUMNNAME_IsActive = "IsActive";
+
+	/** Set Active.
+	  * The record is active in the system
+	  */
+	public void setIsActive (boolean IsActive);
+
+	/** Get Active.
+	  * The record is active in the system
+	  */
+	public boolean isActive();
+
+    /** Column name IsDefault */
+    public static final String COLUMNNAME_IsDefault = "IsDefault";
+
+	/** Set Default.
+	  * Default value
+	  */
+	public void setIsDefault (boolean IsDefault);
+
+	/** Get Default.
+	  * Default value
+	  */
+	public boolean isDefault();
+
+    /** Column name M_Shipper_ID */
+    public static final String COLUMNNAME_M_Shipper_ID = "M_Shipper_ID";
+
+	/** Set Shipper.
+	  * Method or manner of product delivery
+	  */
+	public void setM_Shipper_ID (int M_Shipper_ID);
+
+	/** Get Shipper.
+	  * Method or manner of product delivery
+	  */
+	public int getM_Shipper_ID();
+
+	public org.compiere.model.I_M_Shipper getM_Shipper() throws RuntimeException;
+
+    /** Column name M_ShipperPackaging_ID */
+    public static final String COLUMNNAME_M_ShipperPackaging_ID = "M_ShipperPackaging_ID";
+
+	/** Set Shipper Packaging	  */
+	public void setM_ShipperPackaging_ID (int M_ShipperPackaging_ID);
+
+	/** Get Shipper Packaging	  */
+	public int getM_ShipperPackaging_ID();
+
+    /** Column name M_ShipperPackaging_UU */
+    public static final String COLUMNNAME_M_ShipperPackaging_UU = "M_ShipperPackaging_UU";
+
+	/** Set M_ShipperPackaging_UU	  */
+	public void setM_ShipperPackaging_UU (String M_ShipperPackaging_UU);
+
+	/** Get M_ShipperPackaging_UU	  */
+	public String getM_ShipperPackaging_UU();
+
+    /** Column name Updated */
+    public static final String COLUMNNAME_Updated = "Updated";
+
+	/** Get Updated.
+	  * Date this record was updated
+	  */
+	public Timestamp getUpdated();
+
+    /** Column name UpdatedBy */
+    public static final String COLUMNNAME_UpdatedBy = "UpdatedBy";
+
+	/** Get Updated By.
+	  * User who updated this records
+	  */
+	public int getUpdatedBy();
+
+    /** Column name Weight */
+    public static final String COLUMNNAME_Weight = "Weight";
+
+	/** Set Weight.
+	  * Weight of a product
+	  */
+	public void setWeight (BigDecimal Weight);
+
+	/** Get Weight.
+	  * Weight of a product
+	  */
+	public BigDecimal getWeight();
+
+    /** Column name X_ShipperPackaging_ID */
+    public static final String COLUMNNAME_X_ShipperPackaging_ID = "X_ShipperPackaging_ID";
+
+	/** Set Shipper Packaging	  */
+	public void setX_ShipperPackaging_ID (int X_ShipperPackaging_ID);
+
+	/** Get Shipper Packaging	  */
+	public int getX_ShipperPackaging_ID();
+
+	public org.compiere.model.I_X_ShipperPackaging getX_ShipperPackaging() throws RuntimeException;
+}

org.adempiere.base/src/org/compiere/model/I_M_ShipperPickupTypes.java

@@ -0,0 +1,166 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Interface for M_ShipperPickupTypes
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a
+ */
+public interface I_M_ShipperPickupTypes 
+{
+
+    /** TableName=M_ShipperPickupTypes */
+    public static final String Table_Name = "M_ShipperPickupTypes";
+
+    /** AD_Table_ID=200042 */
+    public static final int Table_ID = 200042;
+
+    KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
+
+    /** AccessLevel = 3 - Client - Org 
+     */
+    BigDecimal accessLevel = BigDecimal.valueOf(3);
+
+    /** Load Meta Data */
+
+    /** Column name AD_Client_ID */
+    public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
+
+	/** Get Client.
+	  * Client/Tenant for this installation.
+	  */
+	public int getAD_Client_ID();
+
+    /** Column name AD_Org_ID */
+    public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
+
+	/** Set Organization.
+	  * Organizational entity within client
+	  */
+	public void setAD_Org_ID (int AD_Org_ID);
+
+	/** Get Organization.
+	  * Organizational entity within client
+	  */
+	public int getAD_Org_ID();
+
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
+
+	/** Get Created.
+	  * Date this record was created
+	  */
+	public Timestamp getCreated();
+
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
+	  */
+	public int getCreatedBy();
+
+    /** Column name IsActive */
+    public static final String COLUMNNAME_IsActive = "IsActive";
+
+	/** Set Active.
+	  * The record is active in the system
+	  */
+	public void setIsActive (boolean IsActive);
+
+	/** Get Active.
+	  * The record is active in the system
+	  */
+	public boolean isActive();
+
+    /** Column name IsDefault */
+    public static final String COLUMNNAME_IsDefault = "IsDefault";
+
+	/** Set Default.
+	  * Default value
+	  */
+	public void setIsDefault (boolean IsDefault);
+
+	/** Get Default.
+	  * Default value
+	  */
+	public boolean isDefault();
+
+    /** Column name M_Shipper_ID */
+    public static final String COLUMNNAME_M_Shipper_ID = "M_Shipper_ID";
+
+	/** Set Shipper.
+	  * Method or manner of product delivery
+	  */
+	public void setM_Shipper_ID (int M_Shipper_ID);
+
+	/** Get Shipper.
+	  * Method or manner of product delivery
+	  */
+	public int getM_Shipper_ID();
+
+	public org.compiere.model.I_M_Shipper getM_Shipper() throws RuntimeException;
+
+    /** Column name M_ShipperPickupTypes_ID */
+    public static final String COLUMNNAME_M_ShipperPickupTypes_ID = "M_ShipperPickupTypes_ID";
+
+	/** Set Shipper Pickup Types	  */
+	public void setM_ShipperPickupTypes_ID (int M_ShipperPickupTypes_ID);
+
+	/** Get Shipper Pickup Types	  */
+	public int getM_ShipperPickupTypes_ID();
+
+    /** Column name M_ShipperPickupTypes_UU */
+    public static final String COLUMNNAME_M_ShipperPickupTypes_UU = "M_ShipperPickupTypes_UU";
+
+	/** Set M_ShipperPickupTypes_UU	  */
+	public void setM_ShipperPickupTypes_UU (String M_ShipperPickupTypes_UU);
+
+	/** Get M_ShipperPickupTypes_UU	  */
+	public String getM_ShipperPickupTypes_UU();
+
+    /** Column name Updated */
+    public static final String COLUMNNAME_Updated = "Updated";
+
+	/** Get Updated.
+	  * Date this record was updated
+	  */
+	public Timestamp getUpdated();
+
+    /** Column name UpdatedBy */
+    public static final String COLUMNNAME_UpdatedBy = "UpdatedBy";
+
+	/** Get Updated By.
+	  * User who updated this records
+	  */
+	public int getUpdatedBy();
+
+    /** Column name X_ShipperPickupTypes_ID */
+    public static final String COLUMNNAME_X_ShipperPickupTypes_ID = "X_ShipperPickupTypes_ID";
+
+	/** Set Shipper Pickup Types	  */
+	public void setX_ShipperPickupTypes_ID (int X_ShipperPickupTypes_ID);
+
+	/** Get Shipper Pickup Types	  */
+	public int getX_ShipperPickupTypes_ID();
+
+	public org.compiere.model.I_X_ShipperPickupTypes getX_ShipperPickupTypes() throws RuntimeException;
+}

org.adempiere.base/src/org/compiere/model/I_M_ShippingProcessor.java

@@ -0,0 +1,169 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Interface for M_ShippingProcessor
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a
+ */
+public interface I_M_ShippingProcessor 
+{
+
+    /** TableName=M_ShippingProcessor */
+    public static final String Table_Name = "M_ShippingProcessor";
+
+    /** AD_Table_ID=200039 */
+    public static final int Table_ID = 200039;
+
+    KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
+
+    /** AccessLevel = 3 - Client - Org 
+     */
+    BigDecimal accessLevel = BigDecimal.valueOf(3);
+
+    /** Load Meta Data */
+
+    /** Column name AD_Client_ID */
+    public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
+
+	/** Get Client.
+	  * Client/Tenant for this installation.
+	  */
+	public int getAD_Client_ID();
+
+    /** Column name AD_Org_ID */
+    public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
+
+	/** Set Organization.
+	  * Organizational entity within client
+	  */
+	public void setAD_Org_ID (int AD_Org_ID);
+
+	/** Get Organization.
+	  * Organizational entity within client
+	  */
+	public int getAD_Org_ID();
+
+    /** Column name ConnectionKey */
+    public static final String COLUMNNAME_ConnectionKey = "ConnectionKey";
+
+	/** Set Connection Key	  */
+	public void setConnectionKey (String ConnectionKey);
+
+	/** Get Connection Key	  */
+	public String getConnectionKey();
+
+    /** Column name ConnectionPassword */
+    public static final String COLUMNNAME_ConnectionPassword = "ConnectionPassword";
+
+	/** Set Connection Password	  */
+	public void setConnectionPassword (String ConnectionPassword);
+
+	/** Get Connection Password	  */
+	public String getConnectionPassword();
+
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
+
+	/** Get Created.
+	  * Date this record was created
+	  */
+	public Timestamp getCreated();
+
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
+	  */
+	public int getCreatedBy();
+
+    /** Column name IsActive */
+    public static final String COLUMNNAME_IsActive = "IsActive";
+
+	/** Set Active.
+	  * The record is active in the system
+	  */
+	public void setIsActive (boolean IsActive);
+
+	/** Get Active.
+	  * The record is active in the system
+	  */
+	public boolean isActive();
+
+    /** Column name M_ShippingProcessor_ID */
+    public static final String COLUMNNAME_M_ShippingProcessor_ID = "M_ShippingProcessor_ID";
+
+	/** Set Shipping Processor	  */
+	public void setM_ShippingProcessor_ID (int M_ShippingProcessor_ID);
+
+	/** Get Shipping Processor	  */
+	public int getM_ShippingProcessor_ID();
+
+    /** Column name M_ShippingProcessor_UU */
+    public static final String COLUMNNAME_M_ShippingProcessor_UU = "M_ShippingProcessor_UU";
+
+	/** Set M_ShippingProcessor_UU	  */
+	public void setM_ShippingProcessor_UU (String M_ShippingProcessor_UU);
+
+	/** Get M_ShippingProcessor_UU	  */
+	public String getM_ShippingProcessor_UU();
+
+    /** Column name Updated */
+    public static final String COLUMNNAME_Updated = "Updated";
+
+	/** Get Updated.
+	  * Date this record was updated
+	  */
+	public Timestamp getUpdated();
+
+    /** Column name UpdatedBy */
+    public static final String COLUMNNAME_UpdatedBy = "UpdatedBy";
+
+	/** Get Updated By.
+	  * User who updated this records
+	  */
+	public int getUpdatedBy();
+
+    /** Column name UserID */
+    public static final String COLUMNNAME_UserID = "UserID";
+
+	/** Set User ID.
+	  * User ID or account number
+	  */
+	public void setUserID (String UserID);
+
+	/** Get User ID.
+	  * User ID or account number
+	  */
+	public String getUserID();
+
+    /** Column name X_ShippingProcessor_ID */
+    public static final String COLUMNNAME_X_ShippingProcessor_ID = "X_ShippingProcessor_ID";
+
+	/** Set Shipping Processor	  */
+	public void setX_ShippingProcessor_ID (int X_ShippingProcessor_ID);
+
+	/** Get Shipping Processor	  */
+	public int getX_ShippingProcessor_ID();
+
+	public org.compiere.model.I_X_ShippingProcessor getX_ShippingProcessor() throws RuntimeException;
+}

org.adempiere.base/src/org/compiere/model/I_M_ShippingTransactionLine.java

@@ -0,0 +1,295 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Interface for M_ShippingTransactionLine
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a
+ */
+public interface I_M_ShippingTransactionLine 
+{
+
+    /** TableName=M_ShippingTransactionLine */
+    public static final String Table_Name = "M_ShippingTransactionLine";
+
+    /** AD_Table_ID=200052 */
+    public static final int Table_ID = 200052;
+
+    KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
+
+    /** AccessLevel = 3 - Client - Org 
+     */
+    BigDecimal accessLevel = BigDecimal.valueOf(3);
+
+    /** Load Meta Data */
+
+    /** Column name AD_Client_ID */
+    public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
+
+	/** Get Client.
+	  * Client/Tenant for this installation.
+	  */
+	public int getAD_Client_ID();
+
+    /** Column name AD_Org_ID */
+    public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
+
+	/** Set Organization.
+	  * Organizational entity within client
+	  */
+	public void setAD_Org_ID (int AD_Org_ID);
+
+	/** Get Organization.
+	  * Organizational entity within client
+	  */
+	public int getAD_Org_ID();
+
+    /** Column name C_UOM_Length_ID */
+    public static final String COLUMNNAME_C_UOM_Length_ID = "C_UOM_Length_ID";
+
+	/** Set UOM for Length.
+	  * Standard Unit of Measure for Length
+	  */
+	public void setC_UOM_Length_ID (int C_UOM_Length_ID);
+
+	/** Get UOM for Length.
+	  * Standard Unit of Measure for Length
+	  */
+	public int getC_UOM_Length_ID();
+
+	public org.compiere.model.I_C_UOM getC_UOM_Length() throws RuntimeException;
+
+    /** Column name C_UOM_Weight_ID */
+    public static final String COLUMNNAME_C_UOM_Weight_ID = "C_UOM_Weight_ID";
+
+	/** Set UOM for Weight.
+	  * Standard Unit of Measure for Weight
+	  */
+	public void setC_UOM_Weight_ID (int C_UOM_Weight_ID);
+
+	/** Get UOM for Weight.
+	  * Standard Unit of Measure for Weight
+	  */
+	public int getC_UOM_Weight_ID();
+
+	public org.compiere.model.I_C_UOM getC_UOM_Weight() throws RuntimeException;
+
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
+
+	/** Get Created.
+	  * Date this record was created
+	  */
+	public Timestamp getCreated();
+
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
+	  */
+	public int getCreatedBy();
+
+    /** Column name Description */
+    public static final String COLUMNNAME_Description = "Description";
+
+	/** Set Description.
+	  * Optional short description of the record
+	  */
+	public void setDescription (String Description);
+
+	/** Get Description.
+	  * Optional short description of the record
+	  */
+	public String getDescription();
+
+    /** Column name Height */
+    public static final String COLUMNNAME_Height = "Height";
+
+	/** Set Height	  */
+	public void setHeight (BigDecimal Height);
+
+	/** Get Height	  */
+	public BigDecimal getHeight();
+
+    /** Column name IsActive */
+    public static final String COLUMNNAME_IsActive = "IsActive";
+
+	/** Set Active.
+	  * The record is active in the system
+	  */
+	public void setIsActive (boolean IsActive);
+
+	/** Get Active.
+	  * The record is active in the system
+	  */
+	public boolean isActive();
+
+    /** Column name Length */
+    public static final String COLUMNNAME_Length = "Length";
+
+	/** Set Length	  */
+	public void setLength (BigDecimal Length);
+
+	/** Get Length	  */
+	public BigDecimal getLength();
+
+    /** Column name M_PackageMPS_ID */
+    public static final String COLUMNNAME_M_PackageMPS_ID = "M_PackageMPS_ID";
+
+	/** Set Package MPS	  */
+	public void setM_PackageMPS_ID (int M_PackageMPS_ID);
+
+	/** Get Package MPS	  */
+	public int getM_PackageMPS_ID();
+
+	public org.compiere.model.I_M_PackageMPS getM_PackageMPS() throws RuntimeException;
+
+    /** Column name M_ShippingTransaction_ID */
+    public static final String COLUMNNAME_M_ShippingTransaction_ID = "M_ShippingTransaction_ID";
+
+	/** Set Shipping Transaction	  */
+	public void setM_ShippingTransaction_ID (int M_ShippingTransaction_ID);
+
+	/** Get Shipping Transaction	  */
+	public int getM_ShippingTransaction_ID();
+
+	public org.compiere.model.I_M_ShippingTransaction getM_ShippingTransaction() throws RuntimeException;
+
+    /** Column name M_ShippingTransactionLine_ID */
+    public static final String COLUMNNAME_M_ShippingTransactionLine_ID = "M_ShippingTransactionLine_ID";
+
+	/** Set Shipping Transaction Line	  */
+	public void setM_ShippingTransactionLine_ID (int M_ShippingTransactionLine_ID);
+
+	/** Get Shipping Transaction Line	  */
+	public int getM_ShippingTransactionLine_ID();
+
+    /** Column name M_ShippingTransactionLine_UU */
+    public static final String COLUMNNAME_M_ShippingTransactionLine_UU = "M_ShippingTransactionLine_UU";
+
+	/** Set M_ShippingTransactionLine_UU	  */
+	public void setM_ShippingTransactionLine_UU (String M_ShippingTransactionLine_UU);
+
+	/** Get M_ShippingTransactionLine_UU	  */
+	public String getM_ShippingTransactionLine_UU();
+
+    /** Column name MasterTrackingNo */
+    public static final String COLUMNNAME_MasterTrackingNo = "MasterTrackingNo";
+
+	/** Set Master Tracking No	  */
+	public void setMasterTrackingNo (String MasterTrackingNo);
+
+	/** Get Master Tracking No	  */
+	public String getMasterTrackingNo();
+
+    /** Column name Price */
+    public static final String COLUMNNAME_Price = "Price";
+
+	/** Set Price.
+	  * Price
+	  */
+	public void setPrice (BigDecimal Price);
+
+	/** Get Price.
+	  * Price
+	  */
+	public BigDecimal getPrice();
+
+    /** Column name Processed */
+    public static final String COLUMNNAME_Processed = "Processed";
+
+	/** Set Processed.
+	  * The document has been processed
+	  */
+	public void setProcessed (boolean Processed);
+
+	/** Get Processed.
+	  * The document has been processed
+	  */
+	public boolean isProcessed();
+
+    /** Column name SeqNo */
+    public static final String COLUMNNAME_SeqNo = "SeqNo";
+
+	/** Set Sequence.
+	  * Method of ordering records;
+ lowest number comes first
+	  */
+	public void setSeqNo (int SeqNo);
+
+	/** Get Sequence.
+	  * Method of ordering records;
+ lowest number comes first
+	  */
+	public int getSeqNo();
+
+    /** Column name TrackingNo */
+    public static final String COLUMNNAME_TrackingNo = "TrackingNo";
+
+	/** Set Tracking No.
+	  * Number to track the shipment
+	  */
+	public void setTrackingNo (String TrackingNo);
+
+	/** Get Tracking No.
+	  * Number to track the shipment
+	  */
+	public String getTrackingNo();
+
+    /** Column name Updated */
+    public static final String COLUMNNAME_Updated = "Updated";
+
+	/** Get Updated.
+	  * Date this record was updated
+	  */
+	public Timestamp getUpdated();
+
+    /** Column name UpdatedBy */
+    public static final String COLUMNNAME_UpdatedBy = "UpdatedBy";
+
+	/** Get Updated By.
+	  * User who updated this records
+	  */
+	public int getUpdatedBy();
+
+    /** Column name Weight */
+    public static final String COLUMNNAME_Weight = "Weight";
+
+	/** Set Weight.
+	  * Weight of a product
+	  */
+	public void setWeight (BigDecimal Weight);
+
+	/** Get Weight.
+	  * Weight of a product
+	  */
+	public BigDecimal getWeight();
+
+    /** Column name Width */
+    public static final String COLUMNNAME_Width = "Width";
+
+	/** Set Width	  */
+	public void setWidth (BigDecimal Width);
+
+	/** Get Width	  */
+	public BigDecimal getWidth();
+}

org.adempiere.base/src/org/compiere/model/I_X_CommodityShipment.java

@@ -0,0 +1,182 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Interface for X_CommodityShipment
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a
+ */
+public interface I_X_CommodityShipment 
+{
+
+    /** TableName=X_CommodityShipment */
+    public static final String Table_Name = "X_CommodityShipment";
+
+    /** AD_Table_ID=200045 */
+    public static final int Table_ID = 200045;
+
+    KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
+
+    /** AccessLevel = 3 - Client - Org 
+     */
+    BigDecimal accessLevel = BigDecimal.valueOf(3);
+
+    /** Load Meta Data */
+
+    /** Column name AD_Client_ID */
+    public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
+
+	/** Get Client.
+	  * Client/Tenant for this installation.
+	  */
+	public int getAD_Client_ID();
+
+    /** Column name AD_Org_ID */
+    public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
+
+	/** Set Organization.
+	  * Organizational entity within client
+	  */
+	public void setAD_Org_ID (int AD_Org_ID);
+
+	/** Get Organization.
+	  * Organizational entity within client
+	  */
+	public int getAD_Org_ID();
+
+    /** Column name CountryOfManufacture */
+    public static final String COLUMNNAME_CountryOfManufacture = "CountryOfManufacture";
+
+	/** Set Country Of Manufacture	  */
+	public void setCountryOfManufacture (int CountryOfManufacture);
+
+	/** Get Country Of Manufacture	  */
+	public int getCountryOfManufacture();
+
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
+
+	/** Get Created.
+	  * Date this record was created
+	  */
+	public Timestamp getCreated();
+
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
+	  */
+	public int getCreatedBy();
+
+    /** Column name Description */
+    public static final String COLUMNNAME_Description = "Description";
+
+	/** Set Description.
+	  * Optional short description of the record
+	  */
+	public void setDescription (String Description);
+
+	/** Get Description.
+	  * Optional short description of the record
+	  */
+	public String getDescription();
+
+    /** Column name ExportLicenseNum */
+    public static final String COLUMNNAME_ExportLicenseNum = "ExportLicenseNum";
+
+	/** Set Export License Number	  */
+	public void setExportLicenseNum (String ExportLicenseNum);
+
+	/** Get Export License Number	  */
+	public String getExportLicenseNum();
+
+    /** Column name HarmonizedCode */
+    public static final String COLUMNNAME_HarmonizedCode = "HarmonizedCode";
+
+	/** Set Harmonized Code	  */
+	public void setHarmonizedCode (String HarmonizedCode);
+
+	/** Get Harmonized Code	  */
+	public String getHarmonizedCode();
+
+    /** Column name IsActive */
+    public static final String COLUMNNAME_IsActive = "IsActive";
+
+	/** Set Active.
+	  * The record is active in the system
+	  */
+	public void setIsActive (boolean IsActive);
+
+	/** Get Active.
+	  * The record is active in the system
+	  */
+	public boolean isActive();
+
+    /** Column name M_Product_ID */
+    public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
+
+	/** Set Product.
+	  * Product, Service, Item
+	  */
+	public void setM_Product_ID (int M_Product_ID);
+
+	/** Get Product.
+	  * Product, Service, Item
+	  */
+	public int getM_Product_ID();
+
+	public org.compiere.model.I_M_Product getM_Product() throws RuntimeException;
+
+    /** Column name Updated */
+    public static final String COLUMNNAME_Updated = "Updated";
+
+	/** Get Updated.
+	  * Date this record was updated
+	  */
+	public Timestamp getUpdated();
+
+    /** Column name UpdatedBy */
+    public static final String COLUMNNAME_UpdatedBy = "UpdatedBy";
+
+	/** Get Updated By.
+	  * User who updated this records
+	  */
+	public int getUpdatedBy();
+
+    /** Column name X_CommodityShipment_ID */
+    public static final String COLUMNNAME_X_CommodityShipment_ID = "X_CommodityShipment_ID";
+
+	/** Set X_CommodityShipment	  */
+	public void setX_CommodityShipment_ID (int X_CommodityShipment_ID);
+
+	/** Get X_CommodityShipment	  */
+	public int getX_CommodityShipment_ID();
+
+    /** Column name X_CommodityShipment_UU */
+    public static final String COLUMNNAME_X_CommodityShipment_UU = "X_CommodityShipment_UU";
+
+	/** Set X_CommodityShipment_UU	  */
+	public void setX_CommodityShipment_UU (String X_CommodityShipment_UU);
+
+	/** Get X_CommodityShipment_UU	  */
+	public String getX_CommodityShipment_UU();
+}

org.adempiere.base/src/org/compiere/model/I_X_Shipper.java

@@ -0,0 +1,226 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Interface for X_Shipper
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a
+ */
+public interface I_X_Shipper 
+{
+
+    /** TableName=X_Shipper */
+    public static final String Table_Name = "X_Shipper";
+
+    /** AD_Table_ID=200047 */
+    public static final int Table_ID = 200047;
+
+    KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
+
+    /** AccessLevel = 6 - System - Client 
+     */
+    BigDecimal accessLevel = BigDecimal.valueOf(6);
+
+    /** Load Meta Data */
+
+    /** Column name AD_Client_ID */
+    public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
+
+	/** Get Client.
+	  * Client/Tenant for this installation.
+	  */
+	public int getAD_Client_ID();
+
+    /** Column name AD_Org_ID */
+    public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
+
+	/** Set Organization.
+	  * Organizational entity within client
+	  */
+	public void setAD_Org_ID (int AD_Org_ID);
+
+	/** Get Organization.
+	  * Organizational entity within client
+	  */
+	public int getAD_Org_ID();
+
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
+
+	/** Get Created.
+	  * Date this record was created
+	  */
+	public Timestamp getCreated();
+
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
+	  */
+	public int getCreatedBy();
+
+    /** Column name Description */
+    public static final String COLUMNNAME_Description = "Description";
+
+	/** Set Description.
+	  * Optional short description of the record
+	  */
+	public void setDescription (String Description);
+
+	/** Get Description.
+	  * Optional short description of the record
+	  */
+	public String getDescription();
+
+    /** Column name IsActive */
+    public static final String COLUMNNAME_IsActive = "IsActive";
+
+	/** Set Active.
+	  * The record is active in the system
+	  */
+	public void setIsActive (boolean IsActive);
+
+	/** Get Active.
+	  * The record is active in the system
+	  */
+	public boolean isActive();
+
+    /** Column name IsInternational */
+    public static final String COLUMNNAME_IsInternational = "IsInternational";
+
+	/** Set International	  */
+	public void setIsInternational (boolean IsInternational);
+
+	/** Get International	  */
+	public boolean isInternational();
+
+    /** Column name IsOnline */
+    public static final String COLUMNNAME_IsOnline = "IsOnline";
+
+	/** Set Online Access.
+	  * Can be accessed online 
+	  */
+	public void setIsOnline (boolean IsOnline);
+
+	/** Get Online Access.
+	  * Can be accessed online 
+	  */
+	public boolean isOnline();
+
+    /** Column name IsResidential */
+    public static final String COLUMNNAME_IsResidential = "IsResidential";
+
+	/** Set Residential	  */
+	public void setIsResidential (boolean IsResidential);
+
+	/** Get Residential	  */
+	public boolean isResidential();
+
+    /** Column name IsSaturdayDelivery */
+    public static final String COLUMNNAME_IsSaturdayDelivery = "IsSaturdayDelivery";
+
+	/** Set Saturday Delivery	  */
+	public void setIsSaturdayDelivery (boolean IsSaturdayDelivery);
+
+	/** Get Saturday Delivery	  */
+	public boolean isSaturdayDelivery();
+
+    /** Column name Name */
+    public static final String COLUMNNAME_Name = "Name";
+
+	/** Set Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name);
+
+	/** Get Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public String getName();
+
+    /** Column name ShippingServiceCode */
+    public static final String COLUMNNAME_ShippingServiceCode = "ShippingServiceCode";
+
+	/** Set Service Code	  */
+	public void setShippingServiceCode (String ShippingServiceCode);
+
+	/** Get Service Code	  */
+	public String getShippingServiceCode();
+
+    /** Column name TrackingURL */
+    public static final String COLUMNNAME_TrackingURL = "TrackingURL";
+
+	/** Set Tracking URL.
+	  * URL of the shipper to track shipments
+	  */
+	public void setTrackingURL (String TrackingURL);
+
+	/** Get Tracking URL.
+	  * URL of the shipper to track shipments
+	  */
+	public String getTrackingURL();
+
+    /** Column name Updated */
+    public static final String COLUMNNAME_Updated = "Updated";
+
+	/** Get Updated.
+	  * Date this record was updated
+	  */
+	public Timestamp getUpdated();
+
+    /** Column name UpdatedBy */
+    public static final String COLUMNNAME_UpdatedBy = "UpdatedBy";
+
+	/** Get Updated By.
+	  * User who updated this records
+	  */
+	public int getUpdatedBy();
+
+    /** Column name X_Shipper_ID */
+    public static final String COLUMNNAME_X_Shipper_ID = "X_Shipper_ID";
+
+	/** Set Shipper	  */
+	public void setX_Shipper_ID (int X_Shipper_ID);
+
+	/** Get Shipper	  */
+	public int getX_Shipper_ID();
+
+    /** Column name X_Shipper_UU */
+    public static final String COLUMNNAME_X_Shipper_UU = "X_Shipper_UU";
+
+	/** Set X_Shipper_UU	  */
+	public void setX_Shipper_UU (String X_Shipper_UU);
+
+	/** Get X_Shipper_UU	  */
+	public String getX_Shipper_UU();
+
+    /** Column name X_ShippingProcessor_ID */
+    public static final String COLUMNNAME_X_ShippingProcessor_ID = "X_ShippingProcessor_ID";
+
+	/** Set Shipping Processor	  */
+	public void setX_ShippingProcessor_ID (int X_ShippingProcessor_ID);
+
+	/** Get Shipping Processor	  */
+	public int getX_ShippingProcessor_ID();
+
+	public org.compiere.model.I_X_ShippingProcessor getX_ShippingProcessor() throws RuntimeException;
+}

org.adempiere.base/src/org/compiere/model/I_X_ShipperLabels.java

@@ -0,0 +1,217 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Interface for X_ShipperLabels
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a
+ */
+public interface I_X_ShipperLabels 
+{
+
+    /** TableName=X_ShipperLabels */
+    public static final String Table_Name = "X_ShipperLabels";
+
+    /** AD_Table_ID=200048 */
+    public static final int Table_ID = 200048;
+
+    KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
+
+    /** AccessLevel = 6 - System - Client 
+     */
+    BigDecimal accessLevel = BigDecimal.valueOf(6);
+
+    /** Load Meta Data */
+
+    /** Column name AD_Client_ID */
+    public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
+
+	/** Get Client.
+	  * Client/Tenant for this installation.
+	  */
+	public int getAD_Client_ID();
+
+    /** Column name AD_Org_ID */
+    public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
+
+	/** Set Organization.
+	  * Organizational entity within client
+	  */
+	public void setAD_Org_ID (int AD_Org_ID);
+
+	/** Get Organization.
+	  * Organizational entity within client
+	  */
+	public int getAD_Org_ID();
+
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
+
+	/** Get Created.
+	  * Date this record was created
+	  */
+	public Timestamp getCreated();
+
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
+	  */
+	public int getCreatedBy();
+
+    /** Column name Description */
+    public static final String COLUMNNAME_Description = "Description";
+
+	/** Set Description.
+	  * Optional short description of the record
+	  */
+	public void setDescription (String Description);
+
+	/** Get Description.
+	  * Optional short description of the record
+	  */
+	public String getDescription();
+
+    /** Column name Height */
+    public static final String COLUMNNAME_Height = "Height";
+
+	/** Set Height	  */
+	public void setHeight (BigDecimal Height);
+
+	/** Get Height	  */
+	public BigDecimal getHeight();
+
+    /** Column name IsActive */
+    public static final String COLUMNNAME_IsActive = "IsActive";
+
+	/** Set Active.
+	  * The record is active in the system
+	  */
+	public void setIsActive (boolean IsActive);
+
+	/** Get Active.
+	  * The record is active in the system
+	  */
+	public boolean isActive();
+
+    /** Column name IsDefault */
+    public static final String COLUMNNAME_IsDefault = "IsDefault";
+
+	/** Set Default.
+	  * Default value
+	  */
+	public void setIsDefault (boolean IsDefault);
+
+	/** Get Default.
+	  * Default value
+	  */
+	public boolean isDefault();
+
+    /** Column name LabelPrintMethod */
+    public static final String COLUMNNAME_LabelPrintMethod = "LabelPrintMethod";
+
+	/** Set Label Print Method	  */
+	public void setLabelPrintMethod (String LabelPrintMethod);
+
+	/** Get Label Print Method	  */
+	public String getLabelPrintMethod();
+
+    /** Column name Name */
+    public static final String COLUMNNAME_Name = "Name";
+
+	/** Set Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name);
+
+	/** Get Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public String getName();
+
+    /** Column name Updated */
+    public static final String COLUMNNAME_Updated = "Updated";
+
+	/** Get Updated.
+	  * Date this record was updated
+	  */
+	public Timestamp getUpdated();
+
+    /** Column name UpdatedBy */
+    public static final String COLUMNNAME_UpdatedBy = "UpdatedBy";
+
+	/** Get Updated By.
+	  * User who updated this records
+	  */
+	public int getUpdatedBy();
+
+    /** Column name Value */
+    public static final String COLUMNNAME_Value = "Value";
+
+	/** Set Search Key.
+	  * Search key for the record in the format required - must be unique
+	  */
+	public void setValue (String Value);
+
+	/** Get Search Key.
+	  * Search key for the record in the format required - must be unique
+	  */
+	public String getValue();
+
+    /** Column name Width */
+    public static final String COLUMNNAME_Width = "Width";
+
+	/** Set Width	  */
+	public void setWidth (BigDecimal Width);
+
+	/** Get Width	  */
+	public BigDecimal getWidth();
+
+    /** Column name X_Shipper_ID */
+    public static final String COLUMNNAME_X_Shipper_ID = "X_Shipper_ID";
+
+	/** Set Shipper	  */
+	public void setX_Shipper_ID (int X_Shipper_ID);
+
+	/** Get Shipper	  */
+	public int getX_Shipper_ID();
+
+	public org.compiere.model.I_X_Shipper getX_Shipper() throws RuntimeException;
+
+    /** Column name X_ShipperLabels_ID */
+    public static final String COLUMNNAME_X_ShipperLabels_ID = "X_ShipperLabels_ID";
+
+	/** Set Shipper Labels	  */
+	public void setX_ShipperLabels_ID (int X_ShipperLabels_ID);
+
+	/** Get Shipper Labels	  */
+	public int getX_ShipperLabels_ID();
+
+    /** Column name X_ShipperLabels_UU */
+    public static final String COLUMNNAME_X_ShipperLabels_UU = "X_ShipperLabels_UU";
+
+	/** Set X_ShipperLabels_UU	  */
+	public void setX_ShipperLabels_UU (String X_ShipperLabels_UU);
+
+	/** Get X_ShipperLabels_UU	  */
+	public String getX_ShipperLabels_UU();
+}

org.adempiere.base/src/org/compiere/model/I_X_ShipperPackaging.java

@@ -0,0 +1,203 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Interface for X_ShipperPackaging
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a
+ */
+public interface I_X_ShipperPackaging 
+{
+
+    /** TableName=X_ShipperPackaging */
+    public static final String Table_Name = "X_ShipperPackaging";
+
+    /** AD_Table_ID=200049 */
+    public static final int Table_ID = 200049;
+
+    KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
+
+    /** AccessLevel = 6 - System - Client 
+     */
+    BigDecimal accessLevel = BigDecimal.valueOf(6);
+
+    /** Load Meta Data */
+
+    /** Column name AD_Client_ID */
+    public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
+
+	/** Get Client.
+	  * Client/Tenant for this installation.
+	  */
+	public int getAD_Client_ID();
+
+    /** Column name AD_Org_ID */
+    public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
+
+	/** Set Organization.
+	  * Organizational entity within client
+	  */
+	public void setAD_Org_ID (int AD_Org_ID);
+
+	/** Get Organization.
+	  * Organizational entity within client
+	  */
+	public int getAD_Org_ID();
+
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
+
+	/** Get Created.
+	  * Date this record was created
+	  */
+	public Timestamp getCreated();
+
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
+	  */
+	public int getCreatedBy();
+
+    /** Column name Description */
+    public static final String COLUMNNAME_Description = "Description";
+
+	/** Set Description.
+	  * Optional short description of the record
+	  */
+	public void setDescription (String Description);
+
+	/** Get Description.
+	  * Optional short description of the record
+	  */
+	public String getDescription();
+
+    /** Column name IsActive */
+    public static final String COLUMNNAME_IsActive = "IsActive";
+
+	/** Set Active.
+	  * The record is active in the system
+	  */
+	public void setIsActive (boolean IsActive);
+
+	/** Get Active.
+	  * The record is active in the system
+	  */
+	public boolean isActive();
+
+    /** Column name IsDefault */
+    public static final String COLUMNNAME_IsDefault = "IsDefault";
+
+	/** Set Default.
+	  * Default value
+	  */
+	public void setIsDefault (boolean IsDefault);
+
+	/** Get Default.
+	  * Default value
+	  */
+	public boolean isDefault();
+
+    /** Column name Name */
+    public static final String COLUMNNAME_Name = "Name";
+
+	/** Set Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name);
+
+	/** Get Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public String getName();
+
+    /** Column name Updated */
+    public static final String COLUMNNAME_Updated = "Updated";
+
+	/** Get Updated.
+	  * Date this record was updated
+	  */
+	public Timestamp getUpdated();
+
+    /** Column name UpdatedBy */
+    public static final String COLUMNNAME_UpdatedBy = "UpdatedBy";
+
+	/** Get Updated By.
+	  * User who updated this records
+	  */
+	public int getUpdatedBy();
+
+    /** Column name Value */
+    public static final String COLUMNNAME_Value = "Value";
+
+	/** Set Search Key.
+	  * Search key for the record in the format required - must be unique
+	  */
+	public void setValue (String Value);
+
+	/** Get Search Key.
+	  * Search key for the record in the format required - must be unique
+	  */
+	public String getValue();
+
+    /** Column name Weight */
+    public static final String COLUMNNAME_Weight = "Weight";
+
+	/** Set Weight.
+	  * Weight of a product
+	  */
+	public void setWeight (BigDecimal Weight);
+
+	/** Get Weight.
+	  * Weight of a product
+	  */
+	public BigDecimal getWeight();
+
+    /** Column name X_Shipper_ID */
+    public static final String COLUMNNAME_X_Shipper_ID = "X_Shipper_ID";
+
+	/** Set Shipper	  */
+	public void setX_Shipper_ID (int X_Shipper_ID);
+
+	/** Get Shipper	  */
+	public int getX_Shipper_ID();
+
+	public org.compiere.model.I_X_Shipper getX_Shipper() throws RuntimeException;
+
+    /** Column name X_ShipperPackaging_ID */
+    public static final String COLUMNNAME_X_ShipperPackaging_ID = "X_ShipperPackaging_ID";
+
+	/** Set Shipper Packaging	  */
+	public void setX_ShipperPackaging_ID (int X_ShipperPackaging_ID);
+
+	/** Get Shipper Packaging	  */
+	public int getX_ShipperPackaging_ID();
+
+    /** Column name X_ShipperPackaging_UU */
+    public static final String COLUMNNAME_X_ShipperPackaging_UU = "X_ShipperPackaging_UU";
+
+	/** Set X_ShipperPackaging_UU	  */
+	public void setX_ShipperPackaging_UU (String X_ShipperPackaging_UU);
+
+	/** Get X_ShipperPackaging_UU	  */
+	public String getX_ShipperPackaging_UU();
+}

org.adempiere.base/src/org/compiere/model/I_X_ShipperPickupTypes.java

@@ -0,0 +1,190 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Interface for X_ShipperPickupTypes
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a
+ */
+public interface I_X_ShipperPickupTypes 
+{
+
+    /** TableName=X_ShipperPickupTypes */
+    public static final String Table_Name = "X_ShipperPickupTypes";
+
+    /** AD_Table_ID=200050 */
+    public static final int Table_ID = 200050;
+
+    KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
+
+    /** AccessLevel = 6 - System - Client 
+     */
+    BigDecimal accessLevel = BigDecimal.valueOf(6);
+
+    /** Load Meta Data */
+
+    /** Column name AD_Client_ID */
+    public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
+
+	/** Get Client.
+	  * Client/Tenant for this installation.
+	  */
+	public int getAD_Client_ID();
+
+    /** Column name AD_Org_ID */
+    public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
+
+	/** Set Organization.
+	  * Organizational entity within client
+	  */
+	public void setAD_Org_ID (int AD_Org_ID);
+
+	/** Get Organization.
+	  * Organizational entity within client
+	  */
+	public int getAD_Org_ID();
+
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
+
+	/** Get Created.
+	  * Date this record was created
+	  */
+	public Timestamp getCreated();
+
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
+	  */
+	public int getCreatedBy();
+
+    /** Column name Description */
+    public static final String COLUMNNAME_Description = "Description";
+
+	/** Set Description.
+	  * Optional short description of the record
+	  */
+	public void setDescription (String Description);
+
+	/** Get Description.
+	  * Optional short description of the record
+	  */
+	public String getDescription();
+
+    /** Column name IsActive */
+    public static final String COLUMNNAME_IsActive = "IsActive";
+
+	/** Set Active.
+	  * The record is active in the system
+	  */
+	public void setIsActive (boolean IsActive);
+
+	/** Get Active.
+	  * The record is active in the system
+	  */
+	public boolean isActive();
+
+    /** Column name IsDefault */
+    public static final String COLUMNNAME_IsDefault = "IsDefault";
+
+	/** Set Default.
+	  * Default value
+	  */
+	public void setIsDefault (boolean IsDefault);
+
+	/** Get Default.
+	  * Default value
+	  */
+	public boolean isDefault();
+
+    /** Column name Name */
+    public static final String COLUMNNAME_Name = "Name";
+
+	/** Set Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name);
+
+	/** Get Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public String getName();
+
+    /** Column name Updated */
+    public static final String COLUMNNAME_Updated = "Updated";
+
+	/** Get Updated.
+	  * Date this record was updated
+	  */
+	public Timestamp getUpdated();
+
+    /** Column name UpdatedBy */
+    public static final String COLUMNNAME_UpdatedBy = "UpdatedBy";
+
+	/** Get Updated By.
+	  * User who updated this records
+	  */
+	public int getUpdatedBy();
+
+    /** Column name Value */
+    public static final String COLUMNNAME_Value = "Value";
+
+	/** Set Search Key.
+	  * Search key for the record in the format required - must be unique
+	  */
+	public void setValue (String Value);
+
+	/** Get Search Key.
+	  * Search key for the record in the format required - must be unique
+	  */
+	public String getValue();
+
+    /** Column name X_Shipper_ID */
+    public static final String COLUMNNAME_X_Shipper_ID = "X_Shipper_ID";
+
+	/** Set Shipper	  */
+	public void setX_Shipper_ID (int X_Shipper_ID);
+
+	/** Get Shipper	  */
+	public int getX_Shipper_ID();
+
+	public org.compiere.model.I_X_Shipper getX_Shipper() throws RuntimeException;
+
+    /** Column name X_ShipperPickupTypes_ID */
+    public static final String COLUMNNAME_X_ShipperPickupTypes_ID = "X_ShipperPickupTypes_ID";
+
+	/** Set Shipper Pickup Types	  */
+	public void setX_ShipperPickupTypes_ID (int X_ShipperPickupTypes_ID);
+
+	/** Get Shipper Pickup Types	  */
+	public int getX_ShipperPickupTypes_ID();
+
+    /** Column name X_ShipperPickupTypes_UU */
+    public static final String COLUMNNAME_X_ShipperPickupTypes_UU = "X_ShipperPickupTypes_UU";
+
+	/** Set X_ShipperPickupTypes_UU	  */
+	public void setX_ShipperPickupTypes_UU (String X_ShipperPickupTypes_UU);
+
+	/** Get X_ShipperPickupTypes_UU	  */
+	public String getX_ShipperPickupTypes_UU();
+}

org.adempiere.base/src/org/compiere/model/I_X_ShippingProcessor.java

@@ -0,0 +1,249 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Interface for X_ShippingProcessor
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a
+ */
+public interface I_X_ShippingProcessor 
+{
+
+    /** TableName=X_ShippingProcessor */
+    public static final String Table_Name = "X_ShippingProcessor";
+
+    /** AD_Table_ID=200046 */
+    public static final int Table_ID = 200046;
+
+    KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
+
+    /** AccessLevel = 6 - System - Client 
+     */
+    BigDecimal accessLevel = BigDecimal.valueOf(6);
+
+    /** Load Meta Data */
+
+    /** Column name AD_Client_ID */
+    public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
+
+	/** Get Client.
+	  * Client/Tenant for this installation.
+	  */
+	public int getAD_Client_ID();
+
+    /** Column name AD_Org_ID */
+    public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
+
+	/** Set Organization.
+	  * Organizational entity within client
+	  */
+	public void setAD_Org_ID (int AD_Org_ID);
+
+	/** Get Organization.
+	  * Organizational entity within client
+	  */
+	public int getAD_Org_ID();
+
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
+
+	/** Get Created.
+	  * Date this record was created
+	  */
+	public Timestamp getCreated();
+
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
+	  */
+	public int getCreatedBy();
+
+    /** Column name Description */
+    public static final String COLUMNNAME_Description = "Description";
+
+	/** Set Description.
+	  * Optional short description of the record
+	  */
+	public void setDescription (String Description);
+
+	/** Get Description.
+	  * Optional short description of the record
+	  */
+	public String getDescription();
+
+    /** Column name HostAddress */
+    public static final String COLUMNNAME_HostAddress = "HostAddress";
+
+	/** Set Host Address.
+	  * Host Address URL or DNS
+	  */
+	public void setHostAddress (String HostAddress);
+
+	/** Get Host Address.
+	  * Host Address URL or DNS
+	  */
+	public String getHostAddress();
+
+    /** Column name HostPort */
+    public static final String COLUMNNAME_HostPort = "HostPort";
+
+	/** Set Host port.
+	  * Host Communication Port
+	  */
+	public void setHostPort (int HostPort);
+
+	/** Get Host port.
+	  * Host Communication Port
+	  */
+	public int getHostPort();
+
+    /** Column name IsActive */
+    public static final String COLUMNNAME_IsActive = "IsActive";
+
+	/** Set Active.
+	  * The record is active in the system
+	  */
+	public void setIsActive (boolean IsActive);
+
+	/** Get Active.
+	  * The record is active in the system
+	  */
+	public boolean isActive();
+
+    /** Column name Name */
+    public static final String COLUMNNAME_Name = "Name";
+
+	/** Set Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name);
+
+	/** Get Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public String getName();
+
+    /** Column name ProxyAddress */
+    public static final String COLUMNNAME_ProxyAddress = "ProxyAddress";
+
+	/** Set Proxy address.
+	  *  Address of your proxy server
+	  */
+	public void setProxyAddress (String ProxyAddress);
+
+	/** Get Proxy address.
+	  *  Address of your proxy server
+	  */
+	public String getProxyAddress();
+
+    /** Column name ProxyLogon */
+    public static final String COLUMNNAME_ProxyLogon = "ProxyLogon";
+
+	/** Set Proxy logon.
+	  * Logon of your proxy server
+	  */
+	public void setProxyLogon (String ProxyLogon);
+
+	/** Get Proxy logon.
+	  * Logon of your proxy server
+	  */
+	public String getProxyLogon();
+
+    /** Column name ProxyPassword */
+    public static final String COLUMNNAME_ProxyPassword = "ProxyPassword";
+
+	/** Set Proxy password.
+	  * Password of your proxy server
+	  */
+	public void setProxyPassword (String ProxyPassword);
+
+	/** Get Proxy password.
+	  * Password of your proxy server
+	  */
+	public String getProxyPassword();
+
+    /** Column name ProxyPort */
+    public static final String COLUMNNAME_ProxyPort = "ProxyPort";
+
+	/** Set Proxy port.
+	  * Port of your proxy server
+	  */
+	public void setProxyPort (int ProxyPort);
+
+	/** Get Proxy port.
+	  * Port of your proxy server
+	  */
+	public int getProxyPort();
+
+    /** Column name ServicePath */
+    public static final String COLUMNNAME_ServicePath = "ServicePath";
+
+	/** Set Service Path	  */
+	public void setServicePath (String ServicePath);
+
+	/** Get Service Path	  */
+	public String getServicePath();
+
+    /** Column name ShippingProcessorClass */
+    public static final String COLUMNNAME_ShippingProcessorClass = "ShippingProcessorClass";
+
+	/** Set Shipping Processor Class	  */
+	public void setShippingProcessorClass (String ShippingProcessorClass);
+
+	/** Get Shipping Processor Class	  */
+	public String getShippingProcessorClass();
+
+    /** Column name Updated */
+    public static final String COLUMNNAME_Updated = "Updated";
+
+	/** Get Updated.
+	  * Date this record was updated
+	  */
+	public Timestamp getUpdated();
+
+    /** Column name UpdatedBy */
+    public static final String COLUMNNAME_UpdatedBy = "UpdatedBy";
+
+	/** Get Updated By.
+	  * User who updated this records
+	  */
+	public int getUpdatedBy();
+
+    /** Column name X_ShippingProcessor_ID */
+    public static final String COLUMNNAME_X_ShippingProcessor_ID = "X_ShippingProcessor_ID";
+
+	/** Set Shipping Processor	  */
+	public void setX_ShippingProcessor_ID (int X_ShippingProcessor_ID);
+
+	/** Get Shipping Processor	  */
+	public int getX_ShippingProcessor_ID();
+
+    /** Column name X_ShippingProcessor_UU */
+    public static final String COLUMNNAME_X_ShippingProcessor_UU = "X_ShippingProcessor_UU";
+
+	/** Set X_ShippingProcessor_UU	  */
+	public void setX_ShippingProcessor_UU (String X_ShippingProcessor_UU);
+
+	/** Get X_ShippingProcessor_UU	  */
+	public String getX_ShippingProcessor_UU();
+}

org.adempiere.base/src/org/compiere/model/MAttachment.java

@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.sql.ResultSet;
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Properties;
 import java.util.logging.Level;
@@ -335,7 +336,11 @@ public class MAttachment extends X_AD_Attachment
 		if (index >= 0 && index < m_items.size()) {
 			IAttachmentStore prov = provider.getAttachmentStore();
 			if (prov != null)
-				return prov.deleteEntry(this,provider,index);
+			{
+				if(prov.deleteEntry(this,provider,index))
+					return set_ValueNoCheck("Updated", new Timestamp(System.currentTimeMillis()));
+				return false;
+			}
 			return false;
 		}
 		log.warning("Not deleted Index=" + index + " - Size=" + m_items.size());

org.adempiere.base/src/org/compiere/model/MInvoice.java

@@ -1965,8 +1965,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
 		// auto delay capture authorization payment
 		if (isSOTrx() && !isReversal())
 		{
-			int[] ids = MPaymentTransaction.getAuthorizationPaymentTransactionIDs(getC_Order_ID(), getC_Invoice_ID(), get_TrxName());
-			
+			int[] ids = MPaymentTransaction.getAuthorizationPaymentTransactionIDs(getC_Order_ID(), getC_Invoice_ID(), get_TrxName());			
 			if (ids.length > 0)
 			{
 				ArrayList<MPaymentTransaction> ptList = new ArrayList<MPaymentTransaction>();
@@ -1974,12 +1973,17 @@ public class MInvoice extends X_C_Invoice implements DocAction
 				for (int id : ids)
 				{
 					MPaymentTransaction pt = new MPaymentTransaction(Env.getCtx(), id, get_TrxName());
+					
+					
 					totalPayAmt = totalPayAmt.add(pt.getPayAmt());
 					ptList.add(pt);
 				}
 				
-				// automatically void authorization payment and create a new sales payment when invoiced amount is NOT equals to the authorized amount
-				if(getGrandTotal().compareTo(totalPayAmt) != 0)
+				// automatically void authorization payment and create a new sales payment when invoiced amount is NOT equals to the authorized amount (applied to CIM payment processor)
+				if(getGrandTotal().compareTo(totalPayAmt) != 0 && 
+						ptList.size() > 0 && 
+						ptList.get(0).getCustomerPaymentProfileID() != null && 
+						ptList.get(0).getCustomerPaymentProfileID().length() > 0)
 				{
 					// create a new sales payment
 					MPaymentTransaction newSalesPT = MPaymentTransaction.copyFrom(ptList.get(0), new Timestamp(System.currentTimeMillis()), MPayment.TRXTYPE_Sales, "", get_TrxName());

org.adempiere.base/src/org/compiere/model/MPackage.java

@@ -16,9 +16,17 @@
  *****************************************************************************/
 package org.compiere.model;
 
+import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
+import java.util.logging.Level;
+
+import org.adempiere.util.ShippingUtil;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.compiere.util.Trx;
 
 
 /**
@@ -43,23 +51,64 @@ public class MPackage extends X_M_Package
 	 */
 	public static MPackage create (MInOut shipment, MShipper shipper, Timestamp shipDate)
 	{
-		MPackage retValue = new MPackage (shipment, shipper);
-		if (shipDate != null)
-			retValue.setShipDate(shipDate);
-		retValue.saveEx();
+		MPackage retValue = createPackage (shipment, shipper, shipDate);
+		
+		MPackageMPS packageMPS = new MPackageMPS(shipment.getCtx(), 0, shipment.get_TrxName());
+		packageMPS.setSeqNo(10);
+		packageMPS.setM_Package_ID(retValue.getM_Package_ID());		
+		packageMPS.saveEx();
+		
+		MClientInfo ci = MClientInfo.get(shipment.getCtx(), shipment.getAD_Client_ID(), shipment.get_TrxName());
+		
 		//	Lines
 		MInOutLine[] lines = shipment.getLines(false);
 		for (int i = 0; i < lines.length; i++)
 		{
 			MInOutLine sLine = lines[i];
-			MPackageLine pLine = new MPackageLine (retValue);
-			pLine.setInOutLine(sLine);
-			pLine.saveEx();
+			if(sLine.getM_Product_ID() > 0 && sLine.getM_Product_ID() != ci.getM_ProductFreight_ID())
+			{
+				MProduct product = new MProduct(shipment.getCtx(), sLine.getM_Product_ID(), shipment.get_TrxName());
+				if(product.isBOM() && product.isVerified() && product.isPickListPrintDetails())
+				{
+					MProductBOM[] bomLines = MProductBOM.getBOMLines(product);
+					for(MProductBOM bomLine : bomLines)
+					{
+						MPackageLine pLine = new MPackageLine(retValue);
+						pLine.setInOutLine(sLine);
+						pLine.setM_Product_ID(bomLine.getM_ProductBOM_ID());
+						pLine.setQty(sLine.getQtyEntered().multiply(bomLine.getBOMQty()));
+						pLine.setM_PackageMPS_ID(packageMPS.getM_PackageMPS_ID());
+						pLine.saveEx();
+					}
+				}
+				else
+				{
+					MPackageLine pLine = new MPackageLine (retValue);
+					pLine.setInOutLine(sLine);
+					pLine.setM_Product_ID(sLine.getM_Product_ID());
+					pLine.setM_PackageMPS_ID(packageMPS.getM_PackageMPS_ID());
+					pLine.saveEx();
+				}
+			}
 		}	//	lines
+		
+		retValue.setBoxCount(1);
+		retValue.save();
+		
 		return retValue;
 	}	//	create
 
 	
+	public static MPackage createPackage (MInOut shipment, MShipper shipper, Timestamp shipDate)
+	{
+		MPackage retValue = new MPackage (shipment, shipper);
+		if (shipDate != null)
+			retValue.setShipDate(shipDate);
+		retValue.setBoxCount(0);
+		retValue.saveEx();
+		
+		return retValue;
+	}
 	
 	/**************************************************************************
 	 * 	MPackage
@@ -76,6 +125,10 @@ public class MPackage extends X_M_Package
 		//	setDocumentNo (null);
 		//	setM_InOut_ID (0);
 			setShipDate (new Timestamp(System.currentTimeMillis()));
+			
+			MClientInfo clientInfo = MClientInfo.get(ctx, getAD_Client_ID());
+			setC_UOM_Weight_ID(clientInfo.getC_UOM_Weight_ID());
+			setC_UOM_Length_ID(clientInfo.getC_UOM_Length_ID());
 		}
 	}	//	MPackage
 
@@ -101,6 +154,442 @@ public class MPackage extends X_M_Package
 		setClientOrg(shipment);
 		setM_InOut_ID(shipment.getM_InOut_ID());
 		setM_Shipper_ID(shipper.getM_Shipper_ID());
+		
+		MOrder order = null;
+		if (shipment.getC_Order_ID() > 0)
+			order = new MOrder(getCtx(), shipment.getC_Order_ID(), get_TrxName());
+		else
+		{
+			MMatchPO[] mos = MMatchPO.getInOut(getCtx(), shipment.getM_InOut_ID(), get_TrxName());
+			for (MMatchPO mo : mos)
+			{
+				MOrderLine ol = new MOrderLine(getCtx(), mo.getC_OrderLine_ID(), get_TrxName());
+				if (ol.getC_Order_ID() > 0)
+				{
+					order = new MOrder(getCtx(), ol.getC_Order_ID(), get_TrxName());
+					break;
+				}
+			}
+		}		
+		StringBuilder msg = new StringBuilder();
+		msg.append("Notification for shipment " + shipment.getDocumentNo());
+		if (order != null)
+			msg.append(" / order " + order.getDocumentNo());
+		setNotificationMessage(msg.toString());
+		
+		setC_Currency_ID(shipment.getC_Currency_ID());
+		
+		String whereClause = "M_Shipper_ID = " + shipper.getM_Shipper_ID() + " AND IsDefault='Y' AND IsActive='Y'";
+		int[] ids = MShipperLabels.getAllIDs(MShipperLabels.Table_Name, whereClause, shipment.get_TrxName());
+		if (ids.length > 0)
+			setM_ShipperLabels_ID(ids[0]);
+
+		ids = MShipperPackaging.getAllIDs(MShipperPackaging.Table_Name, whereClause, shipment.get_TrxName());
+		if (ids.length > 0)
+			setM_ShipperPackaging_ID(ids[0]);
+
+		ids = MShipperPickupTypes.getAllIDs(MShipperPickupTypes.Table_Name, whereClause, shipment.get_TrxName());
+		if (ids.length > 0)
+			setM_ShipperPickupTypes_ID(ids[0]);
+		
+		int InvoiceLocationID = ShippingUtil.findRecipientAccountLocationId(shipper.getM_Shipper_ID(), shipment.getC_BPartner_ID(), shipper.getAD_Org_ID(), shipment.getM_InOut_ID(), 0);
+		if (InvoiceLocationID > 0)
+			setC_BPartner_Location_ID(InvoiceLocationID);
+    	
+		setIsResidential(shipper.isResidential());
+		setIsSaturdayDelivery(shipper.isSaturdayDelivery());
+		setTrackingInfo(shipper.getTrackingURL());
+
+		String shipperAccount = null;
+		String dutiesShipperAccount = null;
+		if (shipment.getFreightCharges().equals(MInOut.FREIGHTCHARGES_Prepaid) || shipment.getFreightCharges().equals(MInOut.FREIGHTCHARGES_PrepaidAndBill))
+		{
+			shipperAccount = ShippingUtil.getSenderShipperAccount(shipper.getM_Shipper_ID(), shipper.getAD_Org_ID());
+			dutiesShipperAccount = ShippingUtil.getSenderDutiesShipperAccount(shipper.getM_Shipper_ID(), shipper.getAD_Org_ID());
+		}
+		else
+			shipperAccount = shipment.getShipperAccount();
+		if (shipperAccount != null)
+			setShipperAccount(shipperAccount);
+		if (dutiesShipperAccount != null)
+			setDutiesShipperAccount(dutiesShipperAccount);
 	}	//	MPackage
 	
+	protected boolean beforeSave(boolean newRecord)
+	{
+		if (getWeight() == null || getWeight().compareTo(BigDecimal.ZERO) == 0)
+		{
+			String sql = "SELECT SUM(LineWeight) FROM X_PackageLineWeight plw WHERE plw.M_Package_ID=?";
+			BigDecimal weight = DB.getSQLValueBD(get_TrxName(), sql, getM_Package_ID());
+			if (weight == null)
+				weight = BigDecimal.ZERO;
+			setWeight(weight);
+		}
+		
+		return true;
+	}
+	
+	protected boolean afterSave(boolean newRecord, boolean success)
+	{
+		if (!success)
+			return success;
+		
+		StringBuilder sb = new StringBuilder();
+		sb.append("SELECT COUNT(*) FROM M_PackageMPS ");
+		sb.append("WHERE M_Package_ID = ?");
+		int packageMPSCount = DB.getSQLValue(get_TrxName(), sb.toString(), getM_Package_ID());
+		
+		if (getBoxCount() > 0 && getBoxCount() - packageMPSCount > 0)
+		{
+			MPackageMPS packageMPS = new MPackageMPS(getCtx(), 0, get_TrxName());
+			packageMPS.setM_Package_ID(getM_Package_ID());
+			packageMPS.saveEx();
+		}
+		
+		return success;
+	}
+	
+	protected boolean beforeDelete()
+	{
+		String sql = "DELETE FROM M_PackageLine WHERE M_PackageMPS_ID IN (SELECT M_PackageMPS_ID FROM M_PackageMPS WHERE M_Package_ID = ?)";
+		DB.executeUpdate(sql, getM_Package_ID(), get_TrxName());
+		
+		sql = "DELETE FROM M_PackageMPS WHERE M_Package_ID = ?";
+		DB.executeUpdate(sql, getM_Package_ID(), get_TrxName());
+		return true;
+	}
+	
+	/** Error Message						*/
+	private String				m_errorMessage = null;
+	
+	public void setErrorMessage(String errorMessage)
+	{
+		m_errorMessage = errorMessage;
+	}
+	
+	public String getErrorMessage()
+	{
+		return m_errorMessage;
+	}
+	
+	public boolean processOnline(String action, boolean isPriviledgedRate)
+	{
+		setErrorMessage(null);
+
+		Trx trx = Trx.get(Trx.createTrxName("spt-"), true);
+		boolean ok = false;
+		try
+		{			
+			MShippingTransaction st = createShippingTransaction(action, isPriviledgedRate, trx.getTrxName());
+			ok = st.processOnline();
+			
+			if (action.equals(MShippingTransaction.ACTION_ProcessShipment))
+			{
+				setShippingRespMessage(st.getShippingRespMessage());
+				
+				if (ok)
+				{
+					setPrice(st.getPrice());
+					setSurcharges(st.getSurcharges());
+					setTrackingNo(st.getTrackingNo());
+					setProcessed(true);
+					
+					MAttachment stAttachment = st.getAttachment(true);
+					if (stAttachment != null && stAttachment.getEntryCount() > 0)
+					{
+						MAttachment attachment = getAttachment(true);
+						if (attachment == null)
+							attachment = createAttachment();
+						
+						for (int i = 0; i < stAttachment.getEntryCount(); i++)
+						{
+							if (stAttachment.getEntry(i).getName().startsWith("shipping_label") 
+									|| stAttachment.getEntry(i).getName().startsWith("commercial_invoice")
+									|| stAttachment.getEntry(i).getName().startsWith("auxiliary_label")
+									|| stAttachment.getEntry(i).getName().endsWith("_cod"))
+								attachment.addEntry(stAttachment.getEntry(i));
+						}
+						attachment.saveEx();
+					}
+					
+					MShippingTransactionLine[] lines = st.getLines("");
+					for (MShippingTransactionLine line : lines)
+					{
+						if (line.getM_PackageMPS_ID() == 0)
+							continue;
+						
+						MPackageMPS packageMPS = new MPackageMPS(getCtx(), line.getM_PackageMPS_ID(), get_TrxName());
+						packageMPS.setMasterTrackingNo(line.getMasterTrackingNo());
+						packageMPS.setTrackingNo(line.getTrackingNo());
+						packageMPS.setPrice(line.getPrice());
+						packageMPS.setProcessed(line.isProcessed());
+						packageMPS.saveEx();
+					}
+				}
+			}
+			else if (action.equals(MShippingTransaction.ACTION_RateInquiry))
+			{
+				setRateInquiryMessage(st.getShippingRespMessage());
+			}
+			else if (action.equals(MShippingTransaction.ACTION_VoidShipment))
+			{
+				setShippingRespMessage(st.getShippingRespMessage());
+				
+				if (ok)
+				{
+					setProcessed(false);
+					
+					MAttachment attachment = getAttachment(true);
+					if (attachment != null)
+					{
+						for (int i = attachment.getEntryCount() - 1; i >= 0; i--) 
+						{
+							if (attachment.getEntry(i).getName().startsWith("shipping_label") 
+									|| attachment.getEntry(i).getName().startsWith("commercial_invoice")
+									|| attachment.getEntry(i).getName().startsWith("auxiliary_label")
+									|| attachment.getEntry(i).getName().endsWith("_cod"))
+								attachment.deleteEntry(i);
+						}
+						if (attachment.getTitle() != null)
+							attachment.setTitle(attachment.getTitle());
+						else
+							attachment.setTitle(MAttachment.ZIP);
+						attachment.saveEx();
+					}
+				}
+				
+			}
+				
+			if (!ok)
+				setErrorMessage(st.getErrorMessage());
+		}
+		catch (Exception e)
+		{
+			log.log(Level.SEVERE, "processOnline", e);
+			setErrorMessage(Msg.getMsg(Env.getCtx(), "ShippingNotProcessed") + ": " + e.getMessage());
+		}
+		
+		if (trx != null)
+		{
+			trx.commit();
+			trx.close();
+		}
+
+		return ok;
+	}
+	
+	public MShippingTransaction createShippingTransaction(String action, boolean isPriviledgedRate, String trxName)
+	{
+		MInOut ioOut = null;
+		MInvoice invoice = null;
+		MOrder order = null;
+		
+		if (getM_InOut_ID() > 0)
+		{
+			ioOut = new MInOut(getCtx(), getM_InOut_ID(), get_TrxName());
+			if (ioOut.getC_Invoice_ID() > 0)
+				invoice = new MInvoice(getCtx(), ioOut.getC_Invoice_ID(), get_TrxName());
+			else
+			{
+				MMatchInv[] mis = MMatchInv.getInOut(getCtx(), ioOut.getM_InOut_ID(), get_TrxName());
+				for (MMatchInv mi : mis)
+				{
+					MInvoiceLine iol = new MInvoiceLine(getCtx(), mi.getC_InvoiceLine_ID(), get_TrxName());
+					if (iol.getC_Invoice_ID() > 0)
+					{
+						invoice = new MInvoice(getCtx(), iol.getC_Invoice_ID(), get_TrxName());
+						break;
+					}
+				}
+				
+				if (invoice == null)
+				{
+					StringBuilder sb = new StringBuilder();
+					sb.append("SELECT C_Invoice_ID ");
+					sb.append("FROM C_InvoiceLine ");
+					sb.append("WHERE M_InOutLine_ID IN (");
+					sb.append("SELECT M_InOutLine_ID ");
+					sb.append("FROM M_InOutLine ");
+					sb.append("WHERE M_InOut_ID = ?) ");
+					sb.append("ORDER BY C_InvoiceLine_ID DESC");
+					int C_Invoice_ID = DB.getSQLValue(get_TrxName(), sb.toString(), getM_InOut_ID());
+					if (C_Invoice_ID > 0)
+						invoice = new MInvoice(getCtx(), C_Invoice_ID, get_TrxName());
+				}
+			}
+
+			if (ioOut.getC_Order_ID() > 0)
+				order = new MOrder(getCtx(), ioOut.getC_Order_ID(), get_TrxName());
+			else
+			{
+				MMatchPO[] mos = MMatchPO.getInOut(getCtx(), ioOut.getM_InOut_ID(), get_TrxName());
+				for (MMatchPO mo : mos)
+				{
+					MOrderLine ol = new MOrderLine(getCtx(), mo.getC_OrderLine_ID(), get_TrxName());
+					if (ol.getC_Order_ID() > 0)
+					{
+						order = new MOrder(getCtx(), ol.getC_Order_ID(), get_TrxName());
+						break;
+					}
+				}
+				
+				if (order == null)
+				{
+					StringBuilder sb = new StringBuilder();
+					sb.append("SELECT C_Order_ID ");
+					sb.append("FROM C_OrderLine ");
+					sb.append("WHERE C_OrderLine_ID IN (");
+					sb.append("SELECT C_OrderLine_ID ");
+					sb.append("FROM M_InOutLine ");
+					sb.append("WHERE M_InOut_ID = ?) ");
+					sb.append("ORDER BY C_OrderLine_ID DESC");
+					int C_Invoice_ID = DB.getSQLValue(get_TrxName(), sb.toString(), getM_InOut_ID());
+					if (C_Invoice_ID > 0)
+						invoice = new MInvoice(getCtx(), C_Invoice_ID, get_TrxName());
+				}
+			}
+		}
+		
+		MClientInfo ci = MClientInfo.get(getCtx(), getAD_Client_ID(), get_TrxName());
+		BigDecimal CODAmount = BigDecimal.ZERO;
+		BigDecimal CustomsValue = BigDecimal.ZERO;
+		BigDecimal FreightAmt = BigDecimal.ZERO;
+		if (invoice != null)
+		{
+			CODAmount = invoice.getGrandTotal();
+			MInvoiceLine[] ils = invoice.getLines();
+			for (MInvoiceLine il : ils)
+			{
+				if (il.getM_Product_ID() == ci.getM_ProductFreight_ID() || il.getC_Charge_ID() == ci.getC_ChargeFreight_ID())
+					FreightAmt = FreightAmt.add(il.getLineNetAmt());
+			}
+			CustomsValue = CODAmount.subtract(FreightAmt);
+		}
+		else if (order != null)
+		{
+			CODAmount = order.getGrandTotal();
+			MOrderLine[] ols = order.getLines();
+			for (MOrderLine ol : ols)
+			{
+				if ((ol.getM_Product_ID() > 0 && ol.getM_Product_ID() == ci.getM_ProductFreight_ID()) ||
+						(ol.getC_Charge_ID() > 0 && ol.getC_Charge_ID() == ci.getC_ChargeFreight_ID()))
+					FreightAmt = FreightAmt.add(ol.getLineNetAmt());
+			}
+			CustomsValue = CODAmount.subtract(FreightAmt);			
+		}
+		
+		MShippingTransaction st = new MShippingTransaction(getCtx(), 0, trxName);
+		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.setBill_Location_ID(getC_BPartner_Location_ID());
+		st.setBoxCount(getBoxCount());
+		st.setC_BP_ShippingAcct_ID(getC_BP_ShippingAcct_ID());
+		st.setC_BPartner_ID(ioOut.getC_BPartner_ID());
+		st.setC_BPartner_Location_ID(ioOut.getC_BPartner_Location_ID());
+		st.setC_Currency_ID(getC_Currency_ID());
+		st.setC_Invoice_ID(invoice != null ? invoice.getC_Invoice_ID() : 0);
+		st.setC_Order_ID(order != null ? order.getC_Order_ID() : 0);
+		st.setC_UOM_Length_ID(getC_UOM_Length_ID());
+		st.setC_UOM_Weight_ID(getC_UOM_Weight_ID());
+		st.setCashOnDelivery(isCashOnDelivery());
+		st.setCODAmount(CODAmount);
+		st.setCustomsValue(CustomsValue);
+		st.setDateReceived(getDateReceived());
+		st.setDeliveryConfirmation(isDeliveryConfirmation());
+		st.setDeliveryConfirmationType(getDeliveryConfirmationType());
+		st.setDescription(getDescription());
+		st.setDotHazardClassOrDivision(getDotHazardClassOrDivision());
+		st.setDryIceWeight(getDryIceWeight());
+		st.setDutiesShipperAccount(getDutiesShipperAccount());
+		st.setFOB(getFOB());
+		st.setFreightAmt(FreightAmt);
+		st.setFreightCharges(getFreightCharges());
+		st.setHandlingCharge(getHandlingCharge());
+		st.setHeight(getHeight());
+		st.setHoldAddress(getHoldAddress());
+		st.setHomeDeliveryPremiumDate(getHomeDeliveryPremiumDate());
+		st.setHomeDeliveryPremiumPhone(getHomeDeliveryPremiumPhone());
+		st.setHomeDeliveryPremiumType(getHomeDeliveryPremiumType());
+		st.setInsurance(getInsurance());
+		st.setInsuredAmount(getInsuredAmount());
+		st.setIsAccessible(isAccessible());
+		st.setIsActive(isActive());
+		st.setIsAddedHandling(isAddedHandling());
+		st.setIsAlternateReturnAddress(ioOut.isAlternateReturnAddress());
+		st.setIsCargoAircraftOnly(isCargoAircraftOnly());
+		st.setIsDryIce(isDryIce());
+		st.setIsDutiable(isDutiable());
+		st.setIsFutureDayShipment(isFutureDayShipment());
+		st.setIsHazMat(isHazMat());
+		st.setIsHoldAtLocation(isHoldAtLocation());
+		st.setIsIgnoreZipNotFound(isIgnoreZipNotFound());
+		st.setIsIgnoreZipStateNotMatch(isIgnoreZipStateNotMatch());
+		st.setIsPriviledgedRate(isPriviledgedRate);
+		st.setIsResidential(isResidential());
+		st.setIsSaturdayDelivery(isSaturdayDelivery());
+		st.setIsSaturdayPickup(isSaturdayPickup());
+		st.setIsVerbalConfirmation(isVerbalConfirmation());
+		st.setLatestPickupTime(getLatestPickupTime());
+		st.setLength(getLength());
+		st.setM_InOut_ID(getM_InOut_ID());
+		st.setM_Package_ID(getM_Package_ID());
+		st.setM_Shipper_ID(getM_Shipper_ID());
+		st.setM_ShipperLabels_ID(getM_ShipperLabels_ID());
+		st.setM_ShipperPackaging_ID(getM_ShipperPackaging_ID());
+		st.setM_ShipperPickupTypes_ID(getM_ShipperPickupTypes_ID());
+		st.setM_ShippingProcessor_ID(getM_ShippingProcessor_ID());
+		st.setM_Warehouse_ID(ioOut.getM_Warehouse_ID());
+		st.setNotificationMessage(getNotificationMessage());
+		st.setNotificationType(getNotificationType());
+		st.setPaymentRule(getPaymentRule());
+		st.setPOReference(ioOut.getPOReference() != null ? ioOut.getPOReference() : order.getPOReference());
+		st.setPrice(getPrice());
+		st.setPriceActual(getPriceActual());
+		st.setProcessed(isProcessed());
+		st.setReceivedInfo(getReceivedInfo());
+		st.setReturnBPartner_ID(ioOut.getReturnBPartner_ID());
+		st.setReturnLocation_ID(ioOut.getReturnLocation_ID());
+		st.setReturnUser_ID(ioOut.getReturnUser_ID());
+		st.setSalesRep_ID(ioOut.getSalesRep_ID());
+		st.setShipDate(getShipDate());
+		st.setShipperAccount(getShipperAccount());
+//		st.setShippingRespMessage(ShippingRespMessage);
+		st.setSurcharges(getSurcharges());
+		st.setTrackingInfo(getTrackingInfo());
+		st.setTrackingNo(getTrackingNo());
+		st.setWeight(getWeight());
+		st.setWidth(getWidth());
+		st.saveEx();
+		
+		int[] ids = MPackageMPS.getAllIDs(MPackageMPS.Table_Name, "M_Package_ID = " + getM_Package_ID(), get_TrxName());
+		for (int i = 0; i < ids.length; i++)
+		{
+			MPackageMPS packageMPS = new MPackageMPS(getCtx(), ids[i], get_TrxName());
+			
+			MShippingTransactionLine stl = new MShippingTransactionLine(st.getCtx(), 0, st.get_TrxName());
+			stl.setAD_Client_ID(packageMPS.getAD_Client_ID());
+			stl.setAD_Org_ID(packageMPS.getAD_Org_ID());
+			stl.setC_UOM_Length_ID(packageMPS.getC_UOM_Length_ID());
+			stl.setC_UOM_Weight_ID(packageMPS.getC_UOM_Weight_ID());
+			stl.setDescription(packageMPS.getDescription());
+			stl.setHeight(packageMPS.getHeight());
+			stl.setIsActive(packageMPS.isActive());
+			stl.setLength(packageMPS.getLength());
+			stl.setM_PackageMPS_ID(packageMPS.getM_PackageMPS_ID());
+			stl.setM_ShippingTransaction_ID(st.getM_ShippingTransaction_ID());
+			stl.setMasterTrackingNo(packageMPS.getMasterTrackingNo());
+			stl.setPrice(packageMPS.getPrice());
+			stl.setProcessed(packageMPS.isProcessed());
+			stl.setSeqNo(packageMPS.getSeqNo());
+			stl.setTrackingNo(packageMPS.getTrackingNo());
+			stl.setWeight(packageMPS.getWeight());
+			stl.setWidth(packageMPS.getWidth());
+			stl.saveEx();
+		}
+		
+		return st;
+	}
+	
 }	//	MPackage

org.adempiere.base/src/org/compiere/model/MPackageMPS.java

@@ -0,0 +1,59 @@
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.util.DB;
+
+public class MPackageMPS extends X_M_PackageMPS
+{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2426722699419960060L;
+
+	public MPackageMPS(Properties ctx, int M_PackageMPS_ID, String trxName)
+	{
+		super(ctx, M_PackageMPS_ID, trxName);
+		if (M_PackageMPS_ID == 0)
+		{
+			MClientInfo clientInfo = MClientInfo.get(ctx, getAD_Client_ID());
+			setC_UOM_Weight_ID(clientInfo.getC_UOM_Weight_ID());
+			setC_UOM_Length_ID(clientInfo.getC_UOM_Length_ID());
+		}
+	}
+	
+	public MPackageMPS(Properties ctx, ResultSet rs, String trxName) 
+	{
+		super(ctx, rs, trxName);
+	}
+	
+	protected boolean beforeSave(boolean newRecord)
+	{
+		if (getSeqNo() == 0)
+		{
+			String sql = "SELECT COALESCE(MAX(SeqNo),0)+10 FROM M_PackageMPS WHERE M_Package_ID=?";
+			int ii = DB.getSQLValue (get_TrxName(), sql, getM_Package_ID());
+			setSeqNo(ii);
+		}
+		
+		if (getWeight() == null || getWeight().compareTo(BigDecimal.ZERO) == 0)
+		{
+			String sql = "SELECT SUM(LineWeight) FROM X_PackageLineWeight plw WHERE plw.M_PackageMPS_ID=?";
+			BigDecimal weight = DB.getSQLValueBD(get_TrxName(), sql, getM_PackageMPS_ID());
+			if (weight == null)
+				weight = BigDecimal.ZERO;
+			setWeight(weight);
+		}
+		
+		return true;
+	}
+
+	protected boolean beforeDelete()
+	{
+		String sql = "DELETE FROM M_PackageLine WHERE M_PackageMPS_ID = ?";
+		DB.executeUpdate(sql, getM_PackageMPS_ID(), get_TrxName());
+		return true;
+	}
+}

org.adempiere.base/src/org/compiere/model/MShipper.java

@@ -74,5 +74,35 @@ public class MShipper extends X_M_Shipper
 		List<MShipper> result = q.list();
 		return(result);
 	}
+	
+	public String getName()
+	{
+		return getX_Shipper().getName();
+	}
+	
+	public String getShippingServiceCode()
+	{
+		return getX_Shipper().getShippingServiceCode();
+	}
+	
+	public boolean isInternational()
+	{
+		return getX_Shipper().isInternational();
+	}
 
-}	//	MShipper
+	public boolean isResidential()
+	{
+		return getX_Shipper().isResidential();
+	}
+	
+	public boolean isSaturdayDelivery()
+	{
+		return getX_Shipper().isSaturdayDelivery();
+	}
+	
+	public String getTrackingURL()
+	{
+		return getX_Shipper().getTrackingURL();
+	}
+	
+}	//	MShipper

org.adempiere.base/src/org/compiere/model/MShipperLabels.java

@@ -0,0 +1,45 @@
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+public class MShipperLabels extends X_M_ShipperLabels 
+{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 3903237243862044930L;
+
+	public MShipperLabels(Properties ctx, int M_ShipperLabels_ID, String trxName) 
+	{
+		super(ctx, M_ShipperLabels_ID, trxName);
+	}
+	
+	public MShipperLabels(Properties ctx, ResultSet rs, String trxName)
+	{
+		super(ctx, rs, trxName);
+	}
+	
+	public String getValue()
+	{
+		return getX_ShipperLabels().getValue();
+	}
+	
+	public String getName()
+	{
+		return getX_ShipperLabels().getName();
+	}
+	
+	public BigDecimal getHeight()
+	{
+		return getX_ShipperLabels().getHeight();
+	}
+	
+	public BigDecimal getWidth()
+	{
+		return getX_ShipperLabels().getWidth();
+	}
+	
+}

org.adempiere.base/src/org/compiere/model/MShipperPackaging.java

@@ -0,0 +1,28 @@
+package org.compiere.model;
+
+import java.sql.ResultSet;
+import java.util.Properties;
+
+public class MShipperPackaging extends X_M_ShipperPackaging 
+{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 6403993556547324865L;
+
+	public MShipperPackaging(Properties ctx, int M_ShipperPackaging_ID, String trxName) 
+	{
+		super(ctx, M_ShipperPackaging_ID, trxName);
+	}
+	
+	public MShipperPackaging(Properties ctx, ResultSet rs, String trxName)
+	{
+		super(ctx, rs, trxName);
+	}
+	
+	public String getValue()
+	{
+		return getX_ShipperPackaging().getValue();
+	}
+}

org.adempiere.base/src/org/compiere/model/MShipperPickupTypes.java

@@ -0,0 +1,29 @@
+package org.compiere.model;
+
+import java.sql.ResultSet;
+import java.util.Properties;
+
+public class MShipperPickupTypes extends X_M_ShipperPickupTypes 
+{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2836350317204286835L;
+
+	public MShipperPickupTypes(Properties ctx, int M_ShipperPickupTypes_ID, String trxName) 
+	{
+		super(ctx, M_ShipperPickupTypes_ID, trxName);
+	}
+	
+	public MShipperPickupTypes(Properties ctx, ResultSet rs, String trxName)
+	{
+		super(ctx, rs, trxName);
+	}
+	
+	public String getValue()
+	{
+		return getX_ShipperPickupTypes().getValue();
+	}
+	
+}

org.adempiere.base/src/org/compiere/model/MShippingProcessor.java

@@ -0,0 +1,64 @@
+package org.compiere.model;
+
+import java.sql.ResultSet;
+import java.util.Properties;
+
+public class MShippingProcessor extends X_M_ShippingProcessor 
+{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -7635817773750467895L;
+
+	public MShippingProcessor(Properties ctx, int M_ShippingProcessor_ID, String trxName) 
+	{
+		super(ctx, M_ShippingProcessor_ID, trxName);
+	}
+	
+	public MShippingProcessor(Properties ctx, ResultSet rs, String trxName)
+	{
+		super(ctx, rs, trxName);
+	}
+	
+	public String getShippingProcessorClass()
+	{
+		return getX_ShippingProcessor().getShippingProcessorClass();
+	}
+	
+	public String getHostAddress()
+	{
+		return getX_ShippingProcessor().getHostAddress();
+	}
+	
+	public int getHostPort()
+	{
+		return getX_ShippingProcessor().getHostPort();
+	}
+	
+	public String getProxyAddress()
+	{
+		return getX_ShippingProcessor().getProxyAddress();
+	}
+	
+	public int getProxyPort()
+	{
+		return getX_ShippingProcessor().getProxyPort();
+	}
+	
+	public String getProxyLogon()
+	{
+		return getX_ShippingProcessor().getProxyLogon();
+	}
+	
+	public String getProxyPassword()
+	{
+		return getX_ShippingProcessor().getProxyPassword();
+	}
+	
+	public String getServicePath()
+	{
+		return getX_ShippingProcessor().getServicePath();
+	}
+	
+}

org.adempiere.base/src/org/compiere/model/MShippingTransaction.java

@@ -0,0 +1,467 @@
+package org.compiere.model;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.adempiere.base.Core;
+import org.adempiere.exceptions.AdempiereException;
+import org.adempiere.model.IShipmentProcessor;
+import org.adempiere.model.MShipperFacade;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.compiere.util.Util;
+
+public class MShippingTransaction extends X_M_ShippingTransaction 
+{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2444841696998774096L;
+
+	public MShippingTransaction(Properties ctx, int M_ShippingTransaction_ID, String trxName) 
+	{
+		super(ctx, M_ShippingTransaction_ID, trxName);
+	}
+	
+	public MShippingTransaction(Properties ctx, ResultSet rs, String trxName)
+	{
+		super(ctx, rs, trxName);
+	}
+	
+	public MShippingTransactionLine[] getLines(String whereClause)
+	{
+		StringBuilder whereClauseFinal = new StringBuilder(MShippingTransactionLine.COLUMNNAME_M_ShippingTransaction_ID + "=? ");
+		if (!Util.isEmpty(whereClause, true))
+			whereClauseFinal.append(whereClause);
+		//
+		List<MShippingTransactionLine> list = new Query(getCtx(), MShippingTransactionLine.Table_Name, whereClauseFinal.toString(), get_TrxName())
+				.setParameters(get_ID())
+				.setOrderBy(MShippingTransactionLine.COLUMNNAME_SeqNo)
+				.list();
+		//
+		return list.toArray(new MShippingTransactionLine[list.size()]);		
+	}
+	
+	/** Error Message						*/
+	private String				m_errorMessage = null;
+	
+	public void setErrorMessage(String errorMessage)
+	{
+		m_errorMessage = errorMessage;
+	}
+	
+	public String getErrorMessage()
+	{
+		return m_errorMessage;
+	}
+	
+	public boolean processOnline()
+	{
+		setErrorMessage(null);
+
+		boolean processed = false;		
+		try
+		{
+			MShipperFacade sf = new MShipperFacade(getMShipper());
+			IShipmentProcessor processor = Core.getShipmentProcessor(sf);
+			if (processor == null)
+				setErrorMessage(Msg.getMsg(Env.getCtx(), "ShippingNoProcessor"));
+			else
+			{
+				if (getAction().equals(ACTION_ProcessShipment))
+					processed = processor.processShipment(getCtx(), this, get_TrxName());
+				else if (getAction().equals(ACTION_RateInquiry))
+					processed = processor.rateInquiry(getCtx(), this, isPriviledgedRate(), get_TrxName());
+				else if (getAction().equals(ACTION_VoidShipment))
+					processed = processor.voidShipment(getCtx(), this, get_TrxName());
+				else
+					throw new AdempiereException(Msg.getMsg(Env.getCtx(), "ActionNotSupported"));
+				
+				if (!processed)
+					setErrorMessage("From " + getMShipper().getName() + ": " + getShippingRespMessage());
+			}
+		}
+		catch (Exception e)
+		{
+			log.log(Level.SEVERE, "processOnline", e);
+			setErrorMessage(Msg.getMsg(Env.getCtx(), "ShippingNotProcessed") + ":\n" + e.getMessage());
+		}
+		
+		MOnlineTrxHistory history = new MOnlineTrxHistory(getCtx(), 0, get_TrxName());
+		history.setAD_Table_ID(MShippingTransaction.Table_ID);
+		history.setRecord_ID(getM_ShippingTransaction_ID());
+		history.setIsError(!processed);
+		history.setProcessed(processed);
+		
+		StringBuilder msg = new StringBuilder();
+		if (processed)
+			msg.append(getShippingRespMessage());
+		else
+			msg.append("ERROR: " + getErrorMessage());
+		msg.append("\nAction: " + getAction());
+		history.setTextMsg(msg.toString());
+		
+		history.saveEx();
+		
+		setProcessed(processed);
+		return processed;
+	}
+	
+	public MShipper getMShipper()
+	{
+		return new MShipper(getCtx(), getM_Shipper_ID(), get_TrxName());
+	}
+	
+	public boolean isInternational()
+	{
+		MShipperFacade facade = new MShipperFacade(getMShipper());
+		return facade.isInternational();
+	}
+	
+	public String getCurrencyCode() 
+	{
+		MCurrency currency = MCurrency.get(getCtx(), getC_Currency_ID());
+		return currency.getISO_Code();
+	}
+	
+	public boolean isPayBySender() 
+	{
+		// Payment Type must be SENDER or THIRD_PARTY when COD is requested		
+		if (MShippingTransaction.FREIGHTCHARGES_Prepaid.equals(getFreightCharges()) || MShippingTransaction.FREIGHTCHARGES_PrepaidAndBill.equals(getFreightCharges()))
+			return true;
+		else if (!MShippingTransaction.FREIGHTCHARGES_3rdParty.equals(getFreightCharges()) && isCashOnDelivery())
+			return true;
+		else
+			return false;
+	}
+	
+	public int getProductFreightID()
+	{
+		return DB.getSQLValue(null, "SELECT M_ProductFreight_ID FROM AD_Clientinfo WHERE AD_Client_ID = ?", getAD_Client_ID());
+	}
+	
+	public boolean isPrintLabelAsImage() 
+	{
+		MShipperLabels label = new MShipperLabels(getCtx(), getM_ShipperLabels_ID(), get_TrxName());
+		return MShipperLabels.LABELPRINTMETHOD_Image.equals(label.getLabelPrintMethod());
+	}
+	
+	public boolean isPrintZebraLabel() 
+	{
+		MShipperLabels label = new MShipperLabels(getCtx(), getM_ShipperLabels_ID(), get_TrxName());
+		return MShipperLabels.LABELPRINTMETHOD_Zebra.equals(label.getLabelPrintMethod());
+	}
+	
+	public boolean isPrintEltronLabel() 
+	{
+		MShipperLabels label = new MShipperLabels(getCtx(), getM_ShipperLabels_ID(), get_TrxName());
+		return MShipperLabels.LABELPRINTMETHOD_Eltron.equals(label.getLabelPrintMethod());
+	}
+	
+	public String getPayorAccount() 
+	{
+		if (isPayBySender()) 
+		{
+			MShipperFacade sf = new MShipperFacade(getMShipper());
+			return sf.getShipperAccount(getAD_Org_ID());
+		} 
+		else 
+		{
+			String ac = getShipperAccount();
+			if (ac != null) 
+			{
+				ac = ac.replaceAll("[-]", "");
+				ac = ac.replaceAll(" ", "");
+			}
+			return ac;
+		}
+	}
+	
+	public String getDutiesPayorAccount() 
+	{
+		if (isPayBySender()) 
+		{
+			MShipperFacade sf = new MShipperFacade(getMShipper());
+			String dutiesShipperAccount = sf.getDutiesShipperAccount(getAD_Org_ID());
+			if(dutiesShipperAccount == null)
+				dutiesShipperAccount = sf.getShipperAccount(getAD_Org_ID());
+			return dutiesShipperAccount;
+		} 
+		else 
+		{
+			String ac = getDutiesShipperAccount();
+			if (ac == null)
+				ac = getShipperAccount();
+			
+			if (ac != null) 
+			{
+				ac = ac.replaceAll("[-]", "");
+				ac = ac.replaceAll(" ", "");
+			}
+			return ac;
+		}
+	}
+	
+	public String getPayorCountryCode() 
+	{
+		if (!isPayBySender()) 
+		{
+			MBPartnerLocation partnerLocation = new MBPartnerLocation(getCtx(), getC_BPartner_Location_ID(), get_TrxName());
+			MLocation location = new MLocation(getCtx(), partnerLocation.getC_Location_ID(), get_TrxName());
+			X_C_Country country = new X_C_Country(getCtx(), location.getC_Country_ID(), get_TrxName());
+			return country.getCountryCode();
+		} 
+		else 
+		{
+			MOrg org = new MOrg(getCtx(), getAD_Org_ID(), get_TrxName());
+			MOrgInfo info = new MOrgInfo(org);
+			MLocation location = new MLocation(getCtx(), info.getC_Location_ID(), get_TrxName());
+			X_C_Country country = new X_C_Country(getCtx(), location.getC_Country_ID(), get_TrxName());
+			return country.getCountryCode();
+		}
+	}
+	
+	public boolean isCollect() 
+	{
+		return MShippingTransaction.FREIGHTCHARGES_Collect.equals(getFreightCharges());
+	}
+	
+	public boolean is3rdParty() 
+	{
+		return MShippingTransaction.FREIGHTCHARGES_3rdParty.equals(getFreightCharges());
+	}
+	
+	public X_X_CommodityShipment getCommodityShipment(int M_Product_ID)
+	{
+		X_X_CommodityShipment commodityShipment = null;
+		
+		StringBuilder sql = new StringBuilder();
+		sql.append("SELECT * FROM X_CommodityShipment ");
+		sql.append("WHERE M_Product_ID IN (0, ?) OR M_Product_ID IS NULL ");
+		sql.append("AND AD_Client_ID IN (0, ?) ");
+		sql.append("AND AD_Org_ID IN (0, ?) ");
+		sql.append("ORDER BY M_Product_ID, AD_Org_ID, AD_Client_ID");
+
+		PreparedStatement stmt = null;
+		ResultSet rs = null;
+			
+		try {
+			stmt = DB.prepareStatement(sql.toString(), null);
+			stmt.setInt(1, M_Product_ID);
+			stmt.setInt(2, getAD_Client_ID());
+			stmt.setInt(3, getAD_Org_ID());
+			rs = stmt.executeQuery();
+			
+			if(rs.next())
+			{
+				commodityShipment = new X_X_CommodityShipment(getCtx(), rs, null);
+			}
+		} 
+		catch (Exception e) 
+		{
+			 log.log(Level.SEVERE, e.getLocalizedMessage(), e);
+		} 
+		finally 
+		{
+			DB.close(rs, stmt);
+		}
+		
+		if(commodityShipment == null)
+			commodityShipment = new X_X_CommodityShipment(getCtx(), 0, null);
+		
+		return commodityShipment;
+	}
+	
+	public int getCommodityShipmentID(int M_Product_ID) 
+	{
+		X_X_CommodityShipment commodityShipment = getCommodityShipment(M_Product_ID);
+		return commodityShipment.getX_CommodityShipment_ID();
+	}
+
+	public String getCommodityDescription(int M_Product_ID) 
+	{
+		X_X_CommodityShipment commodityShipment = getCommodityShipment(M_Product_ID);
+		return commodityShipment.getDescription();		
+	}
+
+	public String getHarmonizedCode(int M_Product_ID) 
+	{
+		X_X_CommodityShipment commodityShipment = getCommodityShipment(M_Product_ID);
+		return commodityShipment.getHarmonizedCode();
+	}
+	
+	public String getExportLicenseNum(int M_Product_ID) 
+	{
+		X_X_CommodityShipment commodityShipment = getCommodityShipment(M_Product_ID);
+		return commodityShipment.getExportLicenseNum();
+	}
+	
+	public String getCountryOfManufacture(int M_Product_ID) 
+	{
+		X_X_CommodityShipment commodityShipment = getCommodityShipment(M_Product_ID);
+		int countryId = commodityShipment.getCountryOfManufacture();
+		X_C_Country c = new X_C_Country(getCtx(), countryId, null);
+		return c.getCountryCode();
+	}
+	
+	private PartyInfo senderInfo, recipientInfo;
+	
+	public PartyInfo getSenderInfo()
+	{
+		if (senderInfo != null)
+			return senderInfo;
+		
+		PartyInfo partyInfo = null;
+		
+/*		StringBuilder sql = new StringBuilder();
+		sql.append("SELECT CompanyName, ContactName, PhoneNumber, EMail, C_Location_ID ");
+		sql.append("FROM X_ShippingSenderInfo_V ");
+		sql.append("WHERE M_ShippingTransaction_ID = ?");
+		
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			pstmt = DB.prepareStatement (sql.toString(), null);
+			pstmt.setInt(1, getM_ShippingTransaction_ID());
+			rs = pstmt.executeQuery ();
+			if (rs.next ())
+			{
+				partyInfo = new PartyInfo();
+				partyInfo.setCompanyName(rs.getString("CompanyName"));
+				partyInfo.setContactName(rs.getString("ContactName"));
+				partyInfo.setPhoneNumber(rs.getString("PhoneNumber"));
+				partyInfo.setEmail(rs.getString("EMail"));
+				partyInfo.setLocationId(rs.getInt("C_Location_ID"));
+			}
+ 		}
+		catch (Exception e)
+		{
+			log.log(Level.SEVERE, e.getLocalizedMessage(), e);
+		}
+		finally
+		{
+			DB.close(rs, pstmt);
+		}
+*/		
+		if (partyInfo == null)
+		{
+			MOrg sender = new MOrg(getCtx(), getAD_Org_ID(), get_TrxName());
+		    MUser senderContact = new MUser(getCtx(), getSalesRep_ID(), get_TrxName());
+		    MWarehouse warehouse = new MWarehouse(getCtx(), getM_Warehouse_ID(), get_TrxName());
+		    
+			partyInfo = new PartyInfo();
+			partyInfo.setCompanyName(sender.getDescription());						
+		    partyInfo.setContactName(senderContact.getDescription());
+		    partyInfo.setPhoneNumber(sender.getInfo().getPhone());
+			partyInfo.setEmail(senderContact.getEMail());
+			partyInfo.setLocationId(warehouse.getC_Location_ID());
+		}
+		
+		senderInfo = partyInfo;
+		
+		return partyInfo;
+	}
+	
+	public PartyInfo getRecipientInfo()
+	{
+		if (recipientInfo != null)
+			return recipientInfo;
+
+		PartyInfo partyInfo = null;
+		
+/*		StringBuilder sql = new StringBuilder();
+		sql.append("SELECT CompanyName, ContactName, PhoneNumber, EMail, C_Location_ID ");
+		sql.append("FROM X_ShippingRecipientInfo_V ");
+		sql.append("WHERE M_ShippingTransaction_ID = ?");
+		
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			pstmt = DB.prepareStatement (sql.toString(), null);
+			pstmt.setInt(1, getM_ShippingTransaction_ID());
+			rs = pstmt.executeQuery ();
+			if (rs.next ())
+			{
+				partyInfo = new PartyInfo();
+				partyInfo.setCompanyName(rs.getString("CompanyName"));
+				partyInfo.setContactName(rs.getString("ContactName"));
+				partyInfo.setPhoneNumber(rs.getString("PhoneNumber"));
+				partyInfo.setEmail(rs.getString("EMail"));
+				partyInfo.setLocationId(rs.getInt("C_Location_ID"));
+			}
+ 		}
+		catch (Exception e)
+		{
+			log.log(Level.SEVERE, e.getLocalizedMessage(), e);
+		}
+		finally
+		{
+			DB.close(rs, pstmt);
+		}
+*/		
+		if (partyInfo == null)
+		{
+			MBPartner recipient = new MBPartner(getCtx(), getC_BPartner_ID(), get_TrxName());
+		    MBPartnerLocation ra = new MBPartnerLocation(getCtx(), getC_BPartner_Location_ID(), get_TrxName());
+		    MUser contact = new MUser(getCtx(), getAD_User_ID(), get_TrxName());
+		    
+		    partyInfo = new PartyInfo();
+			partyInfo.setCompanyName(recipient.getName());						
+		    partyInfo.setContactName(contact.getName());
+		    partyInfo.setPhoneNumber(contact.getPhone());
+			partyInfo.setEmail(contact.getEMail());
+			partyInfo.setLocationId(ra.getC_Location_ID());
+		}
+		
+		recipientInfo = partyInfo;
+		
+		return partyInfo;
+	}
+	
+	public class PartyInfo
+	{
+		private String companyName;
+		private String contactName;
+		private String phoneNumber;
+		private String email;
+		private int locationId;
+		
+		public String getCompanyName() {
+			return companyName;
+		}
+		public void setCompanyName(String companyName) {
+			this.companyName = companyName;
+		}
+		public String getContactName() {
+			return contactName;
+		}
+		public void setContactName(String contactName) {
+			this.contactName = contactName;
+		}
+		public String getPhoneNumber() {
+			return phoneNumber;
+		}
+		public void setPhoneNumber(String phoneNumber) {
+			this.phoneNumber = phoneNumber;
+		}
+		public String getEmail() {
+			return email;
+		}
+		public void setEmail(String email) {
+			this.email = email;
+		}
+		public int getLocationId() {
+			return locationId;
+		}
+		public void setLocationId(int locationId) {
+			this.locationId = locationId;
+		}
+	}
+
+}

org.adempiere.base/src/org/compiere/model/MShippingTransactionLine.java

@@ -0,0 +1,24 @@
+package org.compiere.model;
+
+import java.sql.ResultSet;
+import java.util.Properties;
+
+public class MShippingTransactionLine extends X_M_ShippingTransactionLine 
+{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8148869412130244360L;
+
+	public MShippingTransactionLine(Properties ctx, int M_ShippingTransactionLine_ID, String trxName) 
+	{
+		super(ctx, M_ShippingTransactionLine_ID, trxName);
+	}
+	
+	public MShippingTransactionLine(Properties ctx, ResultSet rs, String trxName)
+	{
+		super(ctx, rs, trxName);
+	}
+	
+}

org.adempiere.base/src/org/compiere/model/MSysConfig.java

@@ -111,6 +111,8 @@ public class MSysConfig extends X_AD_SysConfig
 	public static final String MAIL_SEND_BCC_TO_ADDRESS = "MAIL_SEND_BCC_TO_ADDRESS";
 	public static final String MAIL_SEND_BCC_TO_FROM = "MAIL_SEND_BCC_TO_FROM";
 	public static final String REAL_TIME_POS = "REAL_TIME_POS";
+	public static final String SHIPPING_DEFAULT_WEIGHT_PER_PACKAGE = "SHIPPING_DEFAULT_WEIGHT_PER_PACKAGE";
+	public static final String SHIPPING_SAVE_REQUEST_RESPONSE_LOG = "SHIPPING_SAVE_REQUEST_RESPONSE_LOG";
 
 	/**
 	 * 	Standard Constructor

org.adempiere.base/src/org/compiere/model/X_AD_ClientInfo.java

@@ -29,7 +29,7 @@ public class X_AD_ClientInfo extends PO implements I_AD_ClientInfo, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121205L;
+	private static final long serialVersionUID = 20121217L;
 
     /** Standard Constructor */
     public X_AD_ClientInfo (Properties ctx, int AD_ClientInfo_ID, String trxName)
@@ -416,6 +416,31 @@ public class X_AD_ClientInfo extends PO implements I_AD_ClientInfo, I_Persistent
 		return ii.intValue();
 	}
 
+	public org.compiere.model.I_C_Charge getC_ChargeFreight() throws RuntimeException
+    {
+		return (org.compiere.model.I_C_Charge)MTable.get(getCtx(), org.compiere.model.I_C_Charge.Table_Name)
+			.getPO(getC_ChargeFreight_ID(), get_TrxName());	}
+
+	/** Set Charge for Freight.
+		@param C_ChargeFreight_ID Charge for Freight	  */
+	public void setC_ChargeFreight_ID (int C_ChargeFreight_ID)
+	{
+		if (C_ChargeFreight_ID < 1) 
+			set_Value (COLUMNNAME_C_ChargeFreight_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_ChargeFreight_ID, Integer.valueOf(C_ChargeFreight_ID));
+	}
+
+	/** Get Charge for Freight.
+		@return Charge for Freight	  */
+	public int getC_ChargeFreight_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_ChargeFreight_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public org.compiere.model.I_C_UOM getC_UOM_Length() throws RuntimeException
     {
 		return (org.compiere.model.I_C_UOM)MTable.get(getCtx(), org.compiere.model.I_C_UOM.Table_Name)
@@ -662,8 +687,8 @@ public class X_AD_ClientInfo extends PO implements I_AD_ClientInfo, I_Persistent
 		return (org.compiere.model.I_AD_StorageProvider)MTable.get(getCtx(), org.compiere.model.I_AD_StorageProvider.Table_Name)
 			.getPO(getStorageArchive_ID(), get_TrxName());	}
 
-	/** Set StorageArchive_ID.
-		@param StorageArchive_ID StorageArchive_ID	  */
+	/** Set Archive Store.
+		@param StorageArchive_ID Archive Store	  */
 	public void setStorageArchive_ID (int StorageArchive_ID)
 	{
 		if (StorageArchive_ID < 1) 
@@ -672,8 +697,8 @@ public class X_AD_ClientInfo extends PO implements I_AD_ClientInfo, I_Persistent
 			set_Value (COLUMNNAME_StorageArchive_ID, Integer.valueOf(StorageArchive_ID));
 	}
 
-	/** Get StorageArchive_ID.
-		@return StorageArchive_ID	  */
+	/** Get Archive Store.
+		@return Archive Store	  */
 	public int getStorageArchive_ID () 
 	{
 		Integer ii = (Integer)get_Value(COLUMNNAME_StorageArchive_ID);

org.adempiere.base/src/org/compiere/model/X_C_BP_ShippingAcct.java

@@ -0,0 +1,229 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+/** Generated Model - DO NOT CHANGE */
+package org.compiere.model;
+
+import java.sql.ResultSet;
+import java.util.Properties;
+
+/** Generated Model for C_BP_ShippingAcct
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a - $Id$ */
+public class X_C_BP_ShippingAcct extends PO implements I_C_BP_ShippingAcct, I_Persistent 
+{
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 20121207L;
+
+    /** Standard Constructor */
+    public X_C_BP_ShippingAcct (Properties ctx, int C_BP_ShippingAcct_ID, String trxName)
+    {
+      super (ctx, C_BP_ShippingAcct_ID, trxName);
+      /** if (C_BP_ShippingAcct_ID == 0)
+        {
+			setC_BP_ShippingAcct_ID (0);
+			setC_BPartner_ID (0);
+        } */
+    }
+
+    /** Load Constructor */
+    public X_C_BP_ShippingAcct (Properties ctx, ResultSet rs, String trxName)
+    {
+      super (ctx, rs, trxName);
+    }
+
+    /** AccessLevel
+      * @return 3 - Client - Org 
+      */
+    protected int get_AccessLevel()
+    {
+      return accessLevel.intValue();
+    }
+
+    /** Load Meta Data */
+    protected POInfo initPO (Properties ctx)
+    {
+      POInfo poi = POInfo.getPOInfo (ctx, Table_ID, get_TrxName());
+      return poi;
+    }
+
+    public String toString()
+    {
+      StringBuffer sb = new StringBuffer ("X_C_BP_ShippingAcct[")
+        .append(get_ID()).append("]");
+      return sb.toString();
+    }
+
+	/** Set Business Partner Shipping Account.
+		@param C_BP_ShippingAcct_ID Business Partner Shipping Account	  */
+	public void setC_BP_ShippingAcct_ID (int C_BP_ShippingAcct_ID)
+	{
+		if (C_BP_ShippingAcct_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_BP_ShippingAcct_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_BP_ShippingAcct_ID, Integer.valueOf(C_BP_ShippingAcct_ID));
+	}
+
+	/** Get Business Partner Shipping Account.
+		@return Business Partner Shipping Account	  */
+	public int getC_BP_ShippingAcct_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_ShippingAcct_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set C_BP_ShippingAcct_UU.
+		@param C_BP_ShippingAcct_UU C_BP_ShippingAcct_UU	  */
+	public void setC_BP_ShippingAcct_UU (String C_BP_ShippingAcct_UU)
+	{
+		set_Value (COLUMNNAME_C_BP_ShippingAcct_UU, C_BP_ShippingAcct_UU);
+	}
+
+	/** Get C_BP_ShippingAcct_UU.
+		@return C_BP_ShippingAcct_UU	  */
+	public String getC_BP_ShippingAcct_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_C_BP_ShippingAcct_UU);
+	}
+
+	public org.compiere.model.I_C_BPartner getC_BPartner() throws RuntimeException
+    {
+		return (org.compiere.model.I_C_BPartner)MTable.get(getCtx(), org.compiere.model.I_C_BPartner.Table_Name)
+			.getPO(getC_BPartner_ID(), get_TrxName());	}
+
+	/** Set Business Partner .
+		@param C_BPartner_ID 
+		Identifies a Business Partner
+	  */
+	public void setC_BPartner_ID (int C_BPartner_ID)
+	{
+		if (C_BPartner_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_BPartner_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_BPartner_ID, Integer.valueOf(C_BPartner_ID));
+	}
+
+	/** Get Business Partner .
+		@return Identifies a Business Partner
+	  */
+	public int getC_BPartner_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BPartner_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public org.compiere.model.I_C_BPartner_Location getC_BPartner_Location() throws RuntimeException
+    {
+		return (org.compiere.model.I_C_BPartner_Location)MTable.get(getCtx(), org.compiere.model.I_C_BPartner_Location.Table_Name)
+			.getPO(getC_BPartner_Location_ID(), get_TrxName());	}
+
+	/** Set Partner Location.
+		@param C_BPartner_Location_ID 
+		Identifies the (ship to) address for this Business Partner
+	  */
+	public void setC_BPartner_Location_ID (int C_BPartner_Location_ID)
+	{
+		if (C_BPartner_Location_ID < 1) 
+			set_Value (COLUMNNAME_C_BPartner_Location_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_BPartner_Location_ID, Integer.valueOf(C_BPartner_Location_ID));
+	}
+
+	/** Get Partner Location.
+		@return Identifies the (ship to) address for this Business Partner
+	  */
+	public int getC_BPartner_Location_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BPartner_Location_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Duties Shipper Account.
+		@param DutiesShipperAccount Duties Shipper Account	  */
+	public void setDutiesShipperAccount (String DutiesShipperAccount)
+	{
+		set_Value (COLUMNNAME_DutiesShipperAccount, DutiesShipperAccount);
+	}
+
+	/** Get Duties Shipper Account.
+		@return Duties Shipper Account	  */
+	public String getDutiesShipperAccount () 
+	{
+		return (String)get_Value(COLUMNNAME_DutiesShipperAccount);
+	}
+
+	public org.compiere.model.I_M_ShippingProcessor getM_ShippingProcessor() throws RuntimeException
+    {
+		return (org.compiere.model.I_M_ShippingProcessor)MTable.get(getCtx(), org.compiere.model.I_M_ShippingProcessor.Table_Name)
+			.getPO(getM_ShippingProcessor_ID(), get_TrxName());	}
+
+	/** Set Shipping Processor.
+		@param M_ShippingProcessor_ID Shipping Processor	  */
+	public void setM_ShippingProcessor_ID (int M_ShippingProcessor_ID)
+	{
+		if (M_ShippingProcessor_ID < 1) 
+			set_Value (COLUMNNAME_M_ShippingProcessor_ID, null);
+		else 
+			set_Value (COLUMNNAME_M_ShippingProcessor_ID, Integer.valueOf(M_ShippingProcessor_ID));
+	}
+
+	/** Get Shipping Processor.
+		@return Shipping Processor	  */
+	public int getM_ShippingProcessor_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_ShippingProcessor_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Shipper Account Number.
+		@param ShipperAccount Shipper Account Number	  */
+	public void setShipperAccount (String ShipperAccount)
+	{
+		set_Value (COLUMNNAME_ShipperAccount, ShipperAccount);
+	}
+
+	/** Get Shipper Account Number.
+		@return Shipper Account Number	  */
+	public String getShipperAccount () 
+	{
+		return (String)get_Value(COLUMNNAME_ShipperAccount);
+	}
+
+	/** Set Shipper Meter.
+		@param ShipperMeter Shipper Meter	  */
+	public void setShipperMeter (String ShipperMeter)
+	{
+		set_Value (COLUMNNAME_ShipperMeter, ShipperMeter);
+	}
+
+	/** Get Shipper Meter.
+		@return Shipper Meter	  */
+	public String getShipperMeter () 
+	{
+		return (String)get_Value(COLUMNNAME_ShipperMeter);
+	}
+}

org.adempiere.base/src/org/compiere/model/X_C_Order.java

@@ -33,7 +33,7 @@ public class X_C_Order extends PO implements I_C_Order, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121031L;
+	private static final long serialVersionUID = 20121221L;
 
     /** Standard Constructor */
     public X_C_Order (Properties ctx, int C_Order_ID, String trxName)
@@ -605,43 +605,6 @@ public class X_C_Order extends PO implements I_C_Order, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Charge amount.
-		@param ChargeAmt 
-		Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt)
-	{
-		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
-	}
-
-	/** Get Charge amount.
-		@return Charge Amount
-	  */
-	public BigDecimal getChargeAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
-	/** Set Copy From.
-		@param CopyFrom 
-		Copy From Record
-	  */
-	public void setCopyFrom (String CopyFrom)
-	{
-		set_Value (COLUMNNAME_CopyFrom, CopyFrom);
-	}
-
-	/** Get Copy From.
-		@return Copy From Record
-	  */
-	public String getCopyFrom () 
-	{
-		return (String)get_Value(COLUMNNAME_CopyFrom);
-	}
-
 	/** Set Order.
 		@param C_Order_ID 
 		Order
@@ -665,6 +628,20 @@ public class X_C_Order extends PO implements I_C_Order, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set C_Order_UU.
+		@param C_Order_UU C_Order_UU	  */
+	public void setC_Order_UU (String C_Order_UU)
+	{
+		set_Value (COLUMNNAME_C_Order_UU, C_Order_UU);
+	}
+
+	/** Get C_Order_UU.
+		@return C_Order_UU	  */
+	public String getC_Order_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_C_Order_UU);
+	}
+
 	public org.compiere.model.I_C_OrderSource getC_OrderSource() throws RuntimeException
     {
 		return (org.compiere.model.I_C_OrderSource)MTable.get(getCtx(), org.compiere.model.I_C_OrderSource.Table_Name)
@@ -690,20 +667,6 @@ public class X_C_Order extends PO implements I_C_Order, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set C_Order_UU.
-		@param C_Order_UU C_Order_UU	  */
-	public void setC_Order_UU (String C_Order_UU)
-	{
-		set_Value (COLUMNNAME_C_Order_UU, C_Order_UU);
-	}
-
-	/** Get C_Order_UU.
-		@return C_Order_UU	  */
-	public String getC_Order_UU () 
-	{
-		return (String)get_Value(COLUMNNAME_C_Order_UU);
-	}
-
 	public org.compiere.model.I_C_Payment getC_Payment() throws RuntimeException
     {
 		return (org.compiere.model.I_C_Payment)MTable.get(getCtx(), org.compiere.model.I_C_Payment.Table_Name)
@@ -816,6 +779,43 @@ public class X_C_Order extends PO implements I_C_Order, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Charge amount.
+		@param ChargeAmt 
+		Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt)
+	{
+		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
+	}
+
+	/** Get Charge amount.
+		@return Charge Amount
+	  */
+	public BigDecimal getChargeAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Copy From.
+		@param CopyFrom 
+		Copy From Record
+	  */
+	public void setCopyFrom (String CopyFrom)
+	{
+		set_Value (COLUMNNAME_CopyFrom, CopyFrom);
+	}
+
+	/** Get Copy From.
+		@return Copy From Record
+	  */
+	public String getCopyFrom () 
+	{
+		return (String)get_Value(COLUMNNAME_CopyFrom);
+	}
+
 	/** Set Account Date.
 		@param DateAcct 
 		Accounting Date
@@ -2032,6 +2032,20 @@ public class X_C_Order extends PO implements I_C_Order, I_Persistent
 		return false;
 	}
 
+	/** Set Rate Inquiry.
+		@param ShippingRateInquiry Rate Inquiry	  */
+	public void setShippingRateInquiry (String ShippingRateInquiry)
+	{
+		set_Value (COLUMNNAME_ShippingRateInquiry, ShippingRateInquiry);
+	}
+
+	/** Get Rate Inquiry.
+		@return Rate Inquiry	  */
+	public String getShippingRateInquiry () 
+	{
+		return (String)get_Value(COLUMNNAME_ShippingRateInquiry);
+	}
+
 	/** Set Total Lines.
 		@param TotalLines 
 		Total of all document lines

org.adempiere.base/src/org/compiere/model/X_M_InOut.java

@@ -33,7 +33,7 @@ public class X_M_InOut extends PO implements I_M_InOut, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121031L;
+	private static final long serialVersionUID = 20121212L;
 
     /** Standard Constructor */
     public X_M_InOut (Properties ctx, int M_InOut_ID, String trxName)
@@ -57,6 +57,8 @@ public class X_M_InOut extends PO implements I_M_InOut, I_Persistent
 			setDocumentNo (null);
 			setFreightCostRule (null);
 // I
+			setIsAlternateReturnAddress (false);
+// N
 			setIsApproved (false);
 			setIsInDispute (false);
 			setIsInTransit (false);
@@ -64,10 +66,10 @@ public class X_M_InOut extends PO implements I_M_InOut, I_Persistent
 			setIsSOTrx (false);
 // @IsSOTrx@
 			setM_InOut_ID (0);
+			setM_Warehouse_ID (0);
 			setMovementDate (new Timestamp( System.currentTimeMillis() ));
 // @#Date@
 			setMovementType (null);
-			setM_Warehouse_ID (0);
 			setPosted (false);
 			setPriorityRule (null);
 // 5
@@ -323,26 +325,6 @@ public class X_M_InOut extends PO implements I_M_InOut, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Charge amount.
-		@param ChargeAmt 
-		Charge Amount
-	  */
-	public void setChargeAmt (BigDecimal ChargeAmt)
-	{
-		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
-	}
-
-	/** Get Charge amount.
-		@return Charge Amount
-	  */
-	public BigDecimal getChargeAmt () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	public org.compiere.model.I_C_Invoice getC_Invoice() throws RuntimeException
     {
 		return (org.compiere.model.I_C_Invoice)MTable.get(getCtx(), org.compiere.model.I_C_Invoice.Table_Name)
@@ -427,6 +409,26 @@ public class X_M_InOut extends PO implements I_M_InOut, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Charge amount.
+		@param ChargeAmt 
+		Charge Amount
+	  */
+	public void setChargeAmt (BigDecimal ChargeAmt)
+	{
+		set_Value (COLUMNNAME_ChargeAmt, ChargeAmt);
+	}
+
+	/** Get Charge amount.
+		@return Charge Amount
+	  */
+	public BigDecimal getChargeAmt () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_ChargeAmt);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	/** Set Create Confirm.
 		@param CreateConfirm Create Confirm	  */
 	public void setCreateConfirm (String CreateConfirm)
@@ -816,6 +818,55 @@ public class X_M_InOut extends PO implements I_M_InOut, I_Persistent
 		return ii.intValue();
 	}
 
+	/** FOB AD_Reference_ID=200030 */
+	public static final int FOB_AD_Reference_ID=200030;
+	/** FOB Origin = A_DFOBO */
+	public static final String FOB_FOBOrigin = "A_DFOBO";
+	/** Ex Works = B_EXW */
+	public static final String FOB_ExWorks = "B_EXW";
+	/** CFR - Cost and Freight = CFR */
+	public static final String FOB_CFR_CostAndFreight = "CFR";
+	/** CIF - Cost, Insurance, and Freight (FedEx) = CIF */
+	public static final String FOB_CIF_CostInsuranceAndFreightFedEx = "CIF";
+	/** CIP - Carriage and Insurance Paid To (FedEx) = CIP */
+	public static final String FOB_CIP_CarriageAndInsurancePaidToFedEx = "CIP";
+	/** CPT - Carriage Paid To = CPT */
+	public static final String FOB_CPT_CarriagePaidTo = "CPT";
+	/** DAF - Delivered at Frontier = DAF */
+	public static final String FOB_DAF_DeliveredAtFrontier = "DAF";
+	/** DDP - Delivered Duty Paid (FedEx) = DDP */
+	public static final String FOB_DDP_DeliveredDutyPaidFedEx = "DDP";
+	/** DDU - Delivered Duty Unpaid (FedEx) = DDU */
+	public static final String FOB_DDU_DeliveredDutyUnpaidFedEx = "DDU";
+	/** DEQ - Delivered Ex Quay = DEQ */
+	public static final String FOB_DEQ_DeliveredExQuay = "DEQ";
+	/** DES - Delivered Ex Ship = DES */
+	public static final String FOB_DES_DeliveredExShip = "DES";
+	/** Domestic FOB Destination = DFOBD */
+	public static final String FOB_DomesticFOBDestination = "DFOBD";
+	/** EXW - Ex Works (FedEx) = EXW */
+	public static final String FOB_EXW_ExWorksFedEx = "EXW";
+	/** FAS - Free Alongside Ship = FAS */
+	public static final String FOB_FAS_FreeAlongsideShip = "FAS";
+	/** FCA - Free Carrier (FedEx) = FCA */
+	public static final String FOB_FCA_FreeCarrierFedEx = "FCA";
+	/** FOB - Free on Board (FedEx) = FOB */
+	public static final String FOB_FOB_FreeOnBoardFedEx = "FOB";
+	/** Set Freight Terms.
+		@param FOB Freight Terms	  */
+	public void setFOB (String FOB)
+	{
+
+		set_Value (COLUMNNAME_FOB, FOB);
+	}
+
+	/** Get Freight Terms.
+		@return Freight Terms	  */
+	public String getFOB () 
+	{
+		return (String)get_Value(COLUMNNAME_FOB);
+	}
+
 	/** Set Freight Amount.
 		@param FreightAmt 
 		Freight Amount 
@@ -836,6 +887,33 @@ public class X_M_InOut extends PO implements I_M_InOut, I_Persistent
 		return bd;
 	}
 
+	/** FreightCharges AD_Reference_ID=200028 */
+	public static final int FREIGHTCHARGES_AD_Reference_ID=200028;
+	/** Collect = A_Col */
+	public static final String FREIGHTCHARGES_Collect = "A_Col";
+	/** 3rd Party = B_3P */
+	public static final String FREIGHTCHARGES_3rdParty = "B_3P";
+	/** Consignee = C_Con */
+	public static final String FREIGHTCHARGES_Consignee = "C_Con";
+	/** Prepaid = D_PP */
+	public static final String FREIGHTCHARGES_Prepaid = "D_PP";
+	/** Prepaid and Bill = E_PPB */
+	public static final String FREIGHTCHARGES_PrepaidAndBill = "E_PPB";
+	/** Set Freight Charges.
+		@param FreightCharges Freight Charges	  */
+	public void setFreightCharges (String FreightCharges)
+	{
+
+		set_Value (COLUMNNAME_FreightCharges, FreightCharges);
+	}
+
+	/** Get Freight Charges.
+		@return Freight Charges	  */
+	public String getFreightCharges () 
+	{
+		return (String)get_Value(COLUMNNAME_FreightCharges);
+	}
+
 	/** FreightCostRule AD_Reference_ID=153 */
 	public static final int FREIGHTCOSTRULE_AD_Reference_ID=153;
 	/** Freight included = I */
@@ -881,6 +959,48 @@ public class X_M_InOut extends PO implements I_M_InOut, I_Persistent
 		return (String)get_Value(COLUMNNAME_GenerateTo);
 	}
 
+	/** Insurance AD_Reference_ID=200029 */
+	public static final int INSURANCE_AD_Reference_ID=200029;
+	/** Insure = 1 */
+	public static final String INSURANCE_Insure = "1";
+	/** Do Not Insure = 2 */
+	public static final String INSURANCE_DoNotInsure = "2";
+	/** Set Insurance.
+		@param Insurance Insurance	  */
+	public void setInsurance (String Insurance)
+	{
+
+		set_Value (COLUMNNAME_Insurance, Insurance);
+	}
+
+	/** Get Insurance.
+		@return Insurance	  */
+	public String getInsurance () 
+	{
+		return (String)get_Value(COLUMNNAME_Insurance);
+	}
+
+	/** Set Alternate Return Address.
+		@param IsAlternateReturnAddress Alternate Return Address	  */
+	public void setIsAlternateReturnAddress (boolean IsAlternateReturnAddress)
+	{
+		set_Value (COLUMNNAME_IsAlternateReturnAddress, Boolean.valueOf(IsAlternateReturnAddress));
+	}
+
+	/** Get Alternate Return Address.
+		@return Alternate Return Address	  */
+	public boolean isAlternateReturnAddress () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsAlternateReturnAddress);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
 	/** Set Approved.
 		@param IsApproved 
 		Indicates if this document requires approval
@@ -1062,67 +1182,6 @@ public class X_M_InOut extends PO implements I_M_InOut, I_Persistent
 		return (String)get_Value(COLUMNNAME_M_InOut_UU);
 	}
 
-	/** Set Movement Date.
-		@param MovementDate 
-		Date a product was moved in or out of inventory
-	  */
-	public void setMovementDate (Timestamp MovementDate)
-	{
-		set_Value (COLUMNNAME_MovementDate, MovementDate);
-	}
-
-	/** Get Movement Date.
-		@return Date a product was moved in or out of inventory
-	  */
-	public Timestamp getMovementDate () 
-	{
-		return (Timestamp)get_Value(COLUMNNAME_MovementDate);
-	}
-
-	/** MovementType AD_Reference_ID=189 */
-	public static final int MOVEMENTTYPE_AD_Reference_ID=189;
-	/** Customer Shipment = C- */
-	public static final String MOVEMENTTYPE_CustomerShipment = "C-";
-	/** Customer Returns = C+ */
-	public static final String MOVEMENTTYPE_CustomerReturns = "C+";
-	/** Vendor Receipts = V+ */
-	public static final String MOVEMENTTYPE_VendorReceipts = "V+";
-	/** Vendor Returns = V- */
-	public static final String MOVEMENTTYPE_VendorReturns = "V-";
-	/** Inventory Out = I- */
-	public static final String MOVEMENTTYPE_InventoryOut = "I-";
-	/** Inventory In = I+ */
-	public static final String MOVEMENTTYPE_InventoryIn = "I+";
-	/** Movement From = M- */
-	public static final String MOVEMENTTYPE_MovementFrom = "M-";
-	/** Movement To = M+ */
-	public static final String MOVEMENTTYPE_MovementTo = "M+";
-	/** Production + = P+ */
-	public static final String MOVEMENTTYPE_ProductionPlus = "P+";
-	/** Production - = P- */
-	public static final String MOVEMENTTYPE_Production_ = "P-";
-	/** Work Order + = W+ */
-	public static final String MOVEMENTTYPE_WorkOrderPlus = "W+";
-	/** Work Order - = W- */
-	public static final String MOVEMENTTYPE_WorkOrder_ = "W-";
-	/** Set Movement Type.
-		@param MovementType 
-		Method of moving the inventory
-	  */
-	public void setMovementType (String MovementType)
-	{
-
-		set_ValueNoCheck (COLUMNNAME_MovementType, MovementType);
-	}
-
-	/** Get Movement Type.
-		@return Method of moving the inventory
-	  */
-	public String getMovementType () 
-	{
-		return (String)get_Value(COLUMNNAME_MovementType);
-	}
-
 	public org.compiere.model.I_M_RMA getM_RMA() throws RuntimeException
     {
 		return (org.compiere.model.I_M_RMA)MTable.get(getCtx(), org.compiere.model.I_M_RMA.Table_Name)
@@ -1207,6 +1266,67 @@ public class X_M_InOut extends PO implements I_M_InOut, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Movement Date.
+		@param MovementDate 
+		Date a product was moved in or out of inventory
+	  */
+	public void setMovementDate (Timestamp MovementDate)
+	{
+		set_Value (COLUMNNAME_MovementDate, MovementDate);
+	}
+
+	/** Get Movement Date.
+		@return Date a product was moved in or out of inventory
+	  */
+	public Timestamp getMovementDate () 
+	{
+		return (Timestamp)get_Value(COLUMNNAME_MovementDate);
+	}
+
+	/** MovementType AD_Reference_ID=189 */
+	public static final int MOVEMENTTYPE_AD_Reference_ID=189;
+	/** Customer Shipment = C- */
+	public static final String MOVEMENTTYPE_CustomerShipment = "C-";
+	/** Customer Returns = C+ */
+	public static final String MOVEMENTTYPE_CustomerReturns = "C+";
+	/** Vendor Receipts = V+ */
+	public static final String MOVEMENTTYPE_VendorReceipts = "V+";
+	/** Vendor Returns = V- */
+	public static final String MOVEMENTTYPE_VendorReturns = "V-";
+	/** Inventory Out = I- */
+	public static final String MOVEMENTTYPE_InventoryOut = "I-";
+	/** Inventory In = I+ */
+	public static final String MOVEMENTTYPE_InventoryIn = "I+";
+	/** Movement From = M- */
+	public static final String MOVEMENTTYPE_MovementFrom = "M-";
+	/** Movement To = M+ */
+	public static final String MOVEMENTTYPE_MovementTo = "M+";
+	/** Production + = P+ */
+	public static final String MOVEMENTTYPE_ProductionPlus = "P+";
+	/** Production - = P- */
+	public static final String MOVEMENTTYPE_Production_ = "P-";
+	/** Work Order + = W+ */
+	public static final String MOVEMENTTYPE_WorkOrderPlus = "W+";
+	/** Work Order - = W- */
+	public static final String MOVEMENTTYPE_WorkOrder_ = "W-";
+	/** Set Movement Type.
+		@param MovementType 
+		Method of moving the inventory
+	  */
+	public void setMovementType (String MovementType)
+	{
+
+		set_ValueNoCheck (COLUMNNAME_MovementType, MovementType);
+	}
+
+	/** Get Movement Type.
+		@return Method of moving the inventory
+	  */
+	public String getMovementType () 
+	{
+		return (String)get_Value(COLUMNNAME_MovementType);
+	}
+
 	/** Set No Packages.
 		@param NoPackages 
 		Number of packages shipped
@@ -1400,6 +1520,81 @@ public class X_M_InOut extends PO implements I_M_InOut, I_Persistent
 		return ii.intValue();
 	}
 
+	public org.compiere.model.I_C_BPartner getReturnBPartner() throws RuntimeException
+    {
+		return (org.compiere.model.I_C_BPartner)MTable.get(getCtx(), org.compiere.model.I_C_BPartner.Table_Name)
+			.getPO(getReturnBPartner_ID(), get_TrxName());	}
+
+	/** Set Return Partner.
+		@param ReturnBPartner_ID Return Partner	  */
+	public void setReturnBPartner_ID (int ReturnBPartner_ID)
+	{
+		if (ReturnBPartner_ID < 1) 
+			set_Value (COLUMNNAME_ReturnBPartner_ID, null);
+		else 
+			set_Value (COLUMNNAME_ReturnBPartner_ID, Integer.valueOf(ReturnBPartner_ID));
+	}
+
+	/** Get Return Partner.
+		@return Return Partner	  */
+	public int getReturnBPartner_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_ReturnBPartner_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public org.compiere.model.I_C_BPartner_Location getReturnLocation() throws RuntimeException
+    {
+		return (org.compiere.model.I_C_BPartner_Location)MTable.get(getCtx(), org.compiere.model.I_C_BPartner_Location.Table_Name)
+			.getPO(getReturnLocation_ID(), get_TrxName());	}
+
+	/** Set Return Location.
+		@param ReturnLocation_ID Return Location	  */
+	public void setReturnLocation_ID (int ReturnLocation_ID)
+	{
+		if (ReturnLocation_ID < 1) 
+			set_Value (COLUMNNAME_ReturnLocation_ID, null);
+		else 
+			set_Value (COLUMNNAME_ReturnLocation_ID, Integer.valueOf(ReturnLocation_ID));
+	}
+
+	/** Get Return Location.
+		@return Return Location	  */
+	public int getReturnLocation_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_ReturnLocation_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public org.compiere.model.I_AD_User getReturnUser() throws RuntimeException
+    {
+		return (org.compiere.model.I_AD_User)MTable.get(getCtx(), org.compiere.model.I_AD_User.Table_Name)
+			.getPO(getReturnUser_ID(), get_TrxName());	}
+
+	/** Set Return User/Contact.
+		@param ReturnUser_ID Return User/Contact	  */
+	public void setReturnUser_ID (int ReturnUser_ID)
+	{
+		if (ReturnUser_ID < 1) 
+			set_Value (COLUMNNAME_ReturnUser_ID, null);
+		else 
+			set_Value (COLUMNNAME_ReturnUser_ID, Integer.valueOf(ReturnUser_ID));
+	}
+
+	/** Get Return User/Contact.
+		@return Return User/Contact	  */
+	public int getReturnUser_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_ReturnUser_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public org.compiere.model.I_M_InOut getReversal() throws RuntimeException
     {
 		return (org.compiere.model.I_M_InOut)MTable.get(getCtx(), org.compiere.model.I_M_InOut.Table_Name)
@@ -1497,6 +1692,20 @@ public class X_M_InOut extends PO implements I_M_InOut, I_Persistent
 		return (Timestamp)get_Value(COLUMNNAME_ShipDate);
 	}
 
+	/** Set Shipper Account Number.
+		@param ShipperAccount Shipper Account Number	  */
+	public void setShipperAccount (String ShipperAccount)
+	{
+		set_Value (COLUMNNAME_ShipperAccount, ShipperAccount);
+	}
+
+	/** Get Shipper Account Number.
+		@return Shipper Account Number	  */
+	public String getShipperAccount () 
+	{
+		return (String)get_Value(COLUMNNAME_ShipperAccount);
+	}
+
 	/** Set Tracking No.
 		@param TrackingNo 
 		Number to track the shipment

org.adempiere.base/src/org/compiere/model/X_M_PackageLine.java

@@ -32,7 +32,7 @@ public class X_M_PackageLine extends PO implements I_M_PackageLine, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121031L;
+	private static final long serialVersionUID = 20121207L;
 
     /** Standard Constructor */
     public X_M_PackageLine (Properties ctx, int M_PackageLine_ID, String trxName)
@@ -193,6 +193,59 @@ public class X_M_PackageLine extends PO implements I_M_PackageLine, I_Persistent
 		return (String)get_Value(COLUMNNAME_M_PackageLine_UU);
 	}
 
+	public org.compiere.model.I_M_PackageMPS getM_PackageMPS() throws RuntimeException
+    {
+		return (org.compiere.model.I_M_PackageMPS)MTable.get(getCtx(), org.compiere.model.I_M_PackageMPS.Table_Name)
+			.getPO(getM_PackageMPS_ID(), get_TrxName());	}
+
+	/** Set Package MPS.
+		@param M_PackageMPS_ID Package MPS	  */
+	public void setM_PackageMPS_ID (int M_PackageMPS_ID)
+	{
+		if (M_PackageMPS_ID < 1) 
+			set_Value (COLUMNNAME_M_PackageMPS_ID, null);
+		else 
+			set_Value (COLUMNNAME_M_PackageMPS_ID, Integer.valueOf(M_PackageMPS_ID));
+	}
+
+	/** Get Package MPS.
+		@return Package MPS	  */
+	public int getM_PackageMPS_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_PackageMPS_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public org.compiere.model.I_M_Product getM_Product() throws RuntimeException
+    {
+		return (org.compiere.model.I_M_Product)MTable.get(getCtx(), org.compiere.model.I_M_Product.Table_Name)
+			.getPO(getM_Product_ID(), get_TrxName());	}
+
+	/** Set Product.
+		@param M_Product_ID 
+		Product, Service, Item
+	  */
+	public void setM_Product_ID (int M_Product_ID)
+	{
+		if (M_Product_ID < 1) 
+			set_Value (COLUMNNAME_M_Product_ID, null);
+		else 
+			set_Value (COLUMNNAME_M_Product_ID, Integer.valueOf(M_Product_ID));
+	}
+
+	/** Get Product.
+		@return Product, Service, Item
+	  */
+	public int getM_Product_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_Product_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Quantity.
 		@param Qty 
 		Quantity

org.adempiere.base/src/org/compiere/model/X_M_PackageMPS.java

@@ -0,0 +1,419 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+/** Generated Model - DO NOT CHANGE */
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.Properties;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Model for M_PackageMPS
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a - $Id$ */
+public class X_M_PackageMPS extends PO implements I_M_PackageMPS, I_Persistent 
+{
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 20121207L;
+
+    /** Standard Constructor */
+    public X_M_PackageMPS (Properties ctx, int M_PackageMPS_ID, String trxName)
+    {
+      super (ctx, M_PackageMPS_ID, trxName);
+      /** if (M_PackageMPS_ID == 0)
+        {
+			setM_Package_ID (0);
+			setM_PackageMPS_ID (0);
+			setProcessed (false);
+// N
+        } */
+    }
+
+    /** Load Constructor */
+    public X_M_PackageMPS (Properties ctx, ResultSet rs, String trxName)
+    {
+      super (ctx, rs, trxName);
+    }
+
+    /** AccessLevel
+      * @return 3 - Client - Org 
+      */
+    protected int get_AccessLevel()
+    {
+      return accessLevel.intValue();
+    }
+
+    /** Load Meta Data */
+    protected POInfo initPO (Properties ctx)
+    {
+      POInfo poi = POInfo.getPOInfo (ctx, Table_ID, get_TrxName());
+      return poi;
+    }
+
+    public String toString()
+    {
+      StringBuffer sb = new StringBuffer ("X_M_PackageMPS[")
+        .append(get_ID()).append("]");
+      return sb.toString();
+    }
+
+	public org.compiere.model.I_C_UOM getC_UOM_Length() throws RuntimeException
+    {
+		return (org.compiere.model.I_C_UOM)MTable.get(getCtx(), org.compiere.model.I_C_UOM.Table_Name)
+			.getPO(getC_UOM_Length_ID(), get_TrxName());	}
+
+	/** Set UOM for Length.
+		@param C_UOM_Length_ID 
+		Standard Unit of Measure for Length
+	  */
+	public void setC_UOM_Length_ID (int C_UOM_Length_ID)
+	{
+		if (C_UOM_Length_ID < 1) 
+			set_Value (COLUMNNAME_C_UOM_Length_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_UOM_Length_ID, Integer.valueOf(C_UOM_Length_ID));
+	}
+
+	/** Get UOM for Length.
+		@return Standard Unit of Measure for Length
+	  */
+	public int getC_UOM_Length_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_UOM_Length_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public org.compiere.model.I_C_UOM getC_UOM_Weight() throws RuntimeException
+    {
+		return (org.compiere.model.I_C_UOM)MTable.get(getCtx(), org.compiere.model.I_C_UOM.Table_Name)
+			.getPO(getC_UOM_Weight_ID(), get_TrxName());	}
+
+	/** Set UOM for Weight.
+		@param C_UOM_Weight_ID 
+		Standard Unit of Measure for Weight
+	  */
+	public void setC_UOM_Weight_ID (int C_UOM_Weight_ID)
+	{
+		if (C_UOM_Weight_ID < 1) 
+			set_Value (COLUMNNAME_C_UOM_Weight_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_UOM_Weight_ID, Integer.valueOf(C_UOM_Weight_ID));
+	}
+
+	/** Get UOM for Weight.
+		@return Standard Unit of Measure for Weight
+	  */
+	public int getC_UOM_Weight_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_UOM_Weight_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Create lines from.
+		@param CreateFrom 
+		Process which will generate a new document lines based on an existing document
+	  */
+	public void setCreateFrom (String CreateFrom)
+	{
+		set_Value (COLUMNNAME_CreateFrom, CreateFrom);
+	}
+
+	/** Get Create lines from.
+		@return Process which will generate a new document lines based on an existing document
+	  */
+	public String getCreateFrom () 
+	{
+		return (String)get_Value(COLUMNNAME_CreateFrom);
+	}
+
+	/** Set Description.
+		@param Description 
+		Optional short description of the record
+	  */
+	public void setDescription (String Description)
+	{
+		set_Value (COLUMNNAME_Description, Description);
+	}
+
+	/** Get Description.
+		@return Optional short description of the record
+	  */
+	public String getDescription () 
+	{
+		return (String)get_Value(COLUMNNAME_Description);
+	}
+
+	/** Set Estimated Weight.
+		@param EstimatedWeight Estimated Weight	  */
+	public void setEstimatedWeight (BigDecimal EstimatedWeight)
+	{
+		throw new IllegalArgumentException ("EstimatedWeight is virtual column");	}
+
+	/** Get Estimated Weight.
+		@return Estimated Weight	  */
+	public BigDecimal getEstimatedWeight () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_EstimatedWeight);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Height.
+		@param Height Height	  */
+	public void setHeight (BigDecimal Height)
+	{
+		set_Value (COLUMNNAME_Height, Height);
+	}
+
+	/** Get Height.
+		@return Height	  */
+	public BigDecimal getHeight () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Height);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Length.
+		@param Length Length	  */
+	public void setLength (BigDecimal Length)
+	{
+		set_Value (COLUMNNAME_Length, Length);
+	}
+
+	/** Get Length.
+		@return Length	  */
+	public BigDecimal getLength () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Length);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	public org.compiere.model.I_M_Package getM_Package() throws RuntimeException
+    {
+		return (org.compiere.model.I_M_Package)MTable.get(getCtx(), org.compiere.model.I_M_Package.Table_Name)
+			.getPO(getM_Package_ID(), get_TrxName());	}
+
+	/** Set Package.
+		@param M_Package_ID 
+		Shipment Package
+	  */
+	public void setM_Package_ID (int M_Package_ID)
+	{
+		if (M_Package_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_Package_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_Package_ID, Integer.valueOf(M_Package_ID));
+	}
+
+	/** Get Package.
+		@return Shipment Package
+	  */
+	public int getM_Package_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_Package_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+    /** Get Record ID/ColumnName
+        @return ID/ColumnName pair
+      */
+    public KeyNamePair getKeyNamePair() 
+    {
+        return new KeyNamePair(get_ID(), String.valueOf(getM_Package_ID()));
+    }
+
+	/** Set Package MPS.
+		@param M_PackageMPS_ID Package MPS	  */
+	public void setM_PackageMPS_ID (int M_PackageMPS_ID)
+	{
+		if (M_PackageMPS_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_PackageMPS_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_PackageMPS_ID, Integer.valueOf(M_PackageMPS_ID));
+	}
+
+	/** Get Package MPS.
+		@return Package MPS	  */
+	public int getM_PackageMPS_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_PackageMPS_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set M_PackageMPS_UU.
+		@param M_PackageMPS_UU M_PackageMPS_UU	  */
+	public void setM_PackageMPS_UU (String M_PackageMPS_UU)
+	{
+		set_Value (COLUMNNAME_M_PackageMPS_UU, M_PackageMPS_UU);
+	}
+
+	/** Get M_PackageMPS_UU.
+		@return M_PackageMPS_UU	  */
+	public String getM_PackageMPS_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_M_PackageMPS_UU);
+	}
+
+	/** Set Master Tracking No.
+		@param MasterTrackingNo Master Tracking No	  */
+	public void setMasterTrackingNo (String MasterTrackingNo)
+	{
+		set_Value (COLUMNNAME_MasterTrackingNo, MasterTrackingNo);
+	}
+
+	/** Get Master Tracking No.
+		@return Master Tracking No	  */
+	public String getMasterTrackingNo () 
+	{
+		return (String)get_Value(COLUMNNAME_MasterTrackingNo);
+	}
+
+	/** Set Price.
+		@param Price 
+		Price
+	  */
+	public void setPrice (BigDecimal Price)
+	{
+		set_Value (COLUMNNAME_Price, Price);
+	}
+
+	/** Get Price.
+		@return Price
+	  */
+	public BigDecimal getPrice () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Price);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Processed.
+		@param Processed 
+		The document has been processed
+	  */
+	public void setProcessed (boolean Processed)
+	{
+		set_Value (COLUMNNAME_Processed, Boolean.valueOf(Processed));
+	}
+
+	/** Get Processed.
+		@return The document has been processed
+	  */
+	public boolean isProcessed () 
+	{
+		Object oo = get_Value(COLUMNNAME_Processed);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** Set Sequence.
+		@param SeqNo 
+		Method of ordering records; lowest number comes first
+	  */
+	public void setSeqNo (int SeqNo)
+	{
+		set_Value (COLUMNNAME_SeqNo, Integer.valueOf(SeqNo));
+	}
+
+	/** Get Sequence.
+		@return Method of ordering records; lowest number comes first
+	  */
+	public int getSeqNo () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_SeqNo);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Tracking No.
+		@param TrackingNo 
+		Number to track the shipment
+	  */
+	public void setTrackingNo (String TrackingNo)
+	{
+		set_Value (COLUMNNAME_TrackingNo, TrackingNo);
+	}
+
+	/** Get Tracking No.
+		@return Number to track the shipment
+	  */
+	public String getTrackingNo () 
+	{
+		return (String)get_Value(COLUMNNAME_TrackingNo);
+	}
+
+	/** Set Weight.
+		@param Weight 
+		Weight of a product
+	  */
+	public void setWeight (BigDecimal Weight)
+	{
+		set_Value (COLUMNNAME_Weight, Weight);
+	}
+
+	/** Get Weight.
+		@return Weight of a product
+	  */
+	public BigDecimal getWeight () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Weight);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Width.
+		@param Width Width	  */
+	public void setWidth (BigDecimal Width)
+	{
+		set_Value (COLUMNNAME_Width, Width);
+	}
+
+	/** Get Width.
+		@return Width	  */
+	public BigDecimal getWidth () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Width);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+}

org.adempiere.base/src/org/compiere/model/X_M_Product.java

@@ -33,7 +33,7 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121031L;
+	private static final long serialVersionUID = 20121210L;
 
     /** Standard Constructor */
     public X_M_Product (Properties ctx, int M_Product_ID, String trxName)
@@ -52,6 +52,8 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent
 			setIsKanban (false);
 // N
 			setIsManufactured (false);
+// N
+			setIsOwnBox (false);
 // N
 			setIsPhantom (false);
 // N
@@ -108,59 +110,6 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent
       return sb.toString();
     }
 
-	/** Set Classification.
-		@param Classification 
-		Classification for grouping
-	  */
-	public void setClassification (String Classification)
-	{
-		set_Value (COLUMNNAME_Classification, Classification);
-	}
-
-	/** Get Classification.
-		@return Classification for grouping
-	  */
-	public String getClassification () 
-	{
-		return (String)get_Value(COLUMNNAME_Classification);
-	}
-
-	/** Set Copy From.
-		@param CopyFrom 
-		Copy From Record
-	  */
-	public void setCopyFrom (String CopyFrom)
-	{
-		set_Value (COLUMNNAME_CopyFrom, CopyFrom);
-	}
-
-	/** Get Copy From.
-		@return Copy From Record
-	  */
-	public String getCopyFrom () 
-	{
-		return (String)get_Value(COLUMNNAME_CopyFrom);
-	}
-
-	/** Set Standard Cost.
-		@param CostStandard 
-		Standard Costs
-	  */
-	public void setCostStandard (BigDecimal CostStandard)
-	{
-		throw new IllegalArgumentException ("CostStandard is virtual column");	}
-
-	/** Get Standard Cost.
-		@return Standard Costs
-	  */
-	public BigDecimal getCostStandard () 
-	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CostStandard);
-		if (bd == null)
-			 return Env.ZERO;
-		return bd;
-	}
-
 	public org.compiere.model.I_C_RevenueRecognition getC_RevenueRecognition() throws RuntimeException
     {
 		return (org.compiere.model.I_C_RevenueRecognition)MTable.get(getCtx(), org.compiere.model.I_C_RevenueRecognition.Table_Name)
@@ -273,6 +222,59 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Classification.
+		@param Classification 
+		Classification for grouping
+	  */
+	public void setClassification (String Classification)
+	{
+		set_Value (COLUMNNAME_Classification, Classification);
+	}
+
+	/** Get Classification.
+		@return Classification for grouping
+	  */
+	public String getClassification () 
+	{
+		return (String)get_Value(COLUMNNAME_Classification);
+	}
+
+	/** Set Copy From.
+		@param CopyFrom 
+		Copy From Record
+	  */
+	public void setCopyFrom (String CopyFrom)
+	{
+		set_Value (COLUMNNAME_CopyFrom, CopyFrom);
+	}
+
+	/** Get Copy From.
+		@return Copy From Record
+	  */
+	public String getCopyFrom () 
+	{
+		return (String)get_Value(COLUMNNAME_CopyFrom);
+	}
+
+	/** Set Standard Cost.
+		@param CostStandard 
+		Standard Costs
+	  */
+	public void setCostStandard (BigDecimal CostStandard)
+	{
+		throw new IllegalArgumentException ("CostStandard is virtual column");	}
+
+	/** Get Standard Cost.
+		@return Standard Costs
+	  */
+	public BigDecimal getCostStandard () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CostStandard);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
 	/** Set Description.
 		@param Description 
 		Optional short description of the record
@@ -611,6 +613,27 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent
 		return false;
 	}
 
+	/** Set Own Box.
+		@param IsOwnBox Own Box	  */
+	public void setIsOwnBox (boolean IsOwnBox)
+	{
+		set_Value (COLUMNNAME_IsOwnBox, Boolean.valueOf(IsOwnBox));
+	}
+
+	/** Get Own Box.
+		@return Own Box	  */
+	public boolean isOwnBox () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsOwnBox);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
 	/** Set Phantom.
 		@param IsPhantom 
 		Phantom Component
@@ -1147,34 +1170,6 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_AD_User getSalesRep() throws RuntimeException
-    {
-		return (org.compiere.model.I_AD_User)MTable.get(getCtx(), org.compiere.model.I_AD_User.Table_Name)
-			.getPO(getSalesRep_ID(), get_TrxName());	}
-
-	/** Set Sales Representative.
-		@param SalesRep_ID 
-		Sales Representative or Company Agent
-	  */
-	public void setSalesRep_ID (int SalesRep_ID)
-	{
-		if (SalesRep_ID < 1) 
-			set_Value (COLUMNNAME_SalesRep_ID, null);
-		else 
-			set_Value (COLUMNNAME_SalesRep_ID, Integer.valueOf(SalesRep_ID));
-	}
-
-	/** Get Sales Representative.
-		@return Sales Representative or Company Agent
-	  */
-	public int getSalesRep_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_SalesRep_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public org.compiere.model.I_S_ExpenseType getS_ExpenseType() throws RuntimeException
     {
 		return (org.compiere.model.I_S_ExpenseType)MTable.get(getCtx(), org.compiere.model.I_S_ExpenseType.Table_Name)
@@ -1203,6 +1198,62 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent
 		return ii.intValue();
 	}
 
+	public org.compiere.model.I_S_Resource getS_Resource() throws RuntimeException
+    {
+		return (org.compiere.model.I_S_Resource)MTable.get(getCtx(), org.compiere.model.I_S_Resource.Table_Name)
+			.getPO(getS_Resource_ID(), get_TrxName());	}
+
+	/** Set Resource.
+		@param S_Resource_ID 
+		Resource
+	  */
+	public void setS_Resource_ID (int S_Resource_ID)
+	{
+		if (S_Resource_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_S_Resource_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_S_Resource_ID, Integer.valueOf(S_Resource_ID));
+	}
+
+	/** Get Resource.
+		@return Resource
+	  */
+	public int getS_Resource_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_S_Resource_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public org.compiere.model.I_AD_User getSalesRep() throws RuntimeException
+    {
+		return (org.compiere.model.I_AD_User)MTable.get(getCtx(), org.compiere.model.I_AD_User.Table_Name)
+			.getPO(getSalesRep_ID(), get_TrxName());	}
+
+	/** Set Sales Representative.
+		@param SalesRep_ID 
+		Sales Representative or Company Agent
+	  */
+	public void setSalesRep_ID (int SalesRep_ID)
+	{
+		if (SalesRep_ID < 1) 
+			set_Value (COLUMNNAME_SalesRep_ID, null);
+		else 
+			set_Value (COLUMNNAME_SalesRep_ID, Integer.valueOf(SalesRep_ID));
+	}
+
+	/** Get Sales Representative.
+		@return Sales Representative or Company Agent
+	  */
+	public int getSalesRep_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_SalesRep_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Shelf Depth.
 		@param ShelfDepth 
 		Shelf depth required
@@ -1280,34 +1331,6 @@ public class X_M_Product extends PO implements I_M_Product, I_Persistent
 		return (String)get_Value(COLUMNNAME_SKU);
 	}
 
-	public org.compiere.model.I_S_Resource getS_Resource() throws RuntimeException
-    {
-		return (org.compiere.model.I_S_Resource)MTable.get(getCtx(), org.compiere.model.I_S_Resource.Table_Name)
-			.getPO(getS_Resource_ID(), get_TrxName());	}
-
-	/** Set Resource.
-		@param S_Resource_ID 
-		Resource
-	  */
-	public void setS_Resource_ID (int S_Resource_ID)
-	{
-		if (S_Resource_ID < 1) 
-			set_ValueNoCheck (COLUMNNAME_S_Resource_ID, null);
-		else 
-			set_ValueNoCheck (COLUMNNAME_S_Resource_ID, Integer.valueOf(S_Resource_ID));
-	}
-
-	/** Get Resource.
-		@return Resource
-	  */
-	public int getS_Resource_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_S_Resource_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set UnitsPerPack.
 		@param UnitsPerPack 
 		The Units Per Pack indicates the no of units of a product packed together.

org.adempiere.base/src/org/compiere/model/X_M_Shipper.java

@@ -19,7 +19,6 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Shipper
  *  @author iDempiere (generated) 
@@ -30,7 +29,7 @@ public class X_M_Shipper extends PO implements I_M_Shipper, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121031L;
+	private static final long serialVersionUID = 20121213L;
 
     /** Standard Constructor */
     public X_M_Shipper (Properties ctx, int M_Shipper_ID, String trxName)
@@ -39,7 +38,6 @@ public class X_M_Shipper extends PO implements I_M_Shipper, I_Persistent
       /** if (M_Shipper_ID == 0)
         {
 			setM_Shipper_ID (0);
-			setName (null);
         } */
     }
 
@@ -99,23 +97,6 @@ public class X_M_Shipper extends PO implements I_M_Shipper, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Description.
-		@param Description 
-		Optional short description of the record
-	  */
-	public void setDescription (String Description)
-	{
-		set_Value (COLUMNNAME_Description, Description);
-	}
-
-	/** Get Description.
-		@return Optional short description of the record
-	  */
-	public String getDescription () 
-	{
-		return (String)get_Value(COLUMNNAME_Description);
-	}
-
 	/** Set Shipper.
 		@param M_Shipper_ID 
 		Method or manner of product delivery
@@ -153,45 +134,53 @@ public class X_M_Shipper extends PO implements I_M_Shipper, I_Persistent
 		return (String)get_Value(COLUMNNAME_M_Shipper_UU);
 	}
 
-	/** Set Name.
-		@param Name 
-		Alphanumeric identifier of the entity
-	  */
-	public void setName (String Name)
-	{
-		set_Value (COLUMNNAME_Name, Name);
-	}
-
-	/** Get Name.
-		@return Alphanumeric identifier of the entity
-	  */
-	public String getName () 
-	{
-		return (String)get_Value(COLUMNNAME_Name);
-	}
-
-    /** Get Record ID/ColumnName
-        @return ID/ColumnName pair
-      */
-    public KeyNamePair getKeyNamePair() 
+	public org.compiere.model.I_M_ShippingProcessor getM_ShippingProcessor() throws RuntimeException
     {
-        return new KeyNamePair(get_ID(), getName());
-    }
+		return (org.compiere.model.I_M_ShippingProcessor)MTable.get(getCtx(), org.compiere.model.I_M_ShippingProcessor.Table_Name)
+			.getPO(getM_ShippingProcessor_ID(), get_TrxName());	}
 
-	/** Set Tracking URL.
-		@param TrackingURL 
-		URL of the shipper to track shipments
-	  */
-	public void setTrackingURL (String TrackingURL)
+	/** Set Shipping Processor.
+		@param M_ShippingProcessor_ID Shipping Processor	  */
+	public void setM_ShippingProcessor_ID (int M_ShippingProcessor_ID)
 	{
-		set_Value (COLUMNNAME_TrackingURL, TrackingURL);
+		if (M_ShippingProcessor_ID < 1) 
+			set_Value (COLUMNNAME_M_ShippingProcessor_ID, null);
+		else 
+			set_Value (COLUMNNAME_M_ShippingProcessor_ID, Integer.valueOf(M_ShippingProcessor_ID));
 	}
 
-	/** Get Tracking URL.
-		@return URL of the shipper to track shipments
-	  */
-	public String getTrackingURL () 
+	/** Get Shipping Processor.
+		@return Shipping Processor	  */
+	public int getM_ShippingProcessor_ID () 
 	{
-		return (String)get_Value(COLUMNNAME_TrackingURL);
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_ShippingProcessor_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public org.compiere.model.I_X_Shipper getX_Shipper() throws RuntimeException
+    {
+		return (org.compiere.model.I_X_Shipper)MTable.get(getCtx(), org.compiere.model.I_X_Shipper.Table_Name)
+			.getPO(getX_Shipper_ID(), get_TrxName());	}
+
+	/** Set Shipper.
+		@param X_Shipper_ID Shipper	  */
+	public void setX_Shipper_ID (int X_Shipper_ID)
+	{
+		if (X_Shipper_ID < 1) 
+			set_Value (COLUMNNAME_X_Shipper_ID, null);
+		else 
+			set_Value (COLUMNNAME_X_Shipper_ID, Integer.valueOf(X_Shipper_ID));
+	}
+
+	/** Get Shipper.
+		@return Shipper	  */
+	public int getX_Shipper_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_X_Shipper_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
 	}
 }

org.adempiere.base/src/org/compiere/model/X_M_ShipperLabels.java

@@ -0,0 +1,209 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+/** Generated Model - DO NOT CHANGE */
+package org.compiere.model;
+
+import java.sql.ResultSet;
+import java.util.Properties;
+
+/** Generated Model for M_ShipperLabels
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a - $Id$ */
+public class X_M_ShipperLabels extends PO implements I_M_ShipperLabels, I_Persistent 
+{
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 20121213L;
+
+    /** Standard Constructor */
+    public X_M_ShipperLabels (Properties ctx, int M_ShipperLabels_ID, String trxName)
+    {
+      super (ctx, M_ShipperLabels_ID, trxName);
+      /** if (M_ShipperLabels_ID == 0)
+        {
+			setIsDefault (false);
+// N
+			setM_Shipper_ID (0);
+			setM_ShipperLabels_ID (0);
+			setX_ShipperLabels_ID (0);
+        } */
+    }
+
+    /** Load Constructor */
+    public X_M_ShipperLabels (Properties ctx, ResultSet rs, String trxName)
+    {
+      super (ctx, rs, trxName);
+    }
+
+    /** AccessLevel
+      * @return 3 - Client - Org 
+      */
+    protected int get_AccessLevel()
+    {
+      return accessLevel.intValue();
+    }
+
+    /** Load Meta Data */
+    protected POInfo initPO (Properties ctx)
+    {
+      POInfo poi = POInfo.getPOInfo (ctx, Table_ID, get_TrxName());
+      return poi;
+    }
+
+    public String toString()
+    {
+      StringBuffer sb = new StringBuffer ("X_M_ShipperLabels[")
+        .append(get_ID()).append("]");
+      return sb.toString();
+    }
+
+	/** Set Default.
+		@param IsDefault 
+		Default value
+	  */
+	public void setIsDefault (boolean IsDefault)
+	{
+		set_Value (COLUMNNAME_IsDefault, Boolean.valueOf(IsDefault));
+	}
+
+	/** Get Default.
+		@return Default value
+	  */
+	public boolean isDefault () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsDefault);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** LabelPrintMethod AD_Reference_ID=200027 */
+	public static final int LABELPRINTMETHOD_AD_Reference_ID=200027;
+	/** Eltron = E */
+	public static final String LABELPRINTMETHOD_Eltron = "E";
+	/** Image = I */
+	public static final String LABELPRINTMETHOD_Image = "I";
+	/** Zebra = Z */
+	public static final String LABELPRINTMETHOD_Zebra = "Z";
+	/** Set Label Print Method.
+		@param LabelPrintMethod Label Print Method	  */
+	public void setLabelPrintMethod (String LabelPrintMethod)
+	{
+
+		set_Value (COLUMNNAME_LabelPrintMethod, LabelPrintMethod);
+	}
+
+	/** Get Label Print Method.
+		@return Label Print Method	  */
+	public String getLabelPrintMethod () 
+	{
+		return (String)get_Value(COLUMNNAME_LabelPrintMethod);
+	}
+
+	public org.compiere.model.I_M_Shipper getM_Shipper() throws RuntimeException
+    {
+		return (org.compiere.model.I_M_Shipper)MTable.get(getCtx(), org.compiere.model.I_M_Shipper.Table_Name)
+			.getPO(getM_Shipper_ID(), get_TrxName());	}
+
+	/** Set Shipper.
+		@param M_Shipper_ID 
+		Method or manner of product delivery
+	  */
+	public void setM_Shipper_ID (int M_Shipper_ID)
+	{
+		if (M_Shipper_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_Shipper_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_Shipper_ID, Integer.valueOf(M_Shipper_ID));
+	}
+
+	/** Get Shipper.
+		@return Method or manner of product delivery
+	  */
+	public int getM_Shipper_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_Shipper_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Shipper Labels.
+		@param M_ShipperLabels_ID Shipper Labels	  */
+	public void setM_ShipperLabels_ID (int M_ShipperLabels_ID)
+	{
+		if (M_ShipperLabels_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_ShipperLabels_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_ShipperLabels_ID, Integer.valueOf(M_ShipperLabels_ID));
+	}
+
+	/** Get Shipper Labels.
+		@return Shipper Labels	  */
+	public int getM_ShipperLabels_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_ShipperLabels_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set M_ShipperLabels_UU.
+		@param M_ShipperLabels_UU M_ShipperLabels_UU	  */
+	public void setM_ShipperLabels_UU (String M_ShipperLabels_UU)
+	{
+		set_Value (COLUMNNAME_M_ShipperLabels_UU, M_ShipperLabels_UU);
+	}
+
+	/** Get M_ShipperLabels_UU.
+		@return M_ShipperLabels_UU	  */
+	public String getM_ShipperLabels_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_M_ShipperLabels_UU);
+	}
+
+	public org.compiere.model.I_X_ShipperLabels getX_ShipperLabels() throws RuntimeException
+    {
+		return (org.compiere.model.I_X_ShipperLabels)MTable.get(getCtx(), org.compiere.model.I_X_ShipperLabels.Table_Name)
+			.getPO(getX_ShipperLabels_ID(), get_TrxName());	}
+
+	/** Set Shipper Labels.
+		@param X_ShipperLabels_ID Shipper Labels	  */
+	public void setX_ShipperLabels_ID (int X_ShipperLabels_ID)
+	{
+		if (X_ShipperLabels_ID < 1) 
+			set_Value (COLUMNNAME_X_ShipperLabels_ID, null);
+		else 
+			set_Value (COLUMNNAME_X_ShipperLabels_ID, Integer.valueOf(X_ShipperLabels_ID));
+	}
+
+	/** Get Shipper Labels.
+		@return Shipper Labels	  */
+	public int getX_ShipperLabels_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_X_ShipperLabels_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+}

org.adempiere.base/src/org/compiere/model/X_M_ShipperPackaging.java

@@ -0,0 +1,208 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+/** Generated Model - DO NOT CHANGE */
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.Properties;
+import org.compiere.util.Env;
+
+/** Generated Model for M_ShipperPackaging
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a - $Id$ */
+public class X_M_ShipperPackaging extends PO implements I_M_ShipperPackaging, I_Persistent 
+{
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 20121213L;
+
+    /** Standard Constructor */
+    public X_M_ShipperPackaging (Properties ctx, int M_ShipperPackaging_ID, String trxName)
+    {
+      super (ctx, M_ShipperPackaging_ID, trxName);
+      /** if (M_ShipperPackaging_ID == 0)
+        {
+			setIsDefault (false);
+// N
+			setM_Shipper_ID (0);
+			setM_ShipperPackaging_ID (0);
+			setX_ShipperPackaging_ID (0);
+        } */
+    }
+
+    /** Load Constructor */
+    public X_M_ShipperPackaging (Properties ctx, ResultSet rs, String trxName)
+    {
+      super (ctx, rs, trxName);
+    }
+
+    /** AccessLevel
+      * @return 3 - Client - Org 
+      */
+    protected int get_AccessLevel()
+    {
+      return accessLevel.intValue();
+    }
+
+    /** Load Meta Data */
+    protected POInfo initPO (Properties ctx)
+    {
+      POInfo poi = POInfo.getPOInfo (ctx, Table_ID, get_TrxName());
+      return poi;
+    }
+
+    public String toString()
+    {
+      StringBuffer sb = new StringBuffer ("X_M_ShipperPackaging[")
+        .append(get_ID()).append("]");
+      return sb.toString();
+    }
+
+	/** Set Default.
+		@param IsDefault 
+		Default value
+	  */
+	public void setIsDefault (boolean IsDefault)
+	{
+		set_Value (COLUMNNAME_IsDefault, Boolean.valueOf(IsDefault));
+	}
+
+	/** Get Default.
+		@return Default value
+	  */
+	public boolean isDefault () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsDefault);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	public org.compiere.model.I_M_Shipper getM_Shipper() throws RuntimeException
+    {
+		return (org.compiere.model.I_M_Shipper)MTable.get(getCtx(), org.compiere.model.I_M_Shipper.Table_Name)
+			.getPO(getM_Shipper_ID(), get_TrxName());	}
+
+	/** Set Shipper.
+		@param M_Shipper_ID 
+		Method or manner of product delivery
+	  */
+	public void setM_Shipper_ID (int M_Shipper_ID)
+	{
+		if (M_Shipper_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_Shipper_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_Shipper_ID, Integer.valueOf(M_Shipper_ID));
+	}
+
+	/** Get Shipper.
+		@return Method or manner of product delivery
+	  */
+	public int getM_Shipper_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_Shipper_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Shipper Packaging.
+		@param M_ShipperPackaging_ID Shipper Packaging	  */
+	public void setM_ShipperPackaging_ID (int M_ShipperPackaging_ID)
+	{
+		if (M_ShipperPackaging_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_ShipperPackaging_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_ShipperPackaging_ID, Integer.valueOf(M_ShipperPackaging_ID));
+	}
+
+	/** Get Shipper Packaging.
+		@return Shipper Packaging	  */
+	public int getM_ShipperPackaging_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_ShipperPackaging_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set M_ShipperPackaging_UU.
+		@param M_ShipperPackaging_UU M_ShipperPackaging_UU	  */
+	public void setM_ShipperPackaging_UU (String M_ShipperPackaging_UU)
+	{
+		set_Value (COLUMNNAME_M_ShipperPackaging_UU, M_ShipperPackaging_UU);
+	}
+
+	/** Get M_ShipperPackaging_UU.
+		@return M_ShipperPackaging_UU	  */
+	public String getM_ShipperPackaging_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_M_ShipperPackaging_UU);
+	}
+
+	/** Set Weight.
+		@param Weight 
+		Weight of a product
+	  */
+	public void setWeight (BigDecimal Weight)
+	{
+		set_Value (COLUMNNAME_Weight, Weight);
+	}
+
+	/** Get Weight.
+		@return Weight of a product
+	  */
+	public BigDecimal getWeight () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Weight);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	public org.compiere.model.I_X_ShipperPackaging getX_ShipperPackaging() throws RuntimeException
+    {
+		return (org.compiere.model.I_X_ShipperPackaging)MTable.get(getCtx(), org.compiere.model.I_X_ShipperPackaging.Table_Name)
+			.getPO(getX_ShipperPackaging_ID(), get_TrxName());	}
+
+	/** Set Shipper Packaging.
+		@param X_ShipperPackaging_ID Shipper Packaging	  */
+	public void setX_ShipperPackaging_ID (int X_ShipperPackaging_ID)
+	{
+		if (X_ShipperPackaging_ID < 1) 
+			set_Value (COLUMNNAME_X_ShipperPackaging_ID, null);
+		else 
+			set_Value (COLUMNNAME_X_ShipperPackaging_ID, Integer.valueOf(X_ShipperPackaging_ID));
+	}
+
+	/** Get Shipper Packaging.
+		@return Shipper Packaging	  */
+	public int getX_ShipperPackaging_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_X_ShipperPackaging_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+}

org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypes.java

@@ -0,0 +1,186 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+/** Generated Model - DO NOT CHANGE */
+package org.compiere.model;
+
+import java.sql.ResultSet;
+import java.util.Properties;
+
+/** Generated Model for M_ShipperPickupTypes
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a - $Id$ */
+public class X_M_ShipperPickupTypes extends PO implements I_M_ShipperPickupTypes, I_Persistent 
+{
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 20121213L;
+
+    /** Standard Constructor */
+    public X_M_ShipperPickupTypes (Properties ctx, int M_ShipperPickupTypes_ID, String trxName)
+    {
+      super (ctx, M_ShipperPickupTypes_ID, trxName);
+      /** if (M_ShipperPickupTypes_ID == 0)
+        {
+			setIsDefault (false);
+// N
+			setM_Shipper_ID (0);
+			setM_ShipperPickupTypes_ID (0);
+			setX_ShipperPickupTypes_ID (0);
+        } */
+    }
+
+    /** Load Constructor */
+    public X_M_ShipperPickupTypes (Properties ctx, ResultSet rs, String trxName)
+    {
+      super (ctx, rs, trxName);
+    }
+
+    /** AccessLevel
+      * @return 3 - Client - Org 
+      */
+    protected int get_AccessLevel()
+    {
+      return accessLevel.intValue();
+    }
+
+    /** Load Meta Data */
+    protected POInfo initPO (Properties ctx)
+    {
+      POInfo poi = POInfo.getPOInfo (ctx, Table_ID, get_TrxName());
+      return poi;
+    }
+
+    public String toString()
+    {
+      StringBuffer sb = new StringBuffer ("X_M_ShipperPickupTypes[")
+        .append(get_ID()).append("]");
+      return sb.toString();
+    }
+
+	/** Set Default.
+		@param IsDefault 
+		Default value
+	  */
+	public void setIsDefault (boolean IsDefault)
+	{
+		set_Value (COLUMNNAME_IsDefault, Boolean.valueOf(IsDefault));
+	}
+
+	/** Get Default.
+		@return Default value
+	  */
+	public boolean isDefault () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsDefault);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	public org.compiere.model.I_M_Shipper getM_Shipper() throws RuntimeException
+    {
+		return (org.compiere.model.I_M_Shipper)MTable.get(getCtx(), org.compiere.model.I_M_Shipper.Table_Name)
+			.getPO(getM_Shipper_ID(), get_TrxName());	}
+
+	/** Set Shipper.
+		@param M_Shipper_ID 
+		Method or manner of product delivery
+	  */
+	public void setM_Shipper_ID (int M_Shipper_ID)
+	{
+		if (M_Shipper_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_Shipper_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_Shipper_ID, Integer.valueOf(M_Shipper_ID));
+	}
+
+	/** Get Shipper.
+		@return Method or manner of product delivery
+	  */
+	public int getM_Shipper_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_Shipper_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Shipper Pickup Types.
+		@param M_ShipperPickupTypes_ID Shipper Pickup Types	  */
+	public void setM_ShipperPickupTypes_ID (int M_ShipperPickupTypes_ID)
+	{
+		if (M_ShipperPickupTypes_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_ShipperPickupTypes_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_ShipperPickupTypes_ID, Integer.valueOf(M_ShipperPickupTypes_ID));
+	}
+
+	/** Get Shipper Pickup Types.
+		@return Shipper Pickup Types	  */
+	public int getM_ShipperPickupTypes_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_ShipperPickupTypes_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set M_ShipperPickupTypes_UU.
+		@param M_ShipperPickupTypes_UU M_ShipperPickupTypes_UU	  */
+	public void setM_ShipperPickupTypes_UU (String M_ShipperPickupTypes_UU)
+	{
+		set_Value (COLUMNNAME_M_ShipperPickupTypes_UU, M_ShipperPickupTypes_UU);
+	}
+
+	/** Get M_ShipperPickupTypes_UU.
+		@return M_ShipperPickupTypes_UU	  */
+	public String getM_ShipperPickupTypes_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_M_ShipperPickupTypes_UU);
+	}
+
+	public org.compiere.model.I_X_ShipperPickupTypes getX_ShipperPickupTypes() throws RuntimeException
+    {
+		return (org.compiere.model.I_X_ShipperPickupTypes)MTable.get(getCtx(), org.compiere.model.I_X_ShipperPickupTypes.Table_Name)
+			.getPO(getX_ShipperPickupTypes_ID(), get_TrxName());	}
+
+	/** Set Shipper Pickup Types.
+		@param X_ShipperPickupTypes_ID Shipper Pickup Types	  */
+	public void setX_ShipperPickupTypes_ID (int X_ShipperPickupTypes_ID)
+	{
+		if (X_ShipperPickupTypes_ID < 1) 
+			set_Value (COLUMNNAME_X_ShipperPickupTypes_ID, null);
+		else 
+			set_Value (COLUMNNAME_X_ShipperPickupTypes_ID, Integer.valueOf(X_ShipperPickupTypes_ID));
+	}
+
+	/** Get Shipper Pickup Types.
+		@return Shipper Pickup Types	  */
+	public int getX_ShipperPickupTypes_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_X_ShipperPickupTypes_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+}

org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessor.java

@@ -0,0 +1,178 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+/** Generated Model - DO NOT CHANGE */
+package org.compiere.model;
+
+import java.sql.ResultSet;
+import java.util.Properties;
+
+/** Generated Model for M_ShippingProcessor
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a - $Id$ */
+public class X_M_ShippingProcessor extends PO implements I_M_ShippingProcessor, I_Persistent 
+{
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 20121213L;
+
+    /** Standard Constructor */
+    public X_M_ShippingProcessor (Properties ctx, int M_ShippingProcessor_ID, String trxName)
+    {
+      super (ctx, M_ShippingProcessor_ID, trxName);
+      /** if (M_ShippingProcessor_ID == 0)
+        {
+			setConnectionPassword (null);
+			setM_ShippingProcessor_ID (0);
+			setUserID (null);
+			setX_ShippingProcessor_ID (0);
+        } */
+    }
+
+    /** Load Constructor */
+    public X_M_ShippingProcessor (Properties ctx, ResultSet rs, String trxName)
+    {
+      super (ctx, rs, trxName);
+    }
+
+    /** AccessLevel
+      * @return 3 - Client - Org 
+      */
+    protected int get_AccessLevel()
+    {
+      return accessLevel.intValue();
+    }
+
+    /** Load Meta Data */
+    protected POInfo initPO (Properties ctx)
+    {
+      POInfo poi = POInfo.getPOInfo (ctx, Table_ID, get_TrxName());
+      return poi;
+    }
+
+    public String toString()
+    {
+      StringBuffer sb = new StringBuffer ("X_M_ShippingProcessor[")
+        .append(get_ID()).append("]");
+      return sb.toString();
+    }
+
+	/** Set Connection Key.
+		@param ConnectionKey Connection Key	  */
+	public void setConnectionKey (String ConnectionKey)
+	{
+		set_Value (COLUMNNAME_ConnectionKey, ConnectionKey);
+	}
+
+	/** Get Connection Key.
+		@return Connection Key	  */
+	public String getConnectionKey () 
+	{
+		return (String)get_Value(COLUMNNAME_ConnectionKey);
+	}
+
+	/** Set Connection Password.
+		@param ConnectionPassword Connection Password	  */
+	public void setConnectionPassword (String ConnectionPassword)
+	{
+		set_Value (COLUMNNAME_ConnectionPassword, ConnectionPassword);
+	}
+
+	/** Get Connection Password.
+		@return Connection Password	  */
+	public String getConnectionPassword () 
+	{
+		return (String)get_Value(COLUMNNAME_ConnectionPassword);
+	}
+
+	/** Set Shipping Processor.
+		@param M_ShippingProcessor_ID Shipping Processor	  */
+	public void setM_ShippingProcessor_ID (int M_ShippingProcessor_ID)
+	{
+		if (M_ShippingProcessor_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_ShippingProcessor_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_ShippingProcessor_ID, Integer.valueOf(M_ShippingProcessor_ID));
+	}
+
+	/** Get Shipping Processor.
+		@return Shipping Processor	  */
+	public int getM_ShippingProcessor_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_ShippingProcessor_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set M_ShippingProcessor_UU.
+		@param M_ShippingProcessor_UU M_ShippingProcessor_UU	  */
+	public void setM_ShippingProcessor_UU (String M_ShippingProcessor_UU)
+	{
+		set_Value (COLUMNNAME_M_ShippingProcessor_UU, M_ShippingProcessor_UU);
+	}
+
+	/** Get M_ShippingProcessor_UU.
+		@return M_ShippingProcessor_UU	  */
+	public String getM_ShippingProcessor_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_M_ShippingProcessor_UU);
+	}
+
+	/** Set User ID.
+		@param UserID 
+		User ID or account number
+	  */
+	public void setUserID (String UserID)
+	{
+		set_Value (COLUMNNAME_UserID, UserID);
+	}
+
+	/** Get User ID.
+		@return User ID or account number
+	  */
+	public String getUserID () 
+	{
+		return (String)get_Value(COLUMNNAME_UserID);
+	}
+
+	public org.compiere.model.I_X_ShippingProcessor getX_ShippingProcessor() throws RuntimeException
+    {
+		return (org.compiere.model.I_X_ShippingProcessor)MTable.get(getCtx(), org.compiere.model.I_X_ShippingProcessor.Table_Name)
+			.getPO(getX_ShippingProcessor_ID(), get_TrxName());	}
+
+	/** Set Shipping Processor.
+		@param X_ShippingProcessor_ID Shipping Processor	  */
+	public void setX_ShippingProcessor_ID (int X_ShippingProcessor_ID)
+	{
+		if (X_ShippingProcessor_ID < 1) 
+			set_Value (COLUMNNAME_X_ShippingProcessor_ID, null);
+		else 
+			set_Value (COLUMNNAME_X_ShippingProcessor_ID, Integer.valueOf(X_ShippingProcessor_ID));
+	}
+
+	/** Get Shipping Processor.
+		@return Shipping Processor	  */
+	public int getX_ShippingProcessor_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_X_ShippingProcessor_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+}

org.adempiere.base/src/org/compiere/model/X_M_ShippingTransactionLine.java

@@ -0,0 +1,408 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+/** Generated Model - DO NOT CHANGE */
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.Properties;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Model for M_ShippingTransactionLine
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a - $Id$ */
+public class X_M_ShippingTransactionLine extends PO implements I_M_ShippingTransactionLine, I_Persistent 
+{
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 20121219L;
+
+    /** Standard Constructor */
+    public X_M_ShippingTransactionLine (Properties ctx, int M_ShippingTransactionLine_ID, String trxName)
+    {
+      super (ctx, M_ShippingTransactionLine_ID, trxName);
+      /** if (M_ShippingTransactionLine_ID == 0)
+        {
+			setM_ShippingTransaction_ID (0);
+			setM_ShippingTransactionLine_ID (0);
+			setProcessed (false);
+// N
+        } */
+    }
+
+    /** Load Constructor */
+    public X_M_ShippingTransactionLine (Properties ctx, ResultSet rs, String trxName)
+    {
+      super (ctx, rs, trxName);
+    }
+
+    /** AccessLevel
+      * @return 3 - Client - Org 
+      */
+    protected int get_AccessLevel()
+    {
+      return accessLevel.intValue();
+    }
+
+    /** Load Meta Data */
+    protected POInfo initPO (Properties ctx)
+    {
+      POInfo poi = POInfo.getPOInfo (ctx, Table_ID, get_TrxName());
+      return poi;
+    }
+
+    public String toString()
+    {
+      StringBuffer sb = new StringBuffer ("X_M_ShippingTransactionLine[")
+        .append(get_ID()).append("]");
+      return sb.toString();
+    }
+
+	public org.compiere.model.I_C_UOM getC_UOM_Length() throws RuntimeException
+    {
+		return (org.compiere.model.I_C_UOM)MTable.get(getCtx(), org.compiere.model.I_C_UOM.Table_Name)
+			.getPO(getC_UOM_Length_ID(), get_TrxName());	}
+
+	/** Set UOM for Length.
+		@param C_UOM_Length_ID 
+		Standard Unit of Measure for Length
+	  */
+	public void setC_UOM_Length_ID (int C_UOM_Length_ID)
+	{
+		if (C_UOM_Length_ID < 1) 
+			set_Value (COLUMNNAME_C_UOM_Length_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_UOM_Length_ID, Integer.valueOf(C_UOM_Length_ID));
+	}
+
+	/** Get UOM for Length.
+		@return Standard Unit of Measure for Length
+	  */
+	public int getC_UOM_Length_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_UOM_Length_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public org.compiere.model.I_C_UOM getC_UOM_Weight() throws RuntimeException
+    {
+		return (org.compiere.model.I_C_UOM)MTable.get(getCtx(), org.compiere.model.I_C_UOM.Table_Name)
+			.getPO(getC_UOM_Weight_ID(), get_TrxName());	}
+
+	/** Set UOM for Weight.
+		@param C_UOM_Weight_ID 
+		Standard Unit of Measure for Weight
+	  */
+	public void setC_UOM_Weight_ID (int C_UOM_Weight_ID)
+	{
+		if (C_UOM_Weight_ID < 1) 
+			set_Value (COLUMNNAME_C_UOM_Weight_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_UOM_Weight_ID, Integer.valueOf(C_UOM_Weight_ID));
+	}
+
+	/** Get UOM for Weight.
+		@return Standard Unit of Measure for Weight
+	  */
+	public int getC_UOM_Weight_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_UOM_Weight_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Description.
+		@param Description 
+		Optional short description of the record
+	  */
+	public void setDescription (String Description)
+	{
+		set_Value (COLUMNNAME_Description, Description);
+	}
+
+	/** Get Description.
+		@return Optional short description of the record
+	  */
+	public String getDescription () 
+	{
+		return (String)get_Value(COLUMNNAME_Description);
+	}
+
+	/** Set Height.
+		@param Height Height	  */
+	public void setHeight (BigDecimal Height)
+	{
+		set_Value (COLUMNNAME_Height, Height);
+	}
+
+	/** Get Height.
+		@return Height	  */
+	public BigDecimal getHeight () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Height);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Length.
+		@param Length Length	  */
+	public void setLength (BigDecimal Length)
+	{
+		set_Value (COLUMNNAME_Length, Length);
+	}
+
+	/** Get Length.
+		@return Length	  */
+	public BigDecimal getLength () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Length);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	public org.compiere.model.I_M_PackageMPS getM_PackageMPS() throws RuntimeException
+    {
+		return (org.compiere.model.I_M_PackageMPS)MTable.get(getCtx(), org.compiere.model.I_M_PackageMPS.Table_Name)
+			.getPO(getM_PackageMPS_ID(), get_TrxName());	}
+
+	/** Set Package MPS.
+		@param M_PackageMPS_ID Package MPS	  */
+	public void setM_PackageMPS_ID (int M_PackageMPS_ID)
+	{
+		if (M_PackageMPS_ID < 1) 
+			set_Value (COLUMNNAME_M_PackageMPS_ID, null);
+		else 
+			set_Value (COLUMNNAME_M_PackageMPS_ID, Integer.valueOf(M_PackageMPS_ID));
+	}
+
+	/** Get Package MPS.
+		@return Package MPS	  */
+	public int getM_PackageMPS_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_PackageMPS_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public org.compiere.model.I_M_ShippingTransaction getM_ShippingTransaction() throws RuntimeException
+    {
+		return (org.compiere.model.I_M_ShippingTransaction)MTable.get(getCtx(), org.compiere.model.I_M_ShippingTransaction.Table_Name)
+			.getPO(getM_ShippingTransaction_ID(), get_TrxName());	}
+
+	/** Set Shipping Transaction.
+		@param M_ShippingTransaction_ID Shipping Transaction	  */
+	public void setM_ShippingTransaction_ID (int M_ShippingTransaction_ID)
+	{
+		if (M_ShippingTransaction_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_ShippingTransaction_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_ShippingTransaction_ID, Integer.valueOf(M_ShippingTransaction_ID));
+	}
+
+	/** Get Shipping Transaction.
+		@return Shipping Transaction	  */
+	public int getM_ShippingTransaction_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_ShippingTransaction_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+    /** Get Record ID/ColumnName
+        @return ID/ColumnName pair
+      */
+    public KeyNamePair getKeyNamePair() 
+    {
+        return new KeyNamePair(get_ID(), String.valueOf(getM_ShippingTransaction_ID()));
+    }
+
+	/** Set Shipping Transaction Line.
+		@param M_ShippingTransactionLine_ID Shipping Transaction Line	  */
+	public void setM_ShippingTransactionLine_ID (int M_ShippingTransactionLine_ID)
+	{
+		if (M_ShippingTransactionLine_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_M_ShippingTransactionLine_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_M_ShippingTransactionLine_ID, Integer.valueOf(M_ShippingTransactionLine_ID));
+	}
+
+	/** Get Shipping Transaction Line.
+		@return Shipping Transaction Line	  */
+	public int getM_ShippingTransactionLine_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_ShippingTransactionLine_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set M_ShippingTransactionLine_UU.
+		@param M_ShippingTransactionLine_UU M_ShippingTransactionLine_UU	  */
+	public void setM_ShippingTransactionLine_UU (String M_ShippingTransactionLine_UU)
+	{
+		set_Value (COLUMNNAME_M_ShippingTransactionLine_UU, M_ShippingTransactionLine_UU);
+	}
+
+	/** Get M_ShippingTransactionLine_UU.
+		@return M_ShippingTransactionLine_UU	  */
+	public String getM_ShippingTransactionLine_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_M_ShippingTransactionLine_UU);
+	}
+
+	/** Set Master Tracking No.
+		@param MasterTrackingNo Master Tracking No	  */
+	public void setMasterTrackingNo (String MasterTrackingNo)
+	{
+		set_Value (COLUMNNAME_MasterTrackingNo, MasterTrackingNo);
+	}
+
+	/** Get Master Tracking No.
+		@return Master Tracking No	  */
+	public String getMasterTrackingNo () 
+	{
+		return (String)get_Value(COLUMNNAME_MasterTrackingNo);
+	}
+
+	/** Set Price.
+		@param Price 
+		Price
+	  */
+	public void setPrice (BigDecimal Price)
+	{
+		set_Value (COLUMNNAME_Price, Price);
+	}
+
+	/** Get Price.
+		@return Price
+	  */
+	public BigDecimal getPrice () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Price);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Processed.
+		@param Processed 
+		The document has been processed
+	  */
+	public void setProcessed (boolean Processed)
+	{
+		set_Value (COLUMNNAME_Processed, Boolean.valueOf(Processed));
+	}
+
+	/** Get Processed.
+		@return The document has been processed
+	  */
+	public boolean isProcessed () 
+	{
+		Object oo = get_Value(COLUMNNAME_Processed);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** Set Sequence.
+		@param SeqNo 
+		Method of ordering records; lowest number comes first
+	  */
+	public void setSeqNo (int SeqNo)
+	{
+		set_Value (COLUMNNAME_SeqNo, Integer.valueOf(SeqNo));
+	}
+
+	/** Get Sequence.
+		@return Method of ordering records; lowest number comes first
+	  */
+	public int getSeqNo () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_SeqNo);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Tracking No.
+		@param TrackingNo 
+		Number to track the shipment
+	  */
+	public void setTrackingNo (String TrackingNo)
+	{
+		set_Value (COLUMNNAME_TrackingNo, TrackingNo);
+	}
+
+	/** Get Tracking No.
+		@return Number to track the shipment
+	  */
+	public String getTrackingNo () 
+	{
+		return (String)get_Value(COLUMNNAME_TrackingNo);
+	}
+
+	/** Set Weight.
+		@param Weight 
+		Weight of a product
+	  */
+	public void setWeight (BigDecimal Weight)
+	{
+		set_Value (COLUMNNAME_Weight, Weight);
+	}
+
+	/** Get Weight.
+		@return Weight of a product
+	  */
+	public BigDecimal getWeight () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Weight);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Width.
+		@param Width Width	  */
+	public void setWidth (BigDecimal Width)
+	{
+		set_Value (COLUMNNAME_Width, Width);
+	}
+
+	/** Get Width.
+		@return Width	  */
+	public BigDecimal getWidth () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Width);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+}

org.adempiere.base/src/org/compiere/model/X_X_Shipper.java

@@ -0,0 +1,300 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+/** Generated Model - DO NOT CHANGE */
+package org.compiere.model;
+
+import java.sql.ResultSet;
+import java.util.Properties;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Model for X_Shipper
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a - $Id$ */
+public class X_X_Shipper extends PO implements I_X_Shipper, I_Persistent 
+{
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 20121213L;
+
+    /** Standard Constructor */
+    public X_X_Shipper (Properties ctx, int X_Shipper_ID, String trxName)
+    {
+      super (ctx, X_Shipper_ID, trxName);
+      /** if (X_Shipper_ID == 0)
+        {
+			setIsInternational (false);
+// N
+			setIsOnline (false);
+// N
+			setIsResidential (false);
+// N
+			setIsSaturdayDelivery (false);
+// N
+			setName (null);
+			setX_Shipper_ID (0);
+        } */
+    }
+
+    /** Load Constructor */
+    public X_X_Shipper (Properties ctx, ResultSet rs, String trxName)
+    {
+      super (ctx, rs, trxName);
+    }
+
+    /** AccessLevel
+      * @return 6 - System - Client 
+      */
+    protected int get_AccessLevel()
+    {
+      return accessLevel.intValue();
+    }
+
+    /** Load Meta Data */
+    protected POInfo initPO (Properties ctx)
+    {
+      POInfo poi = POInfo.getPOInfo (ctx, Table_ID, get_TrxName());
+      return poi;
+    }
+
+    public String toString()
+    {
+      StringBuffer sb = new StringBuffer ("X_X_Shipper[")
+        .append(get_ID()).append("]");
+      return sb.toString();
+    }
+
+	/** Set Description.
+		@param Description 
+		Optional short description of the record
+	  */
+	public void setDescription (String Description)
+	{
+		set_Value (COLUMNNAME_Description, Description);
+	}
+
+	/** Get Description.
+		@return Optional short description of the record
+	  */
+	public String getDescription () 
+	{
+		return (String)get_Value(COLUMNNAME_Description);
+	}
+
+	/** Set International.
+		@param IsInternational International	  */
+	public void setIsInternational (boolean IsInternational)
+	{
+		set_Value (COLUMNNAME_IsInternational, Boolean.valueOf(IsInternational));
+	}
+
+	/** Get International.
+		@return International	  */
+	public boolean isInternational () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsInternational);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** Set Online Access.
+		@param IsOnline 
+		Can be accessed online 
+	  */
+	public void setIsOnline (boolean IsOnline)
+	{
+		set_Value (COLUMNNAME_IsOnline, Boolean.valueOf(IsOnline));
+	}
+
+	/** Get Online Access.
+		@return Can be accessed online 
+	  */
+	public boolean isOnline () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsOnline);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** Set Residential.
+		@param IsResidential Residential	  */
+	public void setIsResidential (boolean IsResidential)
+	{
+		set_Value (COLUMNNAME_IsResidential, Boolean.valueOf(IsResidential));
+	}
+
+	/** Get Residential.
+		@return Residential	  */
+	public boolean isResidential () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsResidential);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** Set Saturday Delivery.
+		@param IsSaturdayDelivery Saturday Delivery	  */
+	public void setIsSaturdayDelivery (boolean IsSaturdayDelivery)
+	{
+		set_Value (COLUMNNAME_IsSaturdayDelivery, Boolean.valueOf(IsSaturdayDelivery));
+	}
+
+	/** Get Saturday Delivery.
+		@return Saturday Delivery	  */
+	public boolean isSaturdayDelivery () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsSaturdayDelivery);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** Set Name.
+		@param Name 
+		Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name)
+	{
+		set_Value (COLUMNNAME_Name, Name);
+	}
+
+	/** Get Name.
+		@return Alphanumeric identifier of the entity
+	  */
+	public String getName () 
+	{
+		return (String)get_Value(COLUMNNAME_Name);
+	}
+
+    /** Get Record ID/ColumnName
+        @return ID/ColumnName pair
+      */
+    public KeyNamePair getKeyNamePair() 
+    {
+        return new KeyNamePair(get_ID(), getName());
+    }
+
+	/** Set Service Code.
+		@param ShippingServiceCode Service Code	  */
+	public void setShippingServiceCode (String ShippingServiceCode)
+	{
+		set_Value (COLUMNNAME_ShippingServiceCode, ShippingServiceCode);
+	}
+
+	/** Get Service Code.
+		@return Service Code	  */
+	public String getShippingServiceCode () 
+	{
+		return (String)get_Value(COLUMNNAME_ShippingServiceCode);
+	}
+
+	/** Set Tracking URL.
+		@param TrackingURL 
+		URL of the shipper to track shipments
+	  */
+	public void setTrackingURL (String TrackingURL)
+	{
+		set_Value (COLUMNNAME_TrackingURL, TrackingURL);
+	}
+
+	/** Get Tracking URL.
+		@return URL of the shipper to track shipments
+	  */
+	public String getTrackingURL () 
+	{
+		return (String)get_Value(COLUMNNAME_TrackingURL);
+	}
+
+	/** Set Shipper.
+		@param X_Shipper_ID Shipper	  */
+	public void setX_Shipper_ID (int X_Shipper_ID)
+	{
+		if (X_Shipper_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_X_Shipper_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_X_Shipper_ID, Integer.valueOf(X_Shipper_ID));
+	}
+
+	/** Get Shipper.
+		@return Shipper	  */
+	public int getX_Shipper_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_X_Shipper_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set X_Shipper_UU.
+		@param X_Shipper_UU X_Shipper_UU	  */
+	public void setX_Shipper_UU (String X_Shipper_UU)
+	{
+		set_Value (COLUMNNAME_X_Shipper_UU, X_Shipper_UU);
+	}
+
+	/** Get X_Shipper_UU.
+		@return X_Shipper_UU	  */
+	public String getX_Shipper_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_X_Shipper_UU);
+	}
+
+	public org.compiere.model.I_X_ShippingProcessor getX_ShippingProcessor() throws RuntimeException
+    {
+		return (org.compiere.model.I_X_ShippingProcessor)MTable.get(getCtx(), org.compiere.model.I_X_ShippingProcessor.Table_Name)
+			.getPO(getX_ShippingProcessor_ID(), get_TrxName());	}
+
+	/** Set Shipping Processor.
+		@param X_ShippingProcessor_ID Shipping Processor	  */
+	public void setX_ShippingProcessor_ID (int X_ShippingProcessor_ID)
+	{
+		if (X_ShippingProcessor_ID < 1) 
+			set_Value (COLUMNNAME_X_ShippingProcessor_ID, null);
+		else 
+			set_Value (COLUMNNAME_X_ShippingProcessor_ID, Integer.valueOf(X_ShippingProcessor_ID));
+	}
+
+	/** Get Shipping Processor.
+		@return Shipping Processor	  */
+	public int getX_ShippingProcessor_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_X_ShippingProcessor_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+}

org.adempiere.base/src/org/compiere/model/X_X_ShipperLabels.java

@@ -0,0 +1,278 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+/** Generated Model - DO NOT CHANGE */
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.Properties;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Model for X_ShipperLabels
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a - $Id$ */
+public class X_X_ShipperLabels extends PO implements I_X_ShipperLabels, I_Persistent 
+{
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 20121213L;
+
+    /** Standard Constructor */
+    public X_X_ShipperLabels (Properties ctx, int X_ShipperLabels_ID, String trxName)
+    {
+      super (ctx, X_ShipperLabels_ID, trxName);
+      /** if (X_ShipperLabels_ID == 0)
+        {
+			setIsDefault (false);
+// N
+			setName (null);
+			setValue (null);
+			setX_Shipper_ID (0);
+			setX_ShipperLabels_ID (0);
+        } */
+    }
+
+    /** Load Constructor */
+    public X_X_ShipperLabels (Properties ctx, ResultSet rs, String trxName)
+    {
+      super (ctx, rs, trxName);
+    }
+
+    /** AccessLevel
+      * @return 6 - System - Client 
+      */
+    protected int get_AccessLevel()
+    {
+      return accessLevel.intValue();
+    }
+
+    /** Load Meta Data */
+    protected POInfo initPO (Properties ctx)
+    {
+      POInfo poi = POInfo.getPOInfo (ctx, Table_ID, get_TrxName());
+      return poi;
+    }
+
+    public String toString()
+    {
+      StringBuffer sb = new StringBuffer ("X_X_ShipperLabels[")
+        .append(get_ID()).append("]");
+      return sb.toString();
+    }
+
+	/** Set Description.
+		@param Description 
+		Optional short description of the record
+	  */
+	public void setDescription (String Description)
+	{
+		set_Value (COLUMNNAME_Description, Description);
+	}
+
+	/** Get Description.
+		@return Optional short description of the record
+	  */
+	public String getDescription () 
+	{
+		return (String)get_Value(COLUMNNAME_Description);
+	}
+
+	/** Set Height.
+		@param Height Height	  */
+	public void setHeight (BigDecimal Height)
+	{
+		set_Value (COLUMNNAME_Height, Height);
+	}
+
+	/** Get Height.
+		@return Height	  */
+	public BigDecimal getHeight () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Height);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Default.
+		@param IsDefault 
+		Default value
+	  */
+	public void setIsDefault (boolean IsDefault)
+	{
+		set_Value (COLUMNNAME_IsDefault, Boolean.valueOf(IsDefault));
+	}
+
+	/** Get Default.
+		@return Default value
+	  */
+	public boolean isDefault () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsDefault);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** LabelPrintMethod AD_Reference_ID=200027 */
+	public static final int LABELPRINTMETHOD_AD_Reference_ID=200027;
+	/** Eltron = E */
+	public static final String LABELPRINTMETHOD_Eltron = "E";
+	/** Image = I */
+	public static final String LABELPRINTMETHOD_Image = "I";
+	/** Zebra = Z */
+	public static final String LABELPRINTMETHOD_Zebra = "Z";
+	/** Set Label Print Method.
+		@param LabelPrintMethod Label Print Method	  */
+	public void setLabelPrintMethod (String LabelPrintMethod)
+	{
+
+		set_Value (COLUMNNAME_LabelPrintMethod, LabelPrintMethod);
+	}
+
+	/** Get Label Print Method.
+		@return Label Print Method	  */
+	public String getLabelPrintMethod () 
+	{
+		return (String)get_Value(COLUMNNAME_LabelPrintMethod);
+	}
+
+	/** Set Name.
+		@param Name 
+		Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name)
+	{
+		set_Value (COLUMNNAME_Name, Name);
+	}
+
+	/** Get Name.
+		@return Alphanumeric identifier of the entity
+	  */
+	public String getName () 
+	{
+		return (String)get_Value(COLUMNNAME_Name);
+	}
+
+    /** Get Record ID/ColumnName
+        @return ID/ColumnName pair
+      */
+    public KeyNamePair getKeyNamePair() 
+    {
+        return new KeyNamePair(get_ID(), getName());
+    }
+
+	/** Set Search Key.
+		@param Value 
+		Search key for the record in the format required - must be unique
+	  */
+	public void setValue (String Value)
+	{
+		set_Value (COLUMNNAME_Value, Value);
+	}
+
+	/** Get Search Key.
+		@return Search key for the record in the format required - must be unique
+	  */
+	public String getValue () 
+	{
+		return (String)get_Value(COLUMNNAME_Value);
+	}
+
+	/** Set Width.
+		@param Width Width	  */
+	public void setWidth (BigDecimal Width)
+	{
+		set_Value (COLUMNNAME_Width, Width);
+	}
+
+	/** Get Width.
+		@return Width	  */
+	public BigDecimal getWidth () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Width);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	public org.compiere.model.I_X_Shipper getX_Shipper() throws RuntimeException
+    {
+		return (org.compiere.model.I_X_Shipper)MTable.get(getCtx(), org.compiere.model.I_X_Shipper.Table_Name)
+			.getPO(getX_Shipper_ID(), get_TrxName());	}
+
+	/** Set Shipper.
+		@param X_Shipper_ID Shipper	  */
+	public void setX_Shipper_ID (int X_Shipper_ID)
+	{
+		if (X_Shipper_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_X_Shipper_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_X_Shipper_ID, Integer.valueOf(X_Shipper_ID));
+	}
+
+	/** Get Shipper.
+		@return Shipper	  */
+	public int getX_Shipper_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_X_Shipper_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Shipper Labels.
+		@param X_ShipperLabels_ID Shipper Labels	  */
+	public void setX_ShipperLabels_ID (int X_ShipperLabels_ID)
+	{
+		if (X_ShipperLabels_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_X_ShipperLabels_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_X_ShipperLabels_ID, Integer.valueOf(X_ShipperLabels_ID));
+	}
+
+	/** Get Shipper Labels.
+		@return Shipper Labels	  */
+	public int getX_ShipperLabels_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_X_ShipperLabels_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set X_ShipperLabels_UU.
+		@param X_ShipperLabels_UU X_ShipperLabels_UU	  */
+	public void setX_ShipperLabels_UU (String X_ShipperLabels_UU)
+	{
+		set_Value (COLUMNNAME_X_ShipperLabels_UU, X_ShipperLabels_UU);
+	}
+
+	/** Get X_ShipperLabels_UU.
+		@return X_ShipperLabels_UU	  */
+	public String getX_ShipperLabels_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_X_ShipperLabels_UU);
+	}
+}

org.adempiere.base/src/org/compiere/model/X_X_ShipperPackaging.java

@@ -0,0 +1,241 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+/** Generated Model - DO NOT CHANGE */
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.Properties;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Model for X_ShipperPackaging
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a - $Id$ */
+public class X_X_ShipperPackaging extends PO implements I_X_ShipperPackaging, I_Persistent 
+{
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 20121213L;
+
+    /** Standard Constructor */
+    public X_X_ShipperPackaging (Properties ctx, int X_ShipperPackaging_ID, String trxName)
+    {
+      super (ctx, X_ShipperPackaging_ID, trxName);
+      /** if (X_ShipperPackaging_ID == 0)
+        {
+			setIsDefault (false);
+// N
+			setName (null);
+			setValue (null);
+			setX_Shipper_ID (0);
+			setX_ShipperPackaging_ID (0);
+        } */
+    }
+
+    /** Load Constructor */
+    public X_X_ShipperPackaging (Properties ctx, ResultSet rs, String trxName)
+    {
+      super (ctx, rs, trxName);
+    }
+
+    /** AccessLevel
+      * @return 6 - System - Client 
+      */
+    protected int get_AccessLevel()
+    {
+      return accessLevel.intValue();
+    }
+
+    /** Load Meta Data */
+    protected POInfo initPO (Properties ctx)
+    {
+      POInfo poi = POInfo.getPOInfo (ctx, Table_ID, get_TrxName());
+      return poi;
+    }
+
+    public String toString()
+    {
+      StringBuffer sb = new StringBuffer ("X_X_ShipperPackaging[")
+        .append(get_ID()).append("]");
+      return sb.toString();
+    }
+
+	/** Set Description.
+		@param Description 
+		Optional short description of the record
+	  */
+	public void setDescription (String Description)
+	{
+		set_Value (COLUMNNAME_Description, Description);
+	}
+
+	/** Get Description.
+		@return Optional short description of the record
+	  */
+	public String getDescription () 
+	{
+		return (String)get_Value(COLUMNNAME_Description);
+	}
+
+	/** Set Default.
+		@param IsDefault 
+		Default value
+	  */
+	public void setIsDefault (boolean IsDefault)
+	{
+		set_Value (COLUMNNAME_IsDefault, Boolean.valueOf(IsDefault));
+	}
+
+	/** Get Default.
+		@return Default value
+	  */
+	public boolean isDefault () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsDefault);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** Set Name.
+		@param Name 
+		Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name)
+	{
+		set_Value (COLUMNNAME_Name, Name);
+	}
+
+	/** Get Name.
+		@return Alphanumeric identifier of the entity
+	  */
+	public String getName () 
+	{
+		return (String)get_Value(COLUMNNAME_Name);
+	}
+
+    /** Get Record ID/ColumnName
+        @return ID/ColumnName pair
+      */
+    public KeyNamePair getKeyNamePair() 
+    {
+        return new KeyNamePair(get_ID(), getName());
+    }
+
+	/** Set Search Key.
+		@param Value 
+		Search key for the record in the format required - must be unique
+	  */
+	public void setValue (String Value)
+	{
+		set_Value (COLUMNNAME_Value, Value);
+	}
+
+	/** Get Search Key.
+		@return Search key for the record in the format required - must be unique
+	  */
+	public String getValue () 
+	{
+		return (String)get_Value(COLUMNNAME_Value);
+	}
+
+	/** Set Weight.
+		@param Weight 
+		Weight of a product
+	  */
+	public void setWeight (BigDecimal Weight)
+	{
+		set_Value (COLUMNNAME_Weight, Weight);
+	}
+
+	/** Get Weight.
+		@return Weight of a product
+	  */
+	public BigDecimal getWeight () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Weight);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	public org.compiere.model.I_X_Shipper getX_Shipper() throws RuntimeException
+    {
+		return (org.compiere.model.I_X_Shipper)MTable.get(getCtx(), org.compiere.model.I_X_Shipper.Table_Name)
+			.getPO(getX_Shipper_ID(), get_TrxName());	}
+
+	/** Set Shipper.
+		@param X_Shipper_ID Shipper	  */
+	public void setX_Shipper_ID (int X_Shipper_ID)
+	{
+		if (X_Shipper_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_X_Shipper_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_X_Shipper_ID, Integer.valueOf(X_Shipper_ID));
+	}
+
+	/** Get Shipper.
+		@return Shipper	  */
+	public int getX_Shipper_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_X_Shipper_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Shipper Packaging.
+		@param X_ShipperPackaging_ID Shipper Packaging	  */
+	public void setX_ShipperPackaging_ID (int X_ShipperPackaging_ID)
+	{
+		if (X_ShipperPackaging_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_X_ShipperPackaging_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_X_ShipperPackaging_ID, Integer.valueOf(X_ShipperPackaging_ID));
+	}
+
+	/** Get Shipper Packaging.
+		@return Shipper Packaging	  */
+	public int getX_ShipperPackaging_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_X_ShipperPackaging_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set X_ShipperPackaging_UU.
+		@param X_ShipperPackaging_UU X_ShipperPackaging_UU	  */
+	public void setX_ShipperPackaging_UU (String X_ShipperPackaging_UU)
+	{
+		set_Value (COLUMNNAME_X_ShipperPackaging_UU, X_ShipperPackaging_UU);
+	}
+
+	/** Get X_ShipperPackaging_UU.
+		@return X_ShipperPackaging_UU	  */
+	public String getX_ShipperPackaging_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_X_ShipperPackaging_UU);
+	}
+}

org.adempiere.base/src/org/compiere/model/X_X_ShipperPickupTypes.java

@@ -0,0 +1,219 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+/** Generated Model - DO NOT CHANGE */
+package org.compiere.model;
+
+import java.sql.ResultSet;
+import java.util.Properties;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Model for X_ShipperPickupTypes
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a - $Id$ */
+public class X_X_ShipperPickupTypes extends PO implements I_X_ShipperPickupTypes, I_Persistent 
+{
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 20121213L;
+
+    /** Standard Constructor */
+    public X_X_ShipperPickupTypes (Properties ctx, int X_ShipperPickupTypes_ID, String trxName)
+    {
+      super (ctx, X_ShipperPickupTypes_ID, trxName);
+      /** if (X_ShipperPickupTypes_ID == 0)
+        {
+			setIsDefault (false);
+// N
+			setName (null);
+			setValue (null);
+			setX_Shipper_ID (0);
+			setX_ShipperPickupTypes_ID (0);
+        } */
+    }
+
+    /** Load Constructor */
+    public X_X_ShipperPickupTypes (Properties ctx, ResultSet rs, String trxName)
+    {
+      super (ctx, rs, trxName);
+    }
+
+    /** AccessLevel
+      * @return 6 - System - Client 
+      */
+    protected int get_AccessLevel()
+    {
+      return accessLevel.intValue();
+    }
+
+    /** Load Meta Data */
+    protected POInfo initPO (Properties ctx)
+    {
+      POInfo poi = POInfo.getPOInfo (ctx, Table_ID, get_TrxName());
+      return poi;
+    }
+
+    public String toString()
+    {
+      StringBuffer sb = new StringBuffer ("X_X_ShipperPickupTypes[")
+        .append(get_ID()).append("]");
+      return sb.toString();
+    }
+
+	/** Set Description.
+		@param Description 
+		Optional short description of the record
+	  */
+	public void setDescription (String Description)
+	{
+		set_Value (COLUMNNAME_Description, Description);
+	}
+
+	/** Get Description.
+		@return Optional short description of the record
+	  */
+	public String getDescription () 
+	{
+		return (String)get_Value(COLUMNNAME_Description);
+	}
+
+	/** Set Default.
+		@param IsDefault 
+		Default value
+	  */
+	public void setIsDefault (boolean IsDefault)
+	{
+		set_Value (COLUMNNAME_IsDefault, Boolean.valueOf(IsDefault));
+	}
+
+	/** Get Default.
+		@return Default value
+	  */
+	public boolean isDefault () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsDefault);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** Set Name.
+		@param Name 
+		Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name)
+	{
+		set_Value (COLUMNNAME_Name, Name);
+	}
+
+	/** Get Name.
+		@return Alphanumeric identifier of the entity
+	  */
+	public String getName () 
+	{
+		return (String)get_Value(COLUMNNAME_Name);
+	}
+
+    /** Get Record ID/ColumnName
+        @return ID/ColumnName pair
+      */
+    public KeyNamePair getKeyNamePair() 
+    {
+        return new KeyNamePair(get_ID(), getName());
+    }
+
+	/** Set Search Key.
+		@param Value 
+		Search key for the record in the format required - must be unique
+	  */
+	public void setValue (String Value)
+	{
+		set_Value (COLUMNNAME_Value, Value);
+	}
+
+	/** Get Search Key.
+		@return Search key for the record in the format required - must be unique
+	  */
+	public String getValue () 
+	{
+		return (String)get_Value(COLUMNNAME_Value);
+	}
+
+	public org.compiere.model.I_X_Shipper getX_Shipper() throws RuntimeException
+    {
+		return (org.compiere.model.I_X_Shipper)MTable.get(getCtx(), org.compiere.model.I_X_Shipper.Table_Name)
+			.getPO(getX_Shipper_ID(), get_TrxName());	}
+
+	/** Set Shipper.
+		@param X_Shipper_ID Shipper	  */
+	public void setX_Shipper_ID (int X_Shipper_ID)
+	{
+		if (X_Shipper_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_X_Shipper_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_X_Shipper_ID, Integer.valueOf(X_Shipper_ID));
+	}
+
+	/** Get Shipper.
+		@return Shipper	  */
+	public int getX_Shipper_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_X_Shipper_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Shipper Pickup Types.
+		@param X_ShipperPickupTypes_ID Shipper Pickup Types	  */
+	public void setX_ShipperPickupTypes_ID (int X_ShipperPickupTypes_ID)
+	{
+		if (X_ShipperPickupTypes_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_X_ShipperPickupTypes_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_X_ShipperPickupTypes_ID, Integer.valueOf(X_ShipperPickupTypes_ID));
+	}
+
+	/** Get Shipper Pickup Types.
+		@return Shipper Pickup Types	  */
+	public int getX_ShipperPickupTypes_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_X_ShipperPickupTypes_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set X_ShipperPickupTypes_UU.
+		@param X_ShipperPickupTypes_UU X_ShipperPickupTypes_UU	  */
+	public void setX_ShipperPickupTypes_UU (String X_ShipperPickupTypes_UU)
+	{
+		set_Value (COLUMNNAME_X_ShipperPickupTypes_UU, X_ShipperPickupTypes_UU);
+	}
+
+	/** Get X_ShipperPickupTypes_UU.
+		@return X_ShipperPickupTypes_UU	  */
+	public String getX_ShipperPickupTypes_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_X_ShipperPickupTypes_UU);
+	}
+}

org.adempiere.base/src/org/compiere/model/X_X_ShippingProcessor.java

@@ -0,0 +1,287 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+/** Generated Model - DO NOT CHANGE */
+package org.compiere.model;
+
+import java.sql.ResultSet;
+import java.util.Properties;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Model for X_ShippingProcessor
+ *  @author iDempiere (generated) 
+ *  @version Release 1.0a - $Id$ */
+public class X_X_ShippingProcessor extends PO implements I_X_ShippingProcessor, I_Persistent 
+{
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 20121213L;
+
+    /** Standard Constructor */
+    public X_X_ShippingProcessor (Properties ctx, int X_ShippingProcessor_ID, String trxName)
+    {
+      super (ctx, X_ShippingProcessor_ID, trxName);
+      /** if (X_ShippingProcessor_ID == 0)
+        {
+			setHostAddress (null);
+			setHostPort (0);
+			setName (null);
+			setX_ShippingProcessor_ID (0);
+        } */
+    }
+
+    /** Load Constructor */
+    public X_X_ShippingProcessor (Properties ctx, ResultSet rs, String trxName)
+    {
+      super (ctx, rs, trxName);
+    }
+
+    /** AccessLevel
+      * @return 6 - System - Client 
+      */
+    protected int get_AccessLevel()
+    {
+      return accessLevel.intValue();
+    }
+
+    /** Load Meta Data */
+    protected POInfo initPO (Properties ctx)
+    {
+      POInfo poi = POInfo.getPOInfo (ctx, Table_ID, get_TrxName());
+      return poi;
+    }
+
+    public String toString()
+    {
+      StringBuffer sb = new StringBuffer ("X_X_ShippingProcessor[")
+        .append(get_ID()).append("]");
+      return sb.toString();
+    }
+
+	/** Set Description.
+		@param Description 
+		Optional short description of the record
+	  */
+	public void setDescription (String Description)
+	{
+		set_Value (COLUMNNAME_Description, Description);
+	}
+
+	/** Get Description.
+		@return Optional short description of the record
+	  */
+	public String getDescription () 
+	{
+		return (String)get_Value(COLUMNNAME_Description);
+	}
+
+	/** Set Host Address.
+		@param HostAddress 
+		Host Address URL or DNS
+	  */
+	public void setHostAddress (String HostAddress)
+	{
+		set_Value (COLUMNNAME_HostAddress, HostAddress);
+	}
+
+	/** Get Host Address.
+		@return Host Address URL or DNS
+	  */
+	public String getHostAddress () 
+	{
+		return (String)get_Value(COLUMNNAME_HostAddress);
+	}
+
+	/** Set Host port.
+		@param HostPort 
+		Host Communication Port
+	  */
+	public void setHostPort (int HostPort)
+	{
+		set_Value (COLUMNNAME_HostPort, Integer.valueOf(HostPort));
+	}
+
+	/** Get Host port.
+		@return Host Communication Port
+	  */
+	public int getHostPort () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_HostPort);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Name.
+		@param Name 
+		Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name)
+	{
+		set_Value (COLUMNNAME_Name, Name);
+	}
+
+	/** Get Name.
+		@return Alphanumeric identifier of the entity
+	  */
+	public String getName () 
+	{
+		return (String)get_Value(COLUMNNAME_Name);
+	}
+
+    /** Get Record ID/ColumnName
+        @return ID/ColumnName pair
+      */
+    public KeyNamePair getKeyNamePair() 
+    {
+        return new KeyNamePair(get_ID(), getName());
+    }
+
+	/** Set Proxy address.
+		@param ProxyAddress 
+		 Address of your proxy server
+	  */
+	public void setProxyAddress (String ProxyAddress)
+	{
+		set_Value (COLUMNNAME_ProxyAddress, ProxyAddress);
+	}
+
+	/** Get Proxy address.
+		@return  Address of your proxy server
+	  */
+	public String getProxyAddress () 
+	{
+		return (String)get_Value(COLUMNNAME_ProxyAddress);
+	}
+
+	/** Set Proxy logon.
+		@param ProxyLogon 
+		Logon of your proxy server
+	  */
+	public void setProxyLogon (String ProxyLogon)
+	{
+		set_Value (COLUMNNAME_ProxyLogon, ProxyLogon);
+	}
+
+	/** Get Proxy logon.
+		@return Logon of your proxy server
+	  */
+	public String getProxyLogon () 
+	{
+		return (String)get_Value(COLUMNNAME_ProxyLogon);
+	}
+
+	/** Set Proxy password.
+		@param ProxyPassword 
+		Password of your proxy server
+	  */
+	public void setProxyPassword (String ProxyPassword)
+	{
+		set_Value (COLUMNNAME_ProxyPassword, ProxyPassword);
+	}
+
+	/** Get Proxy password.
+		@return Password of your proxy server
+	  */
+	public String getProxyPassword () 
+	{
+		return (String)get_Value(COLUMNNAME_ProxyPassword);
+	}
+
+	/** Set Proxy port.
+		@param ProxyPort 
+		Port of your proxy server
+	  */
+	public void setProxyPort (int ProxyPort)
+	{
+		set_Value (COLUMNNAME_ProxyPort, Integer.valueOf(ProxyPort));
+	}
+
+	/** Get Proxy port.
+		@return Port of your proxy server
+	  */
+	public int getProxyPort () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_ProxyPort);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Service Path.
+		@param ServicePath Service Path	  */
+	public void setServicePath (String ServicePath)
+	{
+		set_Value (COLUMNNAME_ServicePath, ServicePath);
+	}
+
+	/** Get Service Path.
+		@return Service Path	  */
+	public String getServicePath () 
+	{
+		return (String)get_Value(COLUMNNAME_ServicePath);
+	}
+
+	/** Set Shipping Processor Class.
+		@param ShippingProcessorClass Shipping Processor Class	  */
+	public void setShippingProcessorClass (String ShippingProcessorClass)
+	{
+		set_Value (COLUMNNAME_ShippingProcessorClass, ShippingProcessorClass);
+	}
+
+	/** Get Shipping Processor Class.
+		@return Shipping Processor Class	  */
+	public String getShippingProcessorClass () 
+	{
+		return (String)get_Value(COLUMNNAME_ShippingProcessorClass);
+	}
+
+	/** Set Shipping Processor.
+		@param X_ShippingProcessor_ID Shipping Processor	  */
+	public void setX_ShippingProcessor_ID (int X_ShippingProcessor_ID)
+	{
+		if (X_ShippingProcessor_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_X_ShippingProcessor_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_X_ShippingProcessor_ID, Integer.valueOf(X_ShippingProcessor_ID));
+	}
+
+	/** Get Shipping Processor.
+		@return Shipping Processor	  */
+	public int getX_ShippingProcessor_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_X_ShippingProcessor_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set X_ShippingProcessor_UU.
+		@param X_ShippingProcessor_UU X_ShippingProcessor_UU	  */
+	public void setX_ShippingProcessor_UU (String X_ShippingProcessor_UU)
+	{
+		set_Value (COLUMNNAME_X_ShippingProcessor_UU, X_ShippingProcessor_UU);
+	}
+
+	/** Get X_ShippingProcessor_UU.
+		@return X_ShippingProcessor_UU	  */
+	public String getX_ShippingProcessor_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_X_ShippingProcessor_UU);
+	}
+}

org.adempiere.ui.swing/META-INF/MANIFEST.MF

@@ -86,5 +86,5 @@ Import-Package: javax.net.ssl,
  org.restlet.security,
  org.restlet.service,
  org.restlet.util
-Service-Component: OSGI-INF/defaultpaymentformfactory.xml, OSGI-INF/serverinterface.xml, OSGI-INF/statusinterface.xml
+Service-Component: OSGI-INF/defaultpaymentformfactory.xml, OSGI-INF/serverinterface.xml, OSGI-INF/statusinterface.xml, OSGI-INF/defaultprintshippinglabel.xml
 Bundle-ActivationPolicy: lazy

org.adempiere.ui.swing/OSGI-INF/defaultprintshippinglabel.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.swing.shipping.printlabel">
+   <implementation class="org.adempiere.process.DefaultPrintShippingLabel"/>
+   <service>
+      <provide interface="org.adempiere.process.IPrintShippingLabel"/>
+   </service>
+</scr:component>

org.adempiere.ui.swing/build.properties

@@ -6,6 +6,7 @@ bin.includes = META-INF/,\
                miglayout-3.7.1-swing.jar,\
                jpedal.jar,\
                OSGI-INF/,\
-               OSGI-INF/defaultpaymentformfactory.xml
+               OSGI-INF/defaultpaymentformfactory.xml,\
+               OSGI-INF/defaultprintshippinglabel.xml
 source.client.jar = src/
 output.client.jar = build/

org.adempiere.ui.swing/src/org/adempiere/process/DefaultPrintShippingLabel.java

@@ -0,0 +1,164 @@
+/******************************************************************************
+ * Copyright (C) 2012 Elaine Tan                                              *
+ * Copyright (C) 2012 Trek Global
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.process;
+
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.geom.AffineTransform;
+import java.awt.image.BufferedImage;
+import java.awt.print.Book;
+import java.awt.print.PageFormat;
+import java.awt.print.Paper;
+import java.awt.print.Printable;
+import java.awt.print.PrinterException;
+import java.awt.print.PrinterJob;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.imageio.ImageIO;
+import javax.print.Doc;
+import javax.print.DocFlavor;
+import javax.print.DocPrintJob;
+import javax.print.PrintService;
+import javax.print.SimpleDoc;
+import javax.print.attribute.HashDocAttributeSet;
+import javax.print.attribute.standard.DocumentName;
+
+import org.compiere.model.MAttachment;
+import org.compiere.model.MAttachmentEntry;
+import org.compiere.model.MShipperLabels;
+
+/**
+ * 
+ * @author Elaine
+ *
+ */
+public class DefaultPrintShippingLabel implements IPrintShippingLabel
+{
+	@Override
+	public String printToLabelPrinter(MAttachment attachment, MShipperLabels labelType) throws Exception
+	{
+		MAttachmentEntry[] entries = attachment.getEntries();
+		List<MAttachmentEntry> list = new ArrayList<MAttachmentEntry>();
+		if (entries != null && entries.length > 0) 
+		{
+			for (MAttachmentEntry entry : entries) 
+			{
+				if (entry.getName().startsWith("shipping_label"))
+					list.add(entry);
+			}
+			if (list.size() > 0) 
+			{
+				// Create Print Job				
+				PrinterJob pjob = PrinterJob.getPrinterJob();
+				if (pjob.printDialog()) 
+				{
+					PrintService service = pjob.getPrintService();					
+					DocFlavor flavor = DocFlavor.BYTE_ARRAY.AUTOSENSE;					
+					for (MAttachmentEntry entry : list) 
+					{
+						DocPrintJob job = service.createPrintJob();
+						HashDocAttributeSet as = new HashDocAttributeSet();
+						as.add(new DocumentName(entry.getName(), null));
+						Doc doc = new SimpleDoc(entry.getData(), flavor, as);
+						job.print(doc, null);
+					}					
+				}
+			}
+		}
+		return list.size() + " labels printed.";
+	}
+
+	@Override
+	public String printImageLabel(MAttachment attachment, MShipperLabels labelType, String title) throws Exception
+	{
+		MAttachmentEntry[] entries = attachment.getEntries();
+		List<BufferedImage> list = new ArrayList<BufferedImage>();
+		if (entries != null && entries.length > 0) 
+		{
+			for (MAttachmentEntry entry : entries) 
+			{
+				if (entry.getName().startsWith("shipping_label") && entry.isGraphic()) 
+				{
+					BufferedImage image = ImageIO.read(entry.getInputStream());
+					if (image != null)
+						list.add(image);
+				}
+			}
+			
+			if (list.size() > 0) 
+			{
+				// Create Print Job
+				Book book = new Book();
+				PrinterJob pjob = PrinterJob.getPrinterJob();
+				pjob.setJobName(title);
+				
+				if (pjob.printDialog()) 
+				{
+					PageFormat pf = pjob.pageDialog(pjob.defaultPage());
+					Paper p = pf.getPaper();
+					BigDecimal width = labelType.getWidth();
+					BigDecimal height = labelType.getHeight();
+					
+					if (width != null && width.compareTo(BigDecimal.ZERO) > 0 && height != null && height.compareTo(BigDecimal.ZERO) > 0) 
+					{
+						BigDecimal factor = new BigDecimal(72);
+						width = width.multiply(factor);
+						height = height.multiply(factor);
+						p.setImageableArea(p.getImageableX(), p.getImageableY(), width.doubleValue(), height.doubleValue());
+						pf.setPaper(p);
+					}
+					
+					for (BufferedImage image : list)
+						book.append(new ImagePrintable(image), pf);
+					
+					pjob.setPageable(book);
+					pjob.print();
+				}
+			}
+		}
+		return list.size() + " labels printed.";
+	}
+
+	final static class ImagePrintable implements Printable 
+	{
+		private BufferedImage image;
+
+		protected ImagePrintable(BufferedImage image) 
+		{
+			this.image = image;
+		}
+
+		public int print(Graphics graphics, PageFormat pageFormat, int pageIndex) throws PrinterException 
+		{
+			if (pageIndex > 0)
+				return Printable.NO_SUCH_PAGE;
+			
+			Graphics2D g2d = (Graphics2D) graphics;
+			// Set us to the upper left corner
+			g2d.translate(pageFormat.getImageableX(), pageFormat.getImageableY());
+			AffineTransform at = new AffineTransform();
+			at.translate(0, 0);
+
+			// We need to scale the image properly so that it fits on one page.
+			double xScale = pageFormat.getImageableWidth() / image.getWidth();
+			double yScale = pageFormat.getImageableHeight() / image.getHeight();
+			
+			at.scale(xScale, yScale);
+			g2d.drawRenderedImage(image, at);
+			return Printable.PAGE_EXISTS;
+		}
+	}
+}

org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromFactory.java

@@ -20,6 +20,7 @@ import org.compiere.model.GridTab;
 import org.compiere.model.I_C_BankStatement;
 import org.compiere.model.I_C_Invoice;
 import org.compiere.model.I_M_InOut;
+import org.compiere.model.I_M_PackageMPS;
 import org.compiere.model.I_M_RMA;
 import org.compiere.util.CLogger;
 import org.compiere.util.Env;
@@ -52,6 +53,8 @@ public class VCreateFromFactory
 		s_registeredClasses.put(I_C_BankStatement.Table_ID, VCreateFromStatementUI.class);
 		s_registeredClasses.put(I_M_InOut.Table_ID, VCreateFromShipmentUI.class);
 		s_registeredClasses.put(I_M_RMA.Table_ID, VCreateFromRMAUI.class);
+		
+		s_registeredClasses.put(I_M_PackageMPS.Table_ID, VCreateFromPackageShipmentUI.class);
 	}
 	
 	/**
@@ -62,7 +65,7 @@ public class VCreateFromFactory
 	public static ICreateFrom create (GridTab mTab)
 	{
 		//	dynamic init preparation
-		int AD_Table_ID = Env.getContextAsInt(Env.getCtx(), mTab.getWindowNo(), "BaseTable_ID");
+		int AD_Table_ID = Env.getContextAsInt(Env.getCtx(), mTab.getWindowNo(), mTab.getTabNo(), "_TabInfo_AD_Table_ID");
 
 		ICreateFrom retValue = null;
 		Class<? extends ICreateFrom> cl = s_registeredClasses.get(AD_Table_ID);
@@ -81,6 +84,24 @@ public class VCreateFromFactory
 		}
 		if (retValue == null)
 		{
+			AD_Table_ID = Env.getContextAsInt(Env.getCtx(), mTab.getWindowNo(), "BaseTable_ID");
+
+			retValue = null;
+			cl = s_registeredClasses.get(AD_Table_ID);
+			if (cl != null)
+			{
+				try
+				{
+					java.lang.reflect.Constructor<? extends ICreateFrom> ctor = cl.getConstructor(GridTab.class);
+					retValue = ctor.newInstance(mTab);
+				}
+				catch (Throwable e)
+				{
+					s_log.log(Level.SEVERE, e.getLocalizedMessage(), e);
+					return null;
+				}
+			}
+			
 			s_log.info("Unsupported AD_Table_ID=" + AD_Table_ID);
 			return null;
 		}

org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromPackageShipmentUI.java

@@ -0,0 +1,111 @@
+/******************************************************************************
+ * Copyright (C) 2012 Elaine Tan                                              *
+ * Copyright (C) 2012 Trek Global
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.compiere.grid;
+
+import java.util.Vector;
+import java.util.logging.Level;
+
+import javax.swing.table.DefaultTableModel;
+
+import org.compiere.apps.AEnv;
+import org.compiere.model.GridTab;
+import org.compiere.model.MPackage;
+import org.compiere.model.MPackageMPS;
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+
+/**
+ * 
+ * @author Elaine
+ *
+ */
+public class VCreateFromPackageShipmentUI extends CreateFromPackageShipment
+{
+	private VCreateFromDialog dialog;
+	
+	public VCreateFromPackageShipmentUI(GridTab mTab) 
+	{
+		super(mTab);
+		log.info(mTab.toString());
+		
+		dialog = new VCreateFromDialog(this, getGridTab().getWindowNo(), true);
+		
+		p_WindowNo = getGridTab().getWindowNo();
+
+		try
+		{
+			if (!dynInit())
+				return;
+
+			setInitOK(true);
+		}
+		catch(Exception e)
+		{
+			log.log(Level.SEVERE, "", e);
+			setInitOK(false);
+		}
+		AEnv.positionCenterWindow(AEnv.getWindow(p_WindowNo), dialog);
+	}
+	
+	/** Window No               */
+	private int p_WindowNo;
+
+	/**	Logger			*/
+	private CLogger log = CLogger.getCLogger(getClass());
+	
+	public boolean dynInit() throws Exception
+	{
+		log.config("");
+		
+		super.dynInit();
+		
+		dialog.setTitle(getTitle());
+
+		int M_PackageMPS_ID = (Integer) getGridTab().getValue(MPackageMPS.COLUMNNAME_M_Package_ID);
+		MPackageMPS packageMPS = new MPackageMPS(Env.getCtx(), M_PackageMPS_ID, null);
+		MPackage mPackage = new MPackage(Env.getCtx(), packageMPS.getM_Package_ID(), null);
+		loadTableOIS(getShipmentData(mPackage.getM_InOut_ID()));
+		
+		return true;
+	}
+	
+	protected void loadTableOIS (Vector<?> data)
+	{
+		//  Remove previous listeners
+		dialog.getMiniTable().getModel().removeTableModelListener(dialog);
+		//  Set Model
+		DefaultTableModel model = new DefaultTableModel(data, getOISColumnNames());
+		model.addTableModelListener(dialog);
+		dialog.getMiniTable().setModel(model);
+		// 
+		
+		configureMiniTable(dialog.getMiniTable());
+	}
+	
+	public void showWindow()
+	{
+		dialog.setVisible(true);
+	}
+	
+	public void closeWindow()
+	{
+		dialog.dispose();
+	}
+
+	@Override
+	public Object getWindow() 
+	{
+		return dialog;
+	}
+}

org.adempiere.ui.zk/META-INF/MANIFEST.MF

@@ -59,4 +59,4 @@ Bundle-Activator: org.adempiere.webui.WebUIActivator
 Eclipse-ExtensibleAPI: true
 Eclipse-RegisterBuddy: org.zkoss.zk.library
 Web-ContextPath: webui
-Service-Component: OSGI-INF/reportviewerprovider.xml, OSGI-INF/defaultinfofactory.xml, OSGI-INF/defaulteditorfactory.xml, OSGI-INF/jrviewerprovider.xml, OSGI-INF/resourcefinder.xml, OSGI-INF/defaultpaymentformfactory.xml, OSGI-INF/processfactory.xml
+Service-Component: OSGI-INF/reportviewerprovider.xml, OSGI-INF/defaultinfofactory.xml, OSGI-INF/defaulteditorfactory.xml, OSGI-INF/jrviewerprovider.xml, OSGI-INF/resourcefinder.xml, OSGI-INF/defaultpaymentformfactory.xml, OSGI-INF/processfactory.xml, OSGI-INF/defaultprintshippinglabel.xml

org.adempiere.ui.zk/OSGI-INF/defaultprintshippinglabel.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.zk.shipping.printlabel">
+   <implementation class="org.adempiere.webui.process.DefaultPrintShippingLabel"/>
+   <service>
+      <provide interface="org.adempiere.process.IPrintShippingLabel"/>
+   </service>
+</scr:component>

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/FedexLabelWindow.java

@@ -0,0 +1,136 @@
+/******************************************************************************
+ * Copyright (C) 2012 Elaine Tan                                              *
+ * Copyright (C) 2012 Trek Global
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.webui;
+
+import java.util.List;
+import java.util.logging.Level;
+
+import org.adempiere.webui.component.Button;
+import org.adempiere.webui.component.ConfirmPanel;
+import org.adempiere.webui.component.Listbox;
+import org.adempiere.webui.component.ListboxFactory;
+import org.adempiere.webui.component.VerticalBox;
+import org.adempiere.webui.component.Window;
+import org.compiere.model.MAttachmentEntry;
+import org.compiere.util.CLogger;
+import org.zkoss.util.media.AMedia;
+import org.zkoss.zk.au.out.AuScript;
+import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zk.ui.event.Events;
+import org.zkoss.zk.ui.util.Clients;
+import org.zkoss.zul.Iframe;
+import org.zkoss.zul.Separator;
+
+/**
+ * 
+ * @author Elaine
+ *
+ */
+public class FedexLabelWindow extends Window implements EventListener<Event>
+{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8850485069628076246L;
+	private List<MAttachmentEntry> images;
+	private Listbox lbx;
+	private Iframe content;
+	
+	private final static CLogger log = CLogger.getCLogger(FedexLabelWindow.class);
+
+	public FedexLabelWindow(List<MAttachmentEntry> images)
+	{
+		super();
+		this.images = images;
+		
+		init();
+	}
+	
+	private void init()
+	{
+		this.setBorder("normal");
+		this.setWidth("730px");
+		VerticalBox box = new VerticalBox();
+		this.appendChild(box);
+		lbx = ListboxFactory.newDropdownListbox();
+		for (MAttachmentEntry entry : images)
+			lbx.appendItem(entry.getName(), entry);
+		lbx.setSelectedIndex(0);
+		lbx.addEventListener(Events.ON_SELECT, this);
+		
+		box.appendChild(lbx);
+		box.appendChild(new Separator());
+		
+		content = new Iframe();
+		content.setHeight("500px");
+		content.setWidth("700px");
+		content.setId("content");
+		content.setName(content.getUuid());
+		box.appendChild(content);
+		
+		ConfirmPanel panel = new ConfirmPanel(false);		
+		panel.addActionListener(this);
+		Button btn = panel.createButton(ConfirmPanel.A_PRINT);
+		panel.addButton(btn);
+		btn.addEventListener(Events.ON_CLICK, this);
+		box.appendChild(new Separator());
+		box.appendChild(panel);
+		
+		try
+		{
+			loadContent();
+		} 
+		catch (Exception e) 
+		{
+			log.log(Level.SEVERE, e.getLocalizedMessage(), e);
+		}
+	}
+
+	private void loadContent() throws Exception 
+	{
+		MAttachmentEntry entry = (MAttachmentEntry) lbx.getSelectedItem().getValue();
+		String name = entry.getName();
+		name = name.substring(0, name.length() - 4);
+		String imageName = name + ".png";
+		MAttachmentEntry imageEntry = null;
+		for (MAttachmentEntry i : images) 
+		{
+			if (i.getName().equals(imageName)) 
+			{
+				imageEntry = i;
+				break;
+			}
+		}
+
+		AMedia media = new AMedia(entry.getName(), null, imageEntry.getContentType(), imageEntry.getData());
+		content.setContent(media);
+	}
+
+	public void onEvent(Event event) throws Exception 
+	{
+		if (event.getTarget().getId().equals(ConfirmPanel.A_OK))
+			this.detach();
+		else if (event.getTarget() == lbx)
+			loadContent();
+		else if (event.getTarget().getId().equals(ConfirmPanel.A_PRINT))
+		{
+			content.focus();
+			String script = "frames['" + content.getUuid() + "'].contentWindow.print()";
+			if (Executions.getCurrent() != null)
+				Clients.response(new AuScript(script));
+		}
+	}
+}

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/LabelAppletWindow.java

@@ -0,0 +1,79 @@
+/******************************************************************************
+ * Copyright (C) 2012 Low Heng Sin                                            *
+ * Copyright (C) 2012 Trek Global
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.webui;
+
+import java.util.List;
+import java.util.UUID;
+
+import javax.servlet.http.HttpSession;
+
+import org.adempiere.webui.component.ToolBarButton;
+import org.adempiere.webui.component.Window;
+import org.apache.commons.codec.binary.Base64;
+import org.zkoss.zk.au.out.AuScript;
+import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zk.ui.event.Events;
+import org.zkoss.zk.ui.util.Clients;
+import org.zkoss.zul.Div;
+
+/**
+ * 
+ * @author Low Heng Sin
+ *
+ */
+public class LabelAppletWindow extends Window implements EventListener<Event> 
+{	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8980224912104404397L;
+
+	public LabelAppletWindow(List<byte[]> list) 
+	{
+		super();
+		String uuid = UUID.randomUUID().toString();
+		HttpSession session = (HttpSession) Executions.getCurrent().getDesktop().getSession().getNativeSession();
+		session.setAttribute(uuid, list);
+		Div div = new Div();
+		appendChild(div);
+		
+		ToolBarButton link = new ToolBarButton();
+		link.setLabel("Click here to close this popup after printing is completed.");
+		link.addEventListener(Events.ON_CLICK, this);
+		appendChild(link);
+		
+		this.setBorder("normal");
+		
+		StringBuffer appletTag = new StringBuffer();
+		appletTag.append("<applet code='PrintLabelApplet.class' archive='labelapplet.jar' width=0 height=0>");
+		appletTag.append("<param name='key' value='" + uuid + "'>");
+		appletTag.append("<param name='size' value='" + list.size() + "'>");
+		
+		for(int i = 0; i < list.size(); i++)
+			appletTag.append("<param name='data_" + i + "' value='" + Base64.encodeBase64(list.get(i)) + "'>");
+		
+		appletTag.append("</applet>");
+		
+		String script = "document.getElementById('" + div.getUuid() + "').innerHTML=\"" + appletTag.toString() + "\";";
+		Clients.response(new AuScript(div, script));		
+	}
+
+	public void onEvent(Event event) throws Exception 
+	{
+		if (Events.ON_CLICK.equals(event.getName()))
+			this.detach();
+	}	
+}

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/UPSHtmlLabelWindow.java

@@ -0,0 +1,177 @@
+/******************************************************************************
+ * Copyright (C) 2012 Low Heng Sin                                            *
+ * Copyright (C) 2012 Trek Global
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.webui;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.logging.Level;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.adempiere.webui.component.Button;
+import org.adempiere.webui.component.ConfirmPanel;
+import org.adempiere.webui.component.Listbox;
+import org.adempiere.webui.component.ListboxFactory;
+import org.adempiere.webui.component.VerticalBox;
+import org.adempiere.webui.component.Window;
+import org.compiere.model.MAttachmentEntry;
+import org.compiere.util.CLogger;
+import org.zkoss.util.media.AMedia;
+import org.zkoss.zk.au.out.AuScript;
+import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.Page;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zk.ui.event.Events;
+import org.zkoss.zk.ui.util.Clients;
+import org.zkoss.zul.Iframe;
+import org.zkoss.zul.Separator;
+
+/**
+ * 
+ * @author Low Heng Sin
+ *
+ */
+public class UPSHtmlLabelWindow extends Window implements EventListener<Event> 
+{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3700882367300286247L;
+	private List<MAttachmentEntry> images;
+	private List<MAttachmentEntry> htmls;
+	private Listbox html;
+	private Iframe content;
+	
+	private final static CLogger log = CLogger.getCLogger(UPSHtmlLabelWindow.class);
+
+	public UPSHtmlLabelWindow(List<MAttachmentEntry> htmls, List<MAttachmentEntry> images)
+	{
+		super();
+		this.htmls = htmls;
+		this.images = images;
+		
+		init();
+	}
+	
+	private void init()
+	{
+		this.setBorder("normal");
+		this.setWidth("730px");
+		VerticalBox box = new VerticalBox();
+		this.appendChild(box);
+		html = ListboxFactory.newDropdownListbox();
+		for (MAttachmentEntry entry : htmls)
+			html.appendItem(entry.getName(), entry);
+		html.setSelectedIndex(0);
+		html.addEventListener(Events.ON_SELECT, this);
+		
+		box.appendChild(html);
+		box.appendChild(new Separator());
+		content = new Iframe();
+		content.setHeight("500px");
+		content.setWidth("700px");
+		content.setId("content");
+		content.setName(content.getUuid());
+		box.appendChild(content);
+		
+		ConfirmPanel panel = new ConfirmPanel(false);		
+		panel.addActionListener(this);
+		Button btn = panel.createButton(ConfirmPanel.A_PRINT);
+		panel.addButton(btn);
+		btn.addEventListener(Events.ON_CLICK, this);
+		box.appendChild(new Separator());
+		box.appendChild(panel);
+		
+		try 
+		{
+			loadContent();
+		} 
+		catch (Exception e) 
+		{
+			log.log(Level.SEVERE, e.getLocalizedMessage(), e);
+		}
+	}
+
+	private void loadContent() throws Exception 
+	{
+		MAttachmentEntry entry = (MAttachmentEntry) html.getSelectedItem().getValue();
+		String htmlData = new String(entry.getData());
+		String name = entry.getName();
+		name = name.substring(0, name.length() - 5);
+		String imageName = name + ".gif";
+		MAttachmentEntry imageEntry = null;
+		for (MAttachmentEntry i : images) 
+		{
+			if (i.getName().equals(imageName)) 
+			{
+				imageEntry = i;
+				break;
+			}
+		}
+		if (imageEntry != null) 
+		{
+			File tmp = File.createTempFile(name, ".gif");
+			FileOutputStream os = new FileOutputStream(tmp);
+			os.write(imageEntry.getData());
+			os.flush();
+			os.close();
+			
+			if (Executions.getCurrent() != null)
+			{
+				HttpServletRequest request = (HttpServletRequest) Executions.getCurrent().getNativeRequest();
+				String url = request.getContextPath() + "/gif.jsp?f=" + URLEncoder.encode(tmp.getAbsolutePath(),"UTF-8");
+				htmlData = htmlData.replace("./" + imageName, url);
+			}
+		}
+		AMedia media = new AMedia(entry.getName(), null, entry.getContentType(), htmlData);
+		content.setContent(media);
+	}
+	
+	public void onPageAttached(Page newpage, Page oldpage) 
+	{
+		super.onPageAttached(newpage, oldpage);
+		if (newpage != null) 
+		{
+			if (Executions.getCurrent() != null)
+			{
+				try 
+				{
+					loadContent();
+				} 
+				catch (Exception e) 
+				{
+					log.log(Level.SEVERE, e.getLocalizedMessage(), e);
+				}
+			}
+		}
+	}
+
+	public void onEvent(Event event) throws Exception 
+	{
+		if (event.getTarget().getId().equals(ConfirmPanel.A_OK))
+			this.detach();
+		else if (event.getTarget() == html)
+			loadContent();
+		else if (event.getTarget().getId().equals(ConfirmPanel.A_PRINT))
+		{
+			content.focus();
+			String script = "frames['" + content.getUuid() + "'].contentWindow.print()";
+			if (Executions.getCurrent() != null)
+				Clients.response(new AuScript(script));
+		}
+	}
+}

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromFactory.java

@@ -21,6 +21,7 @@ import org.compiere.model.GridTab;
 import org.compiere.model.I_C_BankStatement;
 import org.compiere.model.I_C_Invoice;
 import org.compiere.model.I_M_InOut;
+import org.compiere.model.I_M_PackageMPS;
 import org.compiere.model.I_M_RMA;
 import org.compiere.util.CLogger;
 import org.compiere.util.Env;
@@ -53,6 +54,8 @@ public class WCreateFromFactory
 		s_registeredClasses.put(I_C_BankStatement.Table_ID, WCreateFromStatementUI.class);
 		s_registeredClasses.put(I_M_InOut.Table_ID, WCreateFromShipmentUI.class);
 		s_registeredClasses.put(I_M_RMA.Table_ID, WCreateFromRMAUI.class);
+		
+		s_registeredClasses.put(I_M_PackageMPS.Table_ID, WCreateFromPackageShipmentUI.class);
 	}
 	
 	/**
@@ -63,7 +66,7 @@ public class WCreateFromFactory
 	public static ICreateFrom create (GridTab mTab)
 	{
 		//	dynamic init preparation
-		int AD_Table_ID = Env.getContextAsInt(Env.getCtx(), mTab.getWindowNo(), "BaseTable_ID");
+		int AD_Table_ID = Env.getContextAsInt(Env.getCtx(), mTab.getWindowNo(), mTab.getTabNo(), "_TabInfo_AD_Table_ID");
 
 		ICreateFrom retValue = null;
 		Class<? extends ICreateFrom> cl = s_registeredClasses.get(AD_Table_ID);
@@ -82,6 +85,24 @@ public class WCreateFromFactory
 		}
 		if (retValue == null)
 		{
+			AD_Table_ID = Env.getContextAsInt(Env.getCtx(), mTab.getWindowNo(), "BaseTable_ID");
+
+			retValue = null;
+			cl = s_registeredClasses.get(AD_Table_ID);
+			if (cl != null)
+			{
+				try
+				{
+					java.lang.reflect.Constructor<? extends ICreateFrom> ctor = cl.getConstructor(GridTab.class);
+					retValue = ctor.newInstance(mTab);
+				}
+				catch (Throwable e)
+				{
+					s_log.log(Level.SEVERE, e.getLocalizedMessage(), e);
+					return null;
+				}
+			}
+			
 			s_log.info("Unsupported AD_Table_ID=" + AD_Table_ID);
 			return null;
 		}

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromPackageShipmentUI.java

@@ -0,0 +1,108 @@
+/******************************************************************************
+ * Copyright (C) 2012 Elaine Tan                                              *
+ * Copyright (C) 2012 Trek Global
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.webui.apps.form;
+
+import java.util.Vector;
+import java.util.logging.Level;
+
+import org.adempiere.webui.apps.AEnv;
+import org.adempiere.webui.component.ListModelTable;
+import org.compiere.grid.CreateFromPackageShipment;
+import org.compiere.model.GridTab;
+import org.compiere.model.MPackage;
+import org.compiere.model.MPackageMPS;
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+
+/**
+ * 
+ * @author Elaine
+ *
+ */
+public class WCreateFromPackageShipmentUI extends CreateFromPackageShipment
+{
+	private WCreateFromWindow window;
+
+	public WCreateFromPackageShipmentUI(GridTab mTab) 
+	{
+		super(mTab);
+		log.info(mTab.toString());
+
+		window = new WCreateFromWindow(this, getGridTab().getWindowNo());
+
+		try
+		{
+			if (!dynInit())
+				return;
+			setInitOK(true);
+		}
+		catch(Exception e)
+		{
+			log.log(Level.SEVERE, "", e);
+			setInitOK(false);
+		}
+		AEnv.showWindow(window);
+	}
+
+	/**	Logger			*/
+	private CLogger log = CLogger.getCLogger(getClass());
+	
+	public boolean dynInit() throws Exception
+	{
+		log.config("");
+		
+		super.dynInit();
+		
+		window.setTitle(getTitle());
+
+		int M_PackageMPS_ID = (Integer) getGridTab().getValue(MPackageMPS.COLUMNNAME_M_Package_ID);
+		MPackageMPS packageMPS = new MPackageMPS(Env.getCtx(), M_PackageMPS_ID, null);
+		MPackage mPackage = new MPackage(Env.getCtx(), packageMPS.getM_Package_ID(), null);
+		loadTableOIS(getShipmentData(mPackage.getM_InOut_ID()));
+		
+		return true;
+	}
+	
+	protected void loadTableOIS (Vector<?> data)
+	{
+		window.getWListbox().clear();
+		
+		//  Remove previous listeners
+		window.getWListbox().getModel().removeTableModelListener(window);
+		//  Set Model
+		ListModelTable model = new ListModelTable(data);
+		model.addTableModelListener(window);
+		window.getWListbox().setData(model, getOISColumnNames());
+		//
+		
+		configureMiniTable(window.getWListbox());
+	}
+	
+	public void showWindow()
+	{
+		window.setVisible(true);
+	}
+	
+	public void closeWindow()
+	{
+		window.dispose();
+	}
+
+	@Override
+	public Object getWindow() 
+	{
+		return window;
+	}
+
+}

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DefaultPrintShippingLabel.java

@@ -0,0 +1,88 @@
+/******************************************************************************
+ * Copyright (C) 2012 Elaine Tan                                              *
+ * Copyright (C) 2012 Trek Global
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.webui.process;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.adempiere.process.IPrintShippingLabel;
+import org.adempiere.webui.FedexLabelWindow;
+import org.adempiere.webui.LabelAppletWindow;
+import org.adempiere.webui.UPSHtmlLabelWindow;
+import org.adempiere.webui.component.Window;
+import org.adempiere.webui.session.SessionManager;
+import org.compiere.model.MAttachment;
+import org.compiere.model.MAttachmentEntry;
+import org.compiere.model.MShipperLabels;
+
+/**
+ * 
+ * @author Elaine
+ *
+ */
+public class DefaultPrintShippingLabel implements IPrintShippingLabel
+{
+	private Window labelWindow;
+
+	public String printToLabelPrinter(MAttachment attachment, MShipperLabels labelType) throws Exception
+	{
+		MAttachmentEntry[] entries = attachment.getEntries();
+		List<byte[]> list = new ArrayList<byte[]>();
+		if (entries != null && entries.length > 0) 
+		{
+			for (MAttachmentEntry entry : entries) 
+			{
+				if (entry.getName().startsWith("shipping_label"))
+					list.add(entry.getData());
+			}
+			if (list.size() > 0) 
+			{
+				LabelAppletWindow law = new LabelAppletWindow(list);
+				law.setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED);
+				SessionManager.getAppDesktop().showWindow(law);
+			}
+		}
+		return list.size() + " labels loaded.";
+	}
+
+	public String printImageLabel(MAttachment attachment, MShipperLabels labelType, String title) throws Exception
+	{
+		MAttachmentEntry[] entries = attachment.getEntries();
+		List<MAttachmentEntry> htmls = new ArrayList<MAttachmentEntry>();
+		List<MAttachmentEntry> images = new ArrayList<MAttachmentEntry>();
+		if (entries != null && entries.length > 0) 
+		{
+			for (MAttachmentEntry entry : entries) 
+			{
+				if (entry.getName().endsWith(".html"))
+					htmls.add(entry);					
+				else if (entry.isGraphic())
+					images.add(entry);
+			}
+			if (htmls.size() > 0) 
+			{
+				labelWindow = new UPSHtmlLabelWindow(htmls, images);
+				labelWindow.setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED);
+				SessionManager.getAppDesktop().showWindow(labelWindow);
+			}
+			else if(images.size() > 0) 
+			{
+				labelWindow = new FedexLabelWindow(images);
+				labelWindow.setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED);
+				SessionManager.getAppDesktop().showWindow(labelWindow);
+			}
+		}
+		return htmls.size() + " labels loaded.";
+	}
+}

org.adempiere.ui.zk/build.properties

@@ -1,51 +1,52 @@
-output.. = WEB-INF/classes/
-bin.includes = META-INF/,\
-               WEB-INF/,\
-               css/,\
-               images/,\
-               index.zul,\
-               js/,\
-               theme/,\
-               theme.zs,\
-               zul/,\
-               timeout.zul,\
-               plugin.xml,\
-               WEB-INF/classes/,\
-               WEB-INF/lib/calendar.jar,\
-               calendar.css,\
-               calendar.zul,\
-               calendar_mini.zul,\
-               divarrow.zul,\
-               divtab.zul,\
-               OSGI-INF/,\
-               OSGI-INF/reportviewerprovider.xml,\
-               OSGI-INF/defaultinfofactory.xml,\
-               OSGI-INF/defaulteditorfactory.xml,\
-               OSGI-INF/jrviewerprovider.xml,\
-               OSGI-INF/resourcefinder.xml,\
-               OSGI-INF/defaultpaymentformfactory.xml,\
-               OSGI-INF/processfactory.xml,\
-               WEB-INF/lib/atmosphere-compat-jbossweb-1.0.4.jar,\
-               WEB-INF/lib/atmosphere-compat-tomcat-1.0.4.jar,\
-               WEB-INF/lib/atmosphere-compat-tomcat7-1.0.4.jar,\
-               WEB-INF/lib/atmosphere-runtime-1.0.4.jar
-src.includes = WEB-INF/classes/,\
-               WEB-INF/tld/,\
-               WEB-INF/web.xml,\
-               WEB-INF/xsd/,\
-               WEB-INF/zk.xml,\
-               css/,\
-               images/,\
-               index.zul,\
-               js/,\
-               theme/,\
-               theme.zs,\
-               zul/,\
-               calendar.css,\
-               calendar.zul,\
-               calendar_mini.zul,\
-               divarrow.zul,\
-               divtab.zul
-source.. = WEB-INF/src/
-bin.excludes = WEB-INF/src/,\
-               WEB-INF/web-2.5.xml
+output.. = WEB-INF/classes/
+bin.includes = META-INF/,\
+               WEB-INF/,\
+               css/,\
+               images/,\
+               index.zul,\
+               js/,\
+               theme/,\
+               theme.zs,\
+               zul/,\
+               timeout.zul,\
+               plugin.xml,\
+               WEB-INF/classes/,\
+               WEB-INF/lib/calendar.jar,\
+               calendar.css,\
+               calendar.zul,\
+               calendar_mini.zul,\
+               divarrow.zul,\
+               divtab.zul,\
+               OSGI-INF/,\
+               OSGI-INF/reportviewerprovider.xml,\
+               OSGI-INF/defaultinfofactory.xml,\
+               OSGI-INF/defaulteditorfactory.xml,\
+               OSGI-INF/jrviewerprovider.xml,\
+               OSGI-INF/resourcefinder.xml,\
+               OSGI-INF/defaultpaymentformfactory.xml,\
+               OSGI-INF/processfactory.xml,\
+               WEB-INF/lib/atmosphere-compat-jbossweb-1.0.4.jar,\
+               WEB-INF/lib/atmosphere-compat-tomcat-1.0.4.jar,\
+               WEB-INF/lib/atmosphere-compat-tomcat7-1.0.4.jar,\
+               WEB-INF/lib/atmosphere-runtime-1.0.4.jar,\
+               OSGI-INF/defaultprintshippinglabel.xml
+src.includes = WEB-INF/classes/,\
+               WEB-INF/tld/,\
+               WEB-INF/web.xml,\
+               WEB-INF/xsd/,\
+               WEB-INF/zk.xml,\
+               css/,\
+               images/,\
+               index.zul,\
+               js/,\
+               theme/,\
+               theme.zs,\
+               zul/,\
+               calendar.css,\
+               calendar.zul,\
+               calendar_mini.zul,\
+               divarrow.zul,\
+               divtab.zul
+source.. = WEB-INF/src/
+bin.excludes = WEB-INF/src/,\
+               WEB-INF/web-2.5.xml

org.adempiere.ui.zk/gif.jsp

@@ -0,0 +1,21 @@
+<%@ page language="java" contentType="image/gif"%>
+<%
+String fileName = request.getParameter("f");
+if (fileName != null && fileName.endsWith(".gif")) {
+	java.io.File f = new java.io.File(fileName);
+	if (f.exists() && f.canRead()) {
+		response.setContentLength(new Long(f.length()).intValue());
+		java.io.FileInputStream fis = new java.io.FileInputStream(f);
+		java.io.BufferedInputStream bis = new java.io.BufferedInputStream(fis);
+		java.io.OutputStream os = response.getOutputStream();
+		java.io.BufferedOutputStream bos = new java.io.BufferedOutputStream(os);
+		while (bis.available() > 0)
+		{
+			bos.write(bis.read());
+		}
+		bis.close();
+		bos.flush();
+		bos.close();
+	}
+}
+%>

org.adempiere.ui.zk/labeldata.jsp

@@ -0,0 +1,29 @@
+<%@page import="java.io.BufferedOutputStream"%>
+<%@page import="java.io.OutputStream"%>
+<%@ page language="java" contentType="application/octet-stream"%>
+<%
+	String key = request.getParameter("key");
+	if (key == null || key.trim().length() == 0 )
+		return;
+	
+	Object object = session.getAttribute(key);
+	if (object != null && object instanceof java.util.List) {
+		java.util.List list = (java.util.List)object;
+		System.out.println("size=" + list.size());
+		if (!list.isEmpty()) {
+			byte[] data = (byte[])list.remove(0);
+			System.out.println("length=" + data.length);
+			response.setContentLength(data.length);
+			
+			OutputStream os = response.getOutputStream();
+			BufferedOutputStream bos = new BufferedOutputStream(os);
+			bos.write(data);
+			bos.flush();
+		} else {
+			response.setContentLength(0);
+		}
+	} else {
+		System.out.println("key not found=" + key);
+		response.setContentLength(0);
+	}
+%>

org.adempiere.ui/src/org/compiere/grid/CreateFromPackageShipment.java

@@ -0,0 +1,168 @@
+/******************************************************************************
+ * Copyright (C) 2012 Elaine Tan                                              *
+ * Copyright (C) 2012 Trek Global
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.compiere.grid;
+
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Vector;
+import java.util.logging.Level;
+
+import org.compiere.minigrid.IMiniTable;
+import org.compiere.model.GridTab;
+import org.compiere.model.MInOut;
+import org.compiere.model.MInOutLine;
+import org.compiere.model.MPackage;
+import org.compiere.model.MPackageLine;
+import org.compiere.model.MPackageMPS;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.Msg;
+
+/**
+ * 
+ * @author Elaine
+ *
+ */
+public abstract class CreateFromPackageShipment extends CreateFrom
+{
+	public CreateFromPackageShipment(GridTab gridTab) 
+	{
+		super(gridTab);
+		log.info(gridTab.toString());
+	}
+	
+	public boolean dynInit() throws Exception
+	{
+		log.config("");
+		setTitle(Msg.getElement(Env.getCtx(), "M_PackageMPS_ID", false) + " .. " + Msg.translate(Env.getCtx(), "CreateFrom"));
+
+		return true;
+	}
+	
+	protected Vector<Vector<Object>> getShipmentData(int M_InOut_ID)
+	{
+		log.config("M_InOut_ID=" + M_InOut_ID);
+
+		Vector<Vector<Object>> data = new Vector<Vector<Object>>();
+		StringBuilder sqlStmt = new StringBuilder();
+        sqlStmt.append("SELECT M_InOutLine_ID, Line, Qty, M_Product_ID, ProductName, UOM ");
+        sqlStmt.append("FROM M_PACKAGELINES_AVAIL_V ");
+        sqlStmt.append("WHERE M_InOut_ID = ? ");
+        
+        try
+        {
+            PreparedStatement pstmt = DB.prepareStatement(sqlStmt.toString(), null);
+            pstmt.setInt(1, M_InOut_ID);           
+            ResultSet rs = pstmt.executeQuery();
+            while (rs.next())
+            {
+            	Vector<Object> line = new Vector<Object>(6);
+                line.add(new Boolean(false));           //  0-Selection
+                KeyNamePair lineKNPair = new KeyNamePair(rs.getInt(1), rs.getString(2)); // M_InOutLine_ID, Line
+                line.add(lineKNPair);
+                line.add(rs.getInt(3));	   				//Qty
+                KeyNamePair productKNPair = new KeyNamePair(rs.getInt(4), rs.getString(5)); // ProductID, Product Name
+                line.add(productKNPair);				//Product
+                //line.add(rs.getString(5)); 				
+                line.add(rs.getString(6)); 				//UOM
+                
+                data.add(line);
+            }
+            rs.close();
+            pstmt.close();
+        }
+        catch (SQLException e)
+        {
+            log.log(Level.SEVERE, sqlStmt.toString(), e);
+        }
+
+		return data;
+	}
+	
+	public void info()
+	{
+
+	}
+	
+	protected void configureMiniTable (IMiniTable miniTable)
+	{
+		miniTable.setColumnClass(0, Boolean.class, false);      //  0-Selection
+		miniTable.setColumnClass(1, String.class, true);        //  1-Line
+		miniTable.setColumnClass(2, Integer.class, false);      //  2-Qty
+		miniTable.setColumnClass(3, String.class, true);        //  3-Product
+		miniTable.setColumnClass(4, String.class, true);        //  4-UOM
+		//  Table UI
+		miniTable.autoSize();
+	}
+	
+	public boolean save(IMiniTable miniTable, String trxName)
+	{
+		int M_PackageMPS_ID = (Integer) getGridTab().getValue(MPackageMPS.COLUMNNAME_M_Package_ID);
+		MPackageMPS packageMPS = new MPackageMPS(Env.getCtx(), M_PackageMPS_ID, null);
+		
+		MPackage mPackage = new MPackage(Env.getCtx(), packageMPS.getM_Package_ID(), null);
+        MInOut shipment = new MInOut(Env.getCtx(), mPackage.getM_InOut_ID(), null);
+        MInOutLine[] shipmentLines = shipment.getLines(false);
+        
+        HashMap<Integer, MInOutLine> lineMap = new HashMap<Integer, MInOutLine>();
+        for (int k=0; k<shipmentLines.length; k++)
+        {
+        	MInOutLine line = shipmentLines[k];        	
+        	lineMap.put(line.getM_InOutLine_ID(), line);
+        }
+        
+        for (int i = 0; i < miniTable.getRowCount(); i++)
+		{
+			if (((Boolean)miniTable.getValueAt(i, 0)).booleanValue())
+            {
+            	int qty = (Integer)miniTable.getValueAt(i, 2);
+            	KeyNamePair pp = (KeyNamePair)miniTable.getValueAt(i, 1);   //  1-Line
+            	KeyNamePair prod = (KeyNamePair)miniTable.getValueAt(i, 3);   //  1-Prod
+                
+                int inOutLineId = pp.getKey();
+                int productId = prod.getKey();
+                
+                MPackageLine packageLine = new MPackageLine(mPackage);
+                packageLine.setInOutLine((MInOutLine)lineMap.get(inOutLineId));
+                packageLine.setM_Product_ID(productId);
+                packageLine.setQty(new BigDecimal(qty));
+                packageLine.setM_PackageMPS_ID(M_PackageMPS_ID);
+                
+                if (!packageLine.save(mPackage.get_TrxName()))
+                {
+                    throw new IllegalStateException("Could not create Package Line");
+                }
+            }
+        }
+        
+        return true;
+	}
+	
+	protected Vector<String> getOISColumnNames()
+	{
+		Vector<String> columnNames = new Vector<String>(5);
+		columnNames.add(Msg.getMsg(Env.getCtx(), "Select"));
+		columnNames.add(Msg.getMsg(Env.getCtx(), "Line"));
+		columnNames.add(Msg.translate(Env.getCtx(), "Quantity"));
+		columnNames.add(Msg.translate(Env.getCtx(), "M_Product_ID"));
+		columnNames.add(Msg.translate(Env.getCtx(), "C_UOM_ID"));
+		
+		return columnNames;
+	}
+
+}