Posted by
jacopoc on
Sep 12, 2006; 10:40am
URL: http://ofbiz.116.s1.nabble.com/svn-commit-r442545-in-incubator-ofbiz-trunk-applications-product-webapp-facility-shipment-AddItemsFrl-tp209021.html
Author: jacopoc
Date: Tue Sep 12 02:40:30 2006
New Revision: 442545
URL:
http://svn.apache.org/viewvc?view=rev&rev=442545Log:
Small ui changes to better support drop shipments.
Modified:
incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl
incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl
Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl?view=diff&rev=442545&r1=442544&r2=442545==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl Tue Sep 12 02:40:30 2006
@@ -37,10 +37,11 @@
<#if orderHeader?exists>
<#if orderHeader.orderTypeId == "SALES_ORDER" && shipment.shipmentTypeId?if_exists != "SALES_SHIPMENT">
<div class="head3" style="color: red;">${uiLabelMap.ProductWarningOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId?if_exists)}, ${uiLabelMap.ProductNotSalesShipment}.</div>
- <#elseif orderHeader.orderTypeId == "PURCHASE_ORDER" && shipment.shipmentTypeId?if_exists != "PURCHASE_SHIPMENT">
+ <#elseif orderHeader.orderTypeId == "PURCHASE_ORDER" && shipment.shipmentTypeId?if_exists != "PURCHASE_SHIPMENT" && shipment.shipmentTypeId?if_exists != "DROP_SHIPMENT">
<div class="head3" style="color: red;">${uiLabelMap.ProductWarningOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId?if_exists)}, ${uiLabelMap.ProductNotPurchaseShipment}.</div>
<#else>
<div class="head3">${uiLabelMap.ProductNoteOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId?if_exists)}.</div>
+ <div class="head3">${uiLabelMap.ProductShipmentType}: ${shipment.shipmentTypeId?if_exists}.</div>
</#if>
<#if shipment.shipmentTypeId?if_exists == "SALES_SHIPMENT">
<div class="head3">${uiLabelMap.ProductOriginFacilityIs}: <#if originFacility?exists>${originFacility.facilityName?if_exists} [${originFacility.facilityId}]<#else><span style="color: red;">${uiLabelMap.ProductNotSet}</span></#if></div>
Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl?view=diff&rev=442545&r1=442544&r2=442545==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl Tue Sep 12 02:40:30 2006
@@ -28,11 +28,10 @@
<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>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>
+ <#if shipment.shipmentTypeId?exists && shipment.shipmentTypeId='PURCHASE_SHIPMENT' && shipment.destinationFacilityId?exists>
+ <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>
+ <#if shipment.shipmentTypeId?exists && shipment.shipmentTypeId='SALES_SHIPMENT'>
<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>