Index: applications/product/servicedef/services_shipment.xml
===================================================================
--- applications/product/servicedef/services_shipment.xml	(revision 393)
+++ applications/product/servicedef/services_shipment.xml	(working copy)
@@ -554,4 +554,16 @@
         <description>Generic Shipment Cost Estimate Calc Service - Use ShipmentCostEstimate Entities</description>
         <implements service="calcShipmentEstimateInterface"/>
     </service>
+
+    <service name="createInventoryTransfersForTransferShipment" default-entity-name="Shipment" engine="java"
+            location="org.ofbiz.shipment.shipment.ShipmentServices" invoke="createInventoryTransfersForTransferShipment">
+        <description>For a TRANSFER shipment, automatically completes all inventory transfers related to the item issuances on
+        	the shipment.</description>
+        <required-permissions join-type="AND">
+            <check-permission permission="FACILITY" action="_CREATE"/>
+        </required-permissions>
+        <attribute name="shipmentId" type="String" mode="IN" optional="false"/>
+        <attribute name="inventoryTransferId" type="String" mode="IN" optional="true"/>
+    </service>
+    
 </services>
Index: applications/product/servicedef/secas_shipment.xml
===================================================================
--- applications/product/servicedef/secas_shipment.xml	(revision 393)
+++ applications/product/servicedef/secas_shipment.xml	(working copy)
@@ -105,4 +105,11 @@
         <condition field-name="shipmentPackageSeqId" operator="equals" value="New"/>
         <action service="createShipmentPackage" mode="sync"/>
     </eca>
+
+    <eca service="updateShipment" event="commit">
+        <condition field-name="statusId" operator="equals" value="SHIPMENT_DELIVERED"/>
+        <condition field-name="shipmentTypeId" operator="equals" value="TRANSFER"/>
+        <action service="createInventoryTransfersForTransferShipment" mode="sync"/>
+    </eca>
+
 </service-eca>
Index: applications/product/widget/facility/ShipmentScreens.xml
===================================================================
--- applications/product/widget/facility/ShipmentScreens.xml	(revision 393)
+++ applications/product/widget/facility/ShipmentScreens.xml	(working copy)
@@ -148,6 +148,28 @@
             </widgets>
         </section>
     </screen>
+    <screen name="EditTransferShipmentItems">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleEditTransferShipmentItems"/>
+                <set field="headerItem" value="shipment"/>
+                <set field="tabButtonItem" value="EditTransferShipmentItems"/>
+                <!-- bsh script to find all shipment items and to find all inventory items eligible for
+                	transfer as part of this shipment -->
+                <script location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.bsh"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonShipmentDecorator">
+                    <decorator-section name="body">
+                    	<label style="head2">${uiLabelMap.ProductShipmentItemsToBeTransferred}</label>
+                        <!-- here: a list of shipment items with the ability to remove them from shipment -->
+                    	<label style="head2">${uiLabelMap.ProductInventoryItems}</label>
+                        <!-- here: a list of inventory items and input box to add them as inventory transfers -->
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
     <screen name="EditShipmentPlan">
         <section>
             <actions>
Index: applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
===================================================================
--- applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java	(revision 393)
+++ applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java	(working copy)
@@ -889,4 +889,56 @@
         // don't return an error
         return ServiceUtil.returnSuccess();
     }
+
+    public static Map createInventoryTransfersForTransferShipment(DispatchContext dctx, Map context) {
+    	GenericDelegator delegator = dctx.getDelegator();
+    	LocalDispatcher dispatcher = dctx.getDispatcher();
+        GenericValue userLogin = (GenericValue) context.get("userLogin");
+
+        String shipmentId = (String) context.get("shipmentId");
+    	Map results = ServiceUtil.returnSuccess();
+    	
+    	try {
+        	GenericValue shipment = delegator.findByPrimaryKey("Shipment", UtilMisc.toMap("shipmentId", shipmentId));
+        	if (shipment == null) {
+        		return ServiceUtil.returnError("No shipment was found for shipmentId [" + shipmentId + "]");
+        	} else if (!shipment.getString("shipmentTypeId").equals("TRANSFER")) {
+        		Debug.logInfo("Shipment [" + shipmentId + "] is not a transfer shipment, returning success", module);
+        		return ServiceUtil.returnSuccess();
+        	}
+        	
+        	// get all the item issuances and complete their inventory transfers
+        	List itemIssuances = shipment.getRelated("ItemIssuance");
+        	for (Iterator it = itemIssuances.iterator(); it.hasNext(); ) {
+        		GenericValue itemIssuance = (GenericValue) it.next();
+        		
+        		List inventoryTransfers = itemIssuance.getRelated("InventoryTransfer");
+        		for (Iterator it2 = inventoryTransfers.iterator(); it2.hasNext(); ) {
+                    GenericValue inventoryTransfer = (GenericValue) it2.next();        		
+        			Map tmpResult = dispatcher.runSync("completeInventoryTransfer", UtilMisc.toMap("inventoryTransferId", inventoryTransfer.get("inventoryTransferId"), "userLogin", userLogin));
+        			if (ServiceUtil.isError(tmpResult)) {
+        				return tmpResult;
+        			}
+        		}
+        		
+        		/* Map tmpResult = dispatcher.runSync("createInventoryTransfer", UtilMisc.toMap("xferQty", itemIssuance.getDouble("quantity"),
+        				"inventoryItemId", itemIssuance.getString("inventoryItemId"), "facilityIdTo", shipment.getString("destinationFacilityId"),
+						"itemIssuanceId", itemIssuance.getString("itemIssuanceId"), "userLogin", userLogin));
+        		if (ServiceUtil.isError(tmpResult)) {
+        			return tmpResult;
+        		} else if (tmpResult.get("inventoryTransferId") == null) {
+        			return ServiceUtil.returnError("No inventoryTransferId from inventory transfer of item issuance [" + itemIssuance.getString("itemIssuanceId") + "], result is " + tmpResult);
+        		} else {
+        			// this means it ran correctly - now complete the inventory transfer
+        			
+        		 }
+        		Debug.logInfo("--REMOVE--inventory transfer created for " + itemIssuance, module); */
+        	}
+        } catch (GenericEntityException ex) {
+        	return ServiceUtil.returnError(ex.getMessage());
+        } catch (GenericServiceException ex) {
+        	return ServiceUtil.returnError(ex.getMessage());
+        } 
+    	return results;
+    }
 }
Index: applications/product/entitydef/entitygroup.xml
===================================================================
--- applications/product/entitydef/entitygroup.xml	(revision 393)
+++ applications/product/entitydef/entitygroup.xml	(working copy)
@@ -105,6 +105,7 @@
     <entity-group group="org.ofbiz" entity="InventoryItemDetailSummary" />
     <entity-group group="org.ofbiz" entity="InventoryItemStatus" />
     <entity-group group="org.ofbiz" entity="InventoryItemTempRes" />
+    <entity-group group="org.ofbiz" entity="InventoryItemAndTransfer" />
     <entity-group group="org.ofbiz" entity="InventoryItemType" />
     <entity-group group="org.ofbiz" entity="InventoryItemTypeAttr" />
     <entity-group group="org.ofbiz" entity="InventoryItemVariance" />
Index: applications/product/entitydef/entitymodel.xml
===================================================================
--- applications/product/entitydef/entitymodel.xml	(revision 393)
+++ applications/product/entitydef/entitymodel.xml	(working copy)
@@ -1280,6 +1280,35 @@
         <key-map field-name="itemIssuanceId"/>
       </relation>
     </entity>
+    <view-entity entity-name="InventoryItemAndTransfer"
+    	    package-name="org.ofbiz.product.inventory"
+    	    title="View entity combining Inventory Item and Transfer">
+       <description>This entity combines InventoryItem and InventoryTransfer to allow searching for
+       	a particular product which are to be transferred</description>
+       <!-- defines which entities are part of this view-entity -->
+       <member-entity entity-alias="II" entity-name="InventoryItem"/>
+       <member-entity entity-alias="IT" entity-name="InventoryTransfer"/>
+       <!-- alias and alias-all bring in the fields of the member entities to the view-entity -->
+       <alias-all entity-alias="II">
+       	   <exclude field="facilityId"/>
+       	   <exclude field="locationSeqId"/>
+       	   <exclude field="statusId"/>
+       </alias-all>
+       <alias-all entity-alias="IT"/>
+       <!-- view-link defines how the join is made between the member-entities to create the view-entity
+       	as is it is an "inner join" but you can also define outer joins with a "rel-optional" tag -->
+       <view-link entity-alias="II" rel-entity-alias="IT">
+       	   <key-map field-name="inventoryItemId"/>
+       </view-link>
+       <!-- these relations link you back to other entities from your view-entity with .getRelatedOne (or
+       	.getRelatedByAnd, .getRelated methods) -->
+       <relation rel-entity-name="InventoryItem" type="one">
+       	   <key-map field-name="inventoryItemId"/>
+       </relation>
+       <relation rel-entity-name="InventoryTransfer" type="one">
+       	   <key-map field-name="inventoryTransferId"/>
+       </relation>
+    </view-entity>
     <entity entity-name="Lot"
             package-name="org.ofbiz.product.inventory"
             title="Lot Entity">
Index: applications/product/webapp/facility/WEB-INF/controller.xml
===================================================================
--- applications/product/webapp/facility/WEB-INF/controller.xml	(revision 393)
+++ applications/product/webapp/facility/WEB-INF/controller.xml	(working copy)
@@ -747,6 +747,15 @@
         <response name="error" type="view" value="EditShipmentItems"/>
     </request-map>
 
+    <!-- ================ Special Requests for Transfer Shipments ================= -->
+    <request-map uri="EditTransferShipmentItems">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditTransferShipmentItems"/>
+    </request-map>
+<!-- service to take inventoryItemId
+	1) create ShipmentItem; 2) create an ItemIssuance; and 3) create an InventoryTransfer
+	maybe a service to remove items from inventory -->
+	
     <!-- ================ Shipment Packages Requests ================= -->
     <request-map uri="EditShipmentPackages">
         <security https="true" auth="true"/>
@@ -997,6 +1006,7 @@
     <view-map name="ViewShipment" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#ViewShipment"/>
     <view-map name="EditShipment" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#EditShipment"/>
     <view-map name="EditShipmentItems" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#EditShipmentItems"/>
+    <view-map name="EditTransferShipmentItems" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#EditTransferShipmentItems"/>
     <view-map name="EditShipmentPlan" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#EditShipmentPlan"/>
     <view-map name="EditShipmentPackages" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#EditShipmentPackages"/>
     <view-map name="EditShipmentRouteSegments" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#EditShipmentRouteSegments"/>
Index: applications/product/webapp/facility/shipment/ShipmentTabBar.ftl
===================================================================
--- applications/product/webapp/facility/shipment/ShipmentTabBar.ftl	(revision 393)
+++ applications/product/webapp/facility/shipment/ShipmentTabBar.ftl	(working copy)
@@ -37,12 +37,17 @@
     <#if shipment.shipmentTypeId?exists && shipment.shipmentTypeId='SALES_SHIPMENT'>
       <a href="<@ofbizUrl>EditShipmentPlan?shipmentId=${shipmentId}</@ofbizUrl>" class="${selectedClassMap.EditShipmentPlan?default(unselectedClassName)}">${uiLabelMap.ProductShipmentPlan}</a>
     </#if>
-    <a href="<@ofbizUrl>AddItemsFromOrder?shipmentId=${shipmentId}</@ofbizUrl>" class="${selectedClassMap.AddItemsFromOrder?default(unselectedClassName)}">${uiLabelMap.ProductOrderItems}</a>
     <#if shipment.shipmentTypeId?exists && shipment.shipmentTypeId='PURCHASE_SHIPMENT'>
       <#if shipment.destinationFacilityId?exists>
+        <a href="<@ofbizUrl>AddItemsFromOrder?shipmentId=${shipmentId}</@ofbizUrl>" class="${selectedClassMap.AddItemsFromOrder?default(unselectedClassName)}">${uiLabelMap.ProductOrderItems}</a>
         <a href="<@ofbizUrl>ReceiveInventory?shipmentId=${shipmentId}&facilityId=${shipment.destinationFacilityId?if_exists}<#if shipment.primaryOrderId?exists>&purchaseOrderId=${shipment.primaryOrderId}</#if></@ofbizUrl>" class="${selectedClassMap.ReceiveInventory?default(unselectedClassName)}">${uiLabelMap.ProductReceiveInventory}</a>
       </#if>
-    <#else>
+    <#elseif shipment.shipmentTypeId?exists && shipment.shipmentTypeId='TRANSFER'>
+      <a href="<@ofbizUrl>EditTransferShipmentItems?shipmentId=${shipmentId}</@ofbizUrl>" class="${selectedClassMap.EditTransferShipmentItems?default(unselectedClassName)}">${uiLabelMap.ProductTransferShipmentItems}</a>
+      <a href="<@ofbizUrl>EditShipmentPackages?shipmentId=${shipmentId}</@ofbizUrl>" class="${selectedClassMap.EditShipmentPackages?default(unselectedClassName)}">${uiLabelMap.ProductPackages}</a>
+      <a href="<@ofbizUrl>EditShipmentRouteSegments?shipmentId=${shipmentId}</@ofbizUrl>" class="${selectedClassMap.EditShipmentRouteSegments?default(unselectedClassName)}">${uiLabelMap.ProductRouteSegments}</a>
+    <#else> <#-- probably a sales shipment -->
+      <a href="<@ofbizUrl>AddItemsFromOrder?shipmentId=${shipmentId}</@ofbizUrl>" class="${selectedClassMap.AddItemsFromOrder?default(unselectedClassName)}">${uiLabelMap.ProductOrderItems}</a>
       <a href="<@ofbizUrl>EditShipmentItems?shipmentId=${shipmentId}</@ofbizUrl>" class="${selectedClassMap.EditShipmentItems?default(unselectedClassName)}">${uiLabelMap.ProductItems}</a>
       <a href="<@ofbizUrl>EditShipmentPackages?shipmentId=${shipmentId}</@ofbizUrl>" class="${selectedClassMap.EditShipmentPackages?default(unselectedClassName)}">${uiLabelMap.ProductPackages}</a>
       <a href="<@ofbizUrl>EditShipmentRouteSegments?shipmentId=${shipmentId}</@ofbizUrl>" class="${selectedClassMap.EditShipmentRouteSegments?default(unselectedClassName)}">${uiLabelMap.ProductRouteSegments}</a>