You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/12/27 18:03:48 UTC
svn commit: r607089 - in /ofbiz/trunk/applications/order:
config/OrderUiLabels.properties webapp/ordermgr/order/orderitems.ftl
Author: jacopoc
Date: Thu Dec 27 09:03:41 2007
New Revision: 607089
URL: http://svn.apache.org/viewvc?rev=607089&view=rev
Log:
Added information about shipment receipts to the order detail screen.
Modified:
ofbiz/trunk/applications/order/config/OrderUiLabels.properties
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?rev=607089&r1=607088&r2=607089&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.properties Thu Dec 27 09:03:41 2007
@@ -830,6 +830,7 @@
OrderShipToAnotherParty=Ship to Another Party
OrderShipToParty=Ship to Party
OrderShipmentInformation=Shipment Information
+OrderShipmentReceived=Shipment Received
OrderShortfalled=Shortfalled
OrderShowAllNotes=Show All Notes
OrderShowThisItemsNotes=Show This Item's Notes
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=607089&r1=607088&r2=607089&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Thu Dec 27 09:03:41 2007
@@ -485,8 +485,8 @@
</#list>
</#if>
- <#-- now show item issuances (inventory item) per line item -->
- <#if itemIssuances?has_content>
+ <#-- now show item issuances (inventory item) per line item -->
+ <#if itemIssuances?has_content>
<#list itemIssuances as itemIssuance>
<tr>
<td align="right" colspan="2">
@@ -508,6 +508,31 @@
</tr>
</#list>
</#if>
+
+ <#-- now show shipment receipts per line item -->
+ <#assign shipmentReceipts = orderItem.getRelated("ShipmentReceipt")?if_exists>
+ <#if shipmentReceipts?has_content>
+ <#list shipmentReceipts as shipmentReceipt>
+ <tr>
+ <td align="right" colspan="2">
+ <div class="tabletext" style="font-size: xx-small;">
+ <#if shipmentReceipt.shipmentId?has_content>
+ <b><i>${uiLabelMap.OrderShipmentReceived}</i>:</b>
+ <a target="facility" href="/facility/control/ViewShipment?shipmentId=${shipmentReceipt.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${shipmentReceipt.shipmentId}</a>:${shipmentReceipt.shipmentItemSeqId?if_exists}
+ </#if>
+ ${shipmentReceipt.datetimeReceived}
+ <b><i>${uiLabelMap.FacilityInventory}</i>:</b>
+ <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${shipmentReceipt.inventoryItemId}</a>
+ </div>
+ </td>
+ <td align="center">
+ <div class="tabletext" style="font-size: xx-small;">${shipmentReceipt.quantityAccepted?string.number} / ${shipmentReceipt.quantityRejected?default(0)?string.number}</div>
+ </td>
+ <td colspan="4"> </td>
+ </tr>
+ </#list>
+ </#if>
+
</#list>
</#if>
<tr><td colspan="7"><hr class="sepbar"/></td></tr>