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 2008/07/29 15:28:55 UTC
svn commit: r680690 [2/2] - in /ofbiz/trunk/applications: accounting/config/
accounting/servicedef/ accounting/src/org/ofbiz/accounting/invoice/
order/config/ order/script/org/ofbiz/order/order/ order/servicedef/
order/src/org/ofbiz/order/order/ order/...
Modified: ofbiz/trunk/applications/product/servicedef/services_shipment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_shipment.xml?rev=680690&r1=680689&r2=680690&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_shipment.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_shipment.xml Tue Jul 29 06:28:52 2008
@@ -117,7 +117,18 @@
<auto-attributes include="pk" mode="IN" optional="false"/>
<attribute name="shipmentId" type="String" mode="OUT" optional="false"/>
</service>
-
+
+ <service name="createShipmentAndItemsForVendorReturn" default-entity-name="Shipment" engine="simple"
+ location="org/ofbiz/shipment/shipment/ShipmentServices.xml" invoke="createShipmentAndItemsForVendorReturn">
+ <description>Create a Return Shipment and ShipmentItems with primaryReturnId</description>
+ <required-permissions join-type="AND">
+ <check-permission permission="FACILITY" action="_CREATE"/>
+ </required-permissions>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <attribute name="shipmentId" type="String" mode="OUT" optional="false"/>
+ <override name="primaryReturnId" optional="false"/>
+ </service>
+
<service name="createShipment" default-entity-name="Shipment" engine="simple"
location="org/ofbiz/shipment/shipment/ShipmentServices.xml" invoke="createShipment" auth="true">
<description>Create Shipment</description>
@@ -416,7 +427,18 @@
<attribute name="cancelQuantity" type="Double" mode="IN" optional="true"/>
<attribute name="canceledQuantity" type="Double" mode="OUT" optional="false"/>
</service>
-
+
+ <service name="issueInventoryItemToShipment" engine="simple"
+ location="org/ofbiz/shipment/issuance/IssuanceServices.xml" invoke="issueInventoryItemToShipment" auth="true">
+ <description>Issue an InventoryItem to a Shipment</description>
+ <attribute name="shipmentId" type="String" mode="IN" optional="false"/>
+ <attribute name="shipmentItemSeqId" type="String" mode="IN" optional="false"/>
+ <attribute name="inventoryItemId" type="String" mode="IN" optional="false"/>
+ <attribute name="quantity" type="Double" mode="IN" optional="false"/>
+ <attribute name="totalIssuedQty" type="Double" mode="IN" optional="false"/>
+ <attribute name="itemIssuanceId" type="String" mode="OUT" optional="false"/>
+ </service>
+
<!-- Pack Order Services -->
<service name="packSingleItem" engine="java"
location="org.ofbiz.shipment.packing.PackingServices" invoke="addPackLine" auth="true">
Added: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy?rev=680690&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy (added)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy Tue Jul 29 06:28:52 2008
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.condition.EntityCondition;
+import org.ofbiz.entity.condition.EntityOperator;
+
+shipmentId = parameters.shipmentId;
+items = [];
+shipment = delegator.findOne("Shipment", [shipmentId : shipmentId], false);
+partyId = shipment.partyIdTo;
+shipmentItems = shipment.getRelated("ShipmentItem");
+shipmentItems.each { shipmentItem ->
+ productId = shipmentItem.productId;
+ internalName = shipmentItem.getRelated("Product").internalName;
+ EntityCondition cond = EntityCondition.makeCondition([EntityCondition.makeCondition("returnId", shipment.primaryReturnId),
+ EntityCondition.makeCondition("productId", productId)], EntityOperator.AND);
+ returnItem = EntityUtil.getFirst(delegator.findList("ReturnItem", cond, null, null, null, true));
+ returnQuantity = Double.valueOf(returnItem.returnQuantity);
+
+ shipmentItemQty = Double.valueOf(shipmentItem.quantity);
+ itemIssuances = shipmentItem.getRelated("ItemIssuance", [shipmentId : shipmentId, shipmentItemSeqId : shipmentItem.shipmentItemSeqId], ["inventoryItemId"]);
+ totalQtyIssued = 0;
+ issuedItems = [];
+ itemIssuances.each { itemIssuance ->
+ totalQtyIssued = totalQtyIssued + Double.valueOf(itemIssuance.quantity);
+ inventoryItemId = itemIssuance.inventoryItemId;
+ quantity = itemIssuance.quantity;
+ issuedItems.add([inventoryItemId : itemIssuance.inventoryItemId,
+ quantity : itemIssuance.quantity]);
+ }
+ qtyStillNeedToBeIssued = returnQuantity - totalQtyIssued;
+ items.add([shipmentId : shipmentId,
+ shipmentItemSeqId : shipmentItem.shipmentItemSeqId,
+ returnId : returnItem.returnId,
+ returnItemSeqId : returnItem.returnItemSeqId,
+ orderId : returnItem.orderId,
+ partyId : partyId,
+ productId : productId,
+ internalName : internalName,
+ shipmentItemQty : shipmentItemQty,
+ returnQuantity : returnQuantity,
+ totalQtyIssued : totalQtyIssued,
+ issuedItems : issuedItems,
+ qtyStillNeedToBeIssued : qtyStillNeedToBeIssued,
+ ]);
+}
+context.shipmentId = shipmentId;
+context.items = items;
\ No newline at end of file
Propchange: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=680690&r1=680689&r2=680690&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Tue Jul 29 06:28:52 2008
@@ -765,6 +765,14 @@
<response name="success" type="view" value="EditShipment"/>
<response name="error" type="view" value="EditShipment"/>
</request-map>
+
+ <request-map uri="createShipmentAndItemsForVendorReturn">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="createShipmentAndItemsForVendorReturn"/>
+ <response name="success" type="view" value="EditShipment"/>
+ <response name="error" type="view" value="EditShipment"/>
+ </request-map>
+
<request-map uri="setShipmentSettingsFromPrimaryOrder">
<security https="true" auth="true"/>
<event type="service" path="" invoke="setShipmentSettingsFromPrimaryOrder"/>
@@ -1048,6 +1056,16 @@
<response name="success" type="view" value="ReceiveInventoryAgainstPurchaseOrder"/>
<response name="error" type="view" value="ReceiveInventoryAgainstPurchaseOrder"/>
</request-map>
+ <request-map uri="AddItemsFromInventory">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="AddItemsFromInventory"/>
+ </request-map>
+ <request-map uri="issueInventoryItemToShipment">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="issueInventoryItemToShipment"/>
+ <response name="success" type="view" value="AddItemsFromInventory"/>
+ <response name="error" type="view" value="AddItemsFromInventory"/>
+ </request-map>
<!-- ================ Shipment Items From Order Requests ================= -->
<request-map uri="EditShipmentPlan">
<security https="true" auth="true"/>
@@ -1101,7 +1119,7 @@
<request-map uri="LookupFacility"><security https="true" auth="true"/><response name="success" type="view" value="LookupFacility"/></request-map>
<request-map uri="LookupFacilityLocation"><security auth="true" https="true"/><response name="success" type="view" value="LookupFacilityLocation"/></request-map>
<request-map uri="LookupPartyName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
-
+ <request-map uri="LookupInventoryItem"><security https="true" auth="true"/><response name="success" type="view" value="LookupInventoryItem"/></request-map>
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -1169,6 +1187,7 @@
<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"/>
+ <view-map name="AddItemsFromInventory" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#AddItemsFromInventory"/>
<view-map name="ReceiveInventoryAgainstPurchaseOrder" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#ReceiveInventoryAgainstPurchaseOrder"/>
<view-map name="QuickShipOrder" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#QuickShipOrder"/>
@@ -1186,5 +1205,6 @@
<view-map name="LookupFacility" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupFacility"/>
<view-map name="LookupFacilityLocation" page="component://product/widget/facility/LookupScreens.xml#LookupFacilityLocation" type="screen"/>
<view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
+ <view-map name="LookupInventoryItem" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupInventoryItem"/>
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml?rev=680690&r1=680689&r2=680690&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml Tue Jul 29 06:28:52 2008
@@ -128,5 +128,18 @@
<field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
<field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
<field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
+ </form>
+
+ <form name="ListInventoryItem" list-name="inventoryItems" title="" type="list" paginate-target="LookupInventoryItem"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar" view-size="10">
+ <field name="inventoryItemId" widget-style="buttontext">
+ <hyperlink also-hidden="false" target-type="plain" description="${inventoryItemId}" target="javascript:set_value('${inventoryItemId}')"/>
+ </field>
+ <field name="inventoryItemTypeId"><display-entity entity-name="InventoryItemType"/></field>
+ <field name="facilityId"><display/></field>
+ <field name="locationSeqId"><display/></field>
+ <field name="quantityOnHandTotal"><display/></field>
+ <field name="availableToPromiseTotal"><display/></field>
+ <field name="unitCost"><display/></field>
</form>
</forms>
Added: ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl?rev=680690&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl (added)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl Tue Jul 29 06:28:52 2008
@@ -0,0 +1,76 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.ProductIssueInventoryItemsToShipment}: [${shipmentId?if_exists}]</li>
+ </ul>
+ </div>
+ <div class="screenlet-body">
+ <table cellspacing="0" cellpadding="2" class="basic-table hover-bar">
+ <tr class="header-row">
+ <td>${uiLabelMap.CommonReturn} ${uiLabelMap.CommonDescription}</td>
+ <td>${uiLabelMap.ProductProduct}</td>
+ <td>${uiLabelMap.OrderReturnQty}</td>
+ <td>${uiLabelMap.ProductShipmentQty}</td>
+ <td>${uiLabelMap.ProductTotIssuedQuantity}</td>
+ <td></td>
+ <td>${uiLabelMap.CommonQty} ${uiLabelMap.CommonNot} ${uiLabelMap.ManufacturingIssuedQuantity}</td>
+ <td>${uiLabelMap.ProductInventoryItemId} ${uiLabelMap.CommonQty} ${uiLabelMap.CommonSubmit}</td>
+ </tr>
+ <#list items as item>
+ <tr>
+ <td><a href="/ordermgr/control/returnMain?returnId=${item.returnId}" class="buttontext">${item.returnId}</a> [${item.returnItemSeqId}]</td>
+ <td><a href="/catalog/control/EditProductInventoryItems?productId=${item.productId}" class="buttontext">${item.productId}</a> ${item.internalName?if_exists}</td>
+ <td>${item.returnQuantity}</td>
+ <td>${item.shipmentItemQty}</td>
+ <td>${item.totalQtyIssued}</td>
+ <td>
+ <#if item.issuedItems?has_content>
+ <#list item.issuedItems as issuedItem>
+ <div><a href="/facility/control/EditInventoryItem?inventoryItemId=${issuedItem.inventoryItemId}" class="buttontext">${issuedItem.inventoryItemId}</a> ${issuedItem.quantity}</div>
+ </#list>
+ </#if>
+ </td>
+ <td>${item.qtyStillNeedToBeIssued}</td>
+ <#if (item.shipmentItemQty > item.totalQtyIssued)>
+ <td>
+ <div>
+ <form name="issueInventoryItemToShipment" action="<@o...@ofbizUrl>" method="post">
+ <input type="hidden" name="shipmentId" value="${shipmentId}"/>
+ <input type="hidden" name="shipmentItemSeqId" value="${item.shipmentItemSeqId}"/>
+ <input type="hidden" name="totalIssuedQty" value="${item.totalQtyIssued}"/>
+ <span>
+ <input type="text" size="5" name="inventoryItemId"/>
+ <a href="javascript:call_fieldlookup2(document.issueInventoryItemToShipment.inventoryItemId,'LookupInventoryItem?orderId=${item.orderId}&partyId=${item.partyId}&productId=${item.productId}');">
+ <img src="/images/fieldlookup.gif" width="15" height="14" border="0" alt="Lookup">
+ </a>
+ </span>
+ <input type="text" size="5" name="quantity"/>
+ <input type="submit" value="${uiLabelMap.CommonSubmit}" class="smallSubmit"/>
+ </form>
+ </div>
+ </td>
+ </#if>
+ </tr>
+ </#list>
+ </table>
+ </div>
+</div>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml?rev=680690&r1=680689&r2=680690&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml Tue Jul 29 06:28:52 2008
@@ -22,10 +22,10 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="EditShipment" type="single" target="updateShipment" title="" default-map-name="shipment"
header-row-style="header-row" default-table-style="basic-table">
- <alt-target use-when="shipment==null" target="createShipment"/>
+ <alt-target use-when="shipment==null&&shipmentTypeId==null" target="createShipment"/>
+ <alt-target use-when="shipment==null&&shipmentTypeId!=null&&shipmentTypeId.equals("PURCHASE_RETURN")" target="createShipmentAndItemsForVendorReturn"/>
<auto-fields-service service-name="updateShipment"/>
-
<field use-when="shipment!=null" name="shipmentId" title="${uiLabelMap.ProductShipmentId}" tooltip="${uiLabelMap.ProductNotModificationRecreatingProductShipment}"><display/></field>
<field use-when="shipment==null&&shipmentId!=null" name="shipmentId" title="${uiLabelMap.ProductShipmentId}" tooltip="${uiLabelMap.ProductCouldNotFindProductShipmentWithId} [${shipmentId}]"><display description="" also-hidden="false"/></field>
<field use-when="shipment==null&&shipmentId==null" name="shipmentId" title="${uiLabelMap.ProductShipmentId}" ><ignored/></field>
@@ -52,6 +52,7 @@
</drop-down>
</field>
<field name="primaryOrderId" title="${uiLabelMap.ProductPrimaryOrderId}"><lookup target-form-name="LookupOrderHeader"/></field>
+ <field name="primaryReturnId" title="${uiLabelMap.ProductPrimaryReturnId}"></field>
<field name="primaryShipGroupSeqId" title="${uiLabelMap.ProductPrimaryShipGroupSeqId}"><text/></field>
<field name="estimatedReadyDate" title="${uiLabelMap.ProductEstimatedReadyDate}"><date-time/></field>
<field name="estimatedShipDate" title="${uiLabelMap.ProductEstimatedShipDate}"><date-time/></field>
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=680690&r1=680689&r2=680690&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl Tue Jul 29 06:28:52 2008
@@ -28,7 +28,12 @@
<#if shipment.shipmentTypeId?exists && shipment.shipmentTypeId='SALES_SHIPMENT'>
<li<#if selected="EditShipmentPlan"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ProductShipmentPlan}</a></li>
</#if>
+ <#if shipment.shipmentTypeId?exists && (shipment.shipmentTypeId = "SALES_SHIPMENT" || shipment.shipmentTypeId = "PURCHASE_SHIPMENT")>
<li<#if selected="AddItemsFromOrder"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.ProductOrderItems}</a></li>
+ </#if>
+ <#if shipment.shipmentTypeId?exists && shipment.shipmentTypeId="PURCHASE_RETURN">
+ <li<#if selected="AddItemsFromInventory"> class="selected"</#if>><a href="<@o...@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}</#...@ofbizUrl>">${uiLabelMap.ProductReceiveInventory}</a></li>
</#if>
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl?rev=680690&r1=680689&r2=680690&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl Tue Jul 29 06:28:52 2008
@@ -43,6 +43,10 @@
<td width="80%" align="left"><#if shipment.primaryOrderId?exists><a href="/ordermgr/control/orderview?orderId=${shipment.primaryOrderId}" class="buttontext">${shipment.primaryOrderId}</a></#if></td>
</tr>
<tr>
+ <td width="20%" align="right" class="label">${uiLabelMap.ProductPrimaryReturnId}</td>
+ <td width="80%" align="left"><#if shipment.primaryReturnId?exists><a href="/ordermgr/control/returnMain?returnId=${shipment.primaryReturnId}" class="buttontext">${shipment.primaryReturnId}</a></#if></td>
+ </tr>
+ <tr>
<td width="20%" align="right" class="label">${uiLabelMap.ProductPrimaryShipGroupSeqId}</td>
<td width="80%" align="left">${shipment.primaryShipGroupSeqId?if_exists}</td>
</tr>
Modified: ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml?rev=680690&r1=680689&r2=680690&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/LookupScreens.xml Tue Jul 29 06:28:52 2008
@@ -94,5 +94,21 @@
</decorator-screen>
</widgets>
</section>
- </screen>
+ </screen>
+
+ <screen name="LookupInventoryItem">
+ <section>
+ <actions>
+ <set field="title" value="${uiLabelMap.LookupInventoryItem}"/>
+ <service service-name="getInventoryItemForAssociatedOrderSupplierAndProduct" auto-field-map="parameters"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-results">
+ <include-form name="ListInventoryItem" location="component://product/webapp/facility/lookup/FieldLookupForms.xml" />
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml?rev=680690&r1=680689&r2=680690&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/ShipmentScreens.xml Tue Jul 29 06:28:52 2008
@@ -121,7 +121,7 @@
<set field="titleProperty" value="ProductEditShipment"/>
<set field="headerItem" value="shipment"/>
<set field="tabButtonItem" value="EditShipment"/>
-
+ <set field="shipmentTypeId" from-field="parameters.shipmentTypeId"/>
<script location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy"/>
</actions>
<widgets>
@@ -406,4 +406,25 @@
</section>
</screen>
+ <screen name="AddItemsFromInventory">
+ <section>
+ <actions>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="titleProperty" value="ProductAddItemsFromInventory"/>
+ <set field="headerItem" value="shipment"/>
+ <set field="tabButtonItem" value="AddItemsFromInventory"/>
+ <script location="component://product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromInventory.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonShipmentDecorator">
+ <decorator-section name="body">
+ <platform-specific>
+ <html><html-template location="component://product/webapp/facility/shipment/AddItemsFromInventory.ftl"/></html>
+ </platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>