Author: jacopoc
Date: Thu Dec 31 11:16:28 2009
New Revision: 894817
URL: http://svn.apache.org/viewvc?rev=894817&view=rev
Log:
Implemented new shipment subscreen showing the list of shipment receipts.
Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl
ofbiz/trunk/applications/product/widget/facility/InventoryForms.xml
ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml
ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=894817&r1=894816&r2=894817&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Thu Dec 31
11:16:28 2009
@@ -19056,6 +19056,10 @@
<value
xml:lang="th">ยà¸à¹à¸¥à¸´à¸à¸à¸²à¸£à¸à¸à¸ªà¹à¸à¸ªà¸³à¹à¸£à¹à¸à¸à¸¢à¹à¸²à¸à¸£à¸§à¸à¹à¸£à¹à¸§</value>
<value xml:lang="zh">å¿«éå®æç´æ¥éè´§</value>
</property>
+ <property key="ProductShipmentReceipts">
+ <value xml:lang="en">Shipment Receipts</value>
+ <value xml:lang="it">Ricevute di Spedizione</value>
+ </property>
<property key="ProductShipmentReceiptsFor">
<value xml:lang="de">Lieferbelege für</value>
<value xml:lang="en">Shipment Receipts for</value>
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=894817&r1=894816&r2=894817&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Thu
Dec 31 11:16:28 2009
@@ -1223,6 +1223,10 @@
<response name="error" type="view" value="EditShipmentItems"/>
</request-map>
-->
+ <request-map uri="ViewShipmentReceipts">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ViewShipmentReceipts"/>
+ </request-map>
<!-- ================ Inventory Reports Requests ================= -->
<request-map uri="InventoryReports">
@@ -1389,6 +1393,7 @@
<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="EditShipmentPlan" type="screen"
page="component://product/widget/facility/ShipmentScreens.xml#EditShipmentPlan"/>
+ <view-map name="ViewShipmentReceipts" type="screen"
page="component://product/widget/facility/ShipmentScreens.xml#ViewShipmentReceipts"/>
<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"/>
<view-map name="AddItemsFromOrder" type="screen"
page="component://product/widget/facility/ShipmentScreens.xml#AddItemsFromOrder"/>
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=894817&r1=894816&r2=894817&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl
(original)
+++
ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl
Thu Dec 31 11:16:28 2009
@@ -39,6 +39,9 @@
<li<#if selected="EditShipmentPackages"> class="selected"</#if>><a
href="<@ofbizUrl>EditShipmentPackages?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductPackages}</a></li>
<li<#if selected="EditShipmentRouteSegments">
class="selected"</#if>><a
href="<@ofbizUrl>EditShipmentRouteSegments?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductRouteSegments}</a></li>
</#if>
+ <#if (shipment.shipmentTypeId)?exists &&
shipment.shipmentTypeId='PURCHASE_SHIPMENT'>
+ <li<#if selected="ViewShipmentReceipts"> class="selected"</#if>><a
href="<@ofbizUrl>ViewShipmentReceipts?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductShipmentReceipts}</a></li>
+ </#if>
</ul>
<br/>
</div>
Modified: ofbiz/trunk/applications/product/widget/facility/InventoryForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/InventoryForms.xml?rev=894817&r1=894816&r2=894817&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/InventoryForms.xml
(original)
+++ ofbiz/trunk/applications/product/widget/facility/InventoryForms.xml Thu Dec
31 11:16:28 2009
@@ -51,8 +51,8 @@
<field name="productId">
<text>
<sub-hyperlink use-when="productId!=null"
target="/catalog/control/EditProduct" target-type="inter-app"
description="${uiLabelMap.ProductEditProduct} [${productId}]">
- <parameter param-name="productId"/>
- </sub-hyperlink>
+ <parameter param-name="productId"/>
+ </sub-hyperlink>
</text>
</field>
<field name="statusId" use-when="inventoryItem==null">
@@ -146,7 +146,6 @@
<field name="partyId"><display description="${person.firstName}
${person.lastName} ${partyGroup.groupName}
[${physicalInventoryAndVariance.partyId}]"/></field>
<field name="varianceReasonId"><display
description="${varianceReason.description}"/></field>
</form>
-
<form name="ViewInventoryItemShipmentReceipts" type="list" target=""
title="" list-name="shipmentReceiptList"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<actions>
Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml?rev=894817&r1=894816&r2=894817&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml
(original)
+++ ofbiz/trunk/applications/product/widget/facility/ShipmentForms.xml Thu Dec
31 11:16:28 2009
@@ -213,4 +213,26 @@
<submit button-type="button"/>
</field>
</form>
+ <form name="ShipmentReceipts" type="list" target="" title=""
list-name="shipmentReceiptList"
+ odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
+ <actions>
+ <entity-and entity-name="ShipmentReceipt"
list="shipmentReceiptList">
+ <field-map field-name="shipmentId" from-field="shipmentId"/>
+ </entity-and>
+ </actions>
+ <auto-fields-entity entity-name="ShipmentReceipt"
map-name="shipmentReceipt" default-field-type="display"/>
+ <field name="shipmentId"><hidden/></field>
+ <field name="orderItemSeqId"><hidden/></field>
+ <field name="orderId" widget-style="buttontext">
+ <hyperlink target="/ordermgr/control/orderview"
target-type="inter-app" description="${orderId} - ${orderItemSeqId}" >
+ <parameter param-name="orderId"/>
+ </hyperlink>
+ </field>
+ <field name="inventoryItemId" widget-style="buttontext">
+ <hyperlink target="EditInventoryItem"
description="${inventoryItemId}">
+ <parameter param-name="inventoryItemId"/>
+ </hyperlink>
+ </field>
+ </form>
+
</forms>
Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml?rev=894817&r1=894816&r2=894817&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Thu
Dec 31 11:16:28 2009
@@ -44,6 +44,7 @@
<actions>
<set field="shipmentId" from-field="parameters.shipmentId"/>
<entity-one entity-name="Shipment" value-field="shipment"/>
+ <set field="shipmentId" from-field="shipment.shipmentId"
global="true"/>
<get-related-one value-field="shipment"
to-value-field="facility" relation-name="DestinationFacility"/>
</actions>
<widgets>
@@ -62,6 +63,7 @@
<not><if-empty field="shipment"/></not>
</condition>
<widgets>
+ <label style="h1"
text="${uiLabelMap.ProductShipmentId}: ${shipment.shipmentId}"/>
<container>
<link style="buttontext"
text="${uiLabelMap.ProductGenerateShipmentManifestReport}"
target="ShipmentManifest.pdf">
<parameter
param-name="shipmentId" from-field="shipment.shipmentId"/>
@@ -292,6 +294,22 @@
</widgets>
</section>
</screen>
+ <screen name="ViewShipmentReceipts">
+ <section>
+ <actions>
+ <set field="titleProperty" value="ViewShipmentReceipts"/>
+ <set field="headerItem" value="shipment"/>
+ <set field="tabButtonItem" value="ViewShipmentReceipts"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonShipmentDecorator">
+ <decorator-section name="body">
+ <include-form name="ShipmentReceipts"
location="component://product/widget/facility/ShipmentForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="QuickShipOrder">
<section>
