Author: jacopoc
Date: Thu Dec 31 09:10:09 2009
New Revision: 894797
URL: http://svn.apache.org/viewvc?rev=894797&view=rev
Log:
Improved shipment tab bar:
1) action links are now moved out of the menu, in the body of the page
2) fixed issue preventing the facility name to appear in the "receive
inventory" tab
Modified:
ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl
ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
Modified:
ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl?rev=894797&r1=894796&r2=894797&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl
(original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl
Thu Dec 31 09:10:09 2009
@@ -22,9 +22,6 @@
<div><a
href="<@ofbizUrl>setShipmentSettingsFromPrimaryOrder?shipmentId=${shipmentId}</@ofbizUrl>"
class="buttontext">${uiLabelMap.ProductSettingsFromPrimaryOrder}
[${shipment.primaryOrderId}]</a></div>
</#if>
-->
-<#if shipmentId?has_content>
- <div><a
href="<@ofbizUrl>ShipmentManifest.pdf?shipmentId=${shipmentId}</@ofbizUrl>"
class="buttontext"
target="_blank">${uiLabelMap.ProductGenerateShipmentManifestReport}</a></div>
-</#if>
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
Modified:
ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl?rev=894797&r1=894796&r2=894797&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl
Thu Dec 31 09:10:09 2009
@@ -34,12 +34,6 @@
<#if (shipment.shipmentTypeId)?exists &&
shipment.shipmentTypeId="PURCHASE_RETURN">
<li<#if selected="AddItemsFromInventory">
class="selected"</#if>><a
href="<@ofbizUrl>AddItemsFromInventory?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductOrderItems}</a></li>
</#if>
- <#if (shipment.shipmentTypeId)?exists &&
shipment.shipmentTypeId='PURCHASE_SHIPMENT' &&
shipment.destinationFacilityId?exists>
- <li<#if selected="ReceiveInventory"> class="selected"</#if>><a
href="<@ofbizUrl>ReceiveInventory?shipmentId=${shipmentId}&facilityId=${shipment.destinationFacilityId?if_exists}<#if
shipment.primaryOrderId?exists>&purchaseOrderId=${shipment.primaryOrderId}</#if></@ofbizUrl>">${uiLabelMap.ProductReceiveInventory}</a></li>
- </#if>
- <#if (shipment.shipmentTypeId)?exists &&
shipment.shipmentTypeId='PURCHASE_SHIPMENT' &&
shipment.destinationFacilityId?exists && shipment.primaryOrderId?exists>
- <li<#if selected="ProductReceiveInventoryAgainstPO">
class="selected"</#if>><a
href="<@ofbizUrl>ReceiveInventoryAgainstPurchaseOrder?shipmentId=${shipmentId?if_exists}&purchaseOrderId=${shipment.primaryOrderId?if_exists}</@ofbizUrl>">${uiLabelMap.ProductReceiveInventoryAgainstPO}</a></li>
- </#if>
<#if (shipment.shipmentTypeId)?exists &&
shipment.shipmentTypeId='SALES_SHIPMENT'>
<li<#if selected="EditShipmentItems"> class="selected"</#if>><a
href="<@ofbizUrl>EditShipmentItems?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductItems}</a></li>
<li<#if selected="EditShipmentPackages"> class="selected"</#if>><a
href="<@ofbizUrl>EditShipmentPackages?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductPackages}</a></li>
Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml?rev=894797&r1=894796&r2=894797&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Thu
Dec 31 09:10:09 2009
@@ -44,6 +44,7 @@
<actions>
<set field="shipmentId" from-field="parameters.shipmentId"/>
<entity-one entity-name="Shipment" value-field="shipment"/>
+ <get-related-one value-field="shipment"
to-value-field="facility" relation-name="DestinationFacility"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -56,6 +57,54 @@
<platform-specific>
<html><html-template
location="component://product/webapp/facility/shipment/ShipmentTabBar.ftl"/></html>
</platform-specific>
+ <section>
+ <condition>
+ <not><if-empty field="shipment"/></not>
+ </condition>
+ <widgets>
+ <container>
+ <link style="buttontext"
text="${uiLabelMap.ProductGenerateShipmentManifestReport}"
target="ShipmentManifest.pdf">
+ <parameter
param-name="shipmentId" from-field="shipment.shipmentId"/>
+ </link>
+ </container>
+ </widgets>
+ </section>
+ <section>
+ <condition>
+ <and>
+ <not><if-empty
field="shipment"/></not>
+ <not><if-empty
field="facility"/></not>
+ <if-compare
field="shipment.shipmentTypeId" operator="equals" value="PURCHASE_SHIPMENT"/>
+ </and>
+ </condition>
+ <widgets>
+ <container>
+ <link style="buttontext"
text="${uiLabelMap.ProductReceiveInventory}" target="ReceiveInventory">
+ <parameter
param-name="shipmentId" from-field="shipment.shipmentId"/>
+ <parameter
param-name="facilityId" from-field="facility.facilityId"/>
+ <parameter
param-name="purchaseOrderId" from-field="shipment.primaryOrderId"/>
+ </link>
+ </container>
+ </widgets>
+ </section>
+ <section>
+ <condition>
+ <and>
+ <not><if-empty
field="shipment"/></not>
+ <not><if-empty
field="facility"/></not>
+ <if-compare
field="shipment.shipmentTypeId" operator="equals" value="PURCHASE_SHIPMENT"/>
+ <not><if-empty
field="shipment.primaryOrderId"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <container>
+ <link style="buttontext"
text="${uiLabelMap.ProductReceiveInventoryAgainstPO}"
target="ReceiveInventoryAgainstPurchaseOrder">
+ <parameter
param-name="shipmentId" from-field="shipment.shipmentId"/>
+ <parameter
param-name="purchaseOrderId" from-field="shipment.primaryOrderId"/>
+ </link>
+ </container>
+ </widgets>
+ </section>
<decorator-section-include name="body"/>
</widgets>
@@ -90,11 +139,6 @@
<widgets>
<decorator-screen name="CommonShipmentDecorator">
<decorator-section name="body">
- <container>
- <link style="buttontext"
text="${uiLabelMap.ProductGenerateShipmentManifestReport}"
target="ShipmentManifest.pdf">
- <parameter param-name="shipmentId"
from-field="shipment.shipmentId"/>
- </link>
- </container>
<platform-specific>
<html><html-template
location="component://product/webapp/facility/shipment/ViewShipmentInfo.ftl"/></html>
</platform-specific>
@@ -113,6 +157,11 @@
<html><html-template
location="component://product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl"/></html>
</platform-specific>
</screenlet>
+ <screenlet id="shipmentReceiptPanel"
title="${uiLabelMap.PageTitleViewShipmentReceipts}" initially-collapsed="true">
+ <platform-specific>
+ <html><html-template
location="component://product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
