ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mrisal...@apache.org
Subject svn commit: r609427 [2/2] - in /ofbiz/trunk/applications/product: config/ webapp/facility/facility/ webapp/facility/group/ webapp/facility/inventory/ widget/facility/
Date Sun, 06 Jan 2008 22:06:05 GMT
Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl?rev=609427&r1=609426&r2=609427&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl Sun Jan  6 14:06:04 2008
@@ -16,232 +16,239 @@
 specific language governing permissions and limitations
 under the License.
 -->
-    <#if illegalInventoryItem?exists>
-        <div class="errorMessage">${illegalInventoryItem}</div>
-    </#if>
-
-    <span class="head1">${uiLabelMap.ProductInventoryTransfer}</span> <span class="head2">${uiLabelMap.CommonFrom}&nbsp;<#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityId?if_exists}]</span>
-    <div class="button-bar">
-      <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <ul>
+            <li class="head3">${uiLabelMap.ProductInventoryTransfer} ${uiLabelMap.CommonFrom} <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityId?if_exists}]</li>
+            <li><a href="<@ofbizUrl>PickMoveStockSimple?facilityId=${facilityId?if_exists}</@ofbizUrl>">${uiLabelMap.CommonPrint}</a></li>
+        </ul>
+        <br class="clear"/>
     </div>
-
-<#--    <table border="0" cellpadding="2" cellspacing="0">  -->
-
-   <#if !(inventoryItem?exists)>
-        <form method="post" action="<@ofbizUrl>TransferInventoryItem</@ofbizUrl>" style="margin: 0;">
-         <table border="0" cellpadding="2" cellspacing="0">
-        <tr>
-            <td width="25%" align="right">${uiLabelMap.ProductInventoryItemId}</td>
-            <td width="6%">&nbsp;</td>
-            <td width="25%">
-            <input type="text" name="inventoryItemId" size="20" maxlength="20">
-            <input type="hidden" name="facilityId" value="${facilityId}">
-            </td>
-            <td width="50%">
-            <input type="submit" value="${uiLabelMap.ProductGetItem}">
-            </td>
-        </tr>
-        </table>
-        </form>
-    <#else>
-       <#if !(inventoryTransfer?exists)>
-            <form method="post" action="<@ofbizUrl>CreateInventoryTransfer</@ofbizUrl>" name="transferform" style="margin: 0;">
-        <#else>
-            <form method="post" action="<@ofbizUrl>UpdateInventoryTransfer</@ofbizUrl>" name="transferform" style="margin: 0;">
-            <input type="hidden" name="inventoryTransferId" value="${inventoryTransferId?if_exists}">
+    <div class="screenlet-body">
+      <#if illegalInventoryItem?exists>
+            <div class="errorMessage">${illegalInventoryItem}</div>
         </#if>
 
-        <script language="JavaScript" type="text/javascript">
-            function setNow(field) { eval('document.transferform.' + field + '.value="${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}"'); }
-        </script>
-
-        <table border="0" cellpadding="2" cellspacing="0">
-        <input type="hidden" name="inventoryItemId" value="${inventoryItemId?if_exists}">
-        <input type="hidden" name="facilityId" value="${facilityId?if_exists}">
-        <input type="hidden" name="locationSeqId" value="${(inventoryItem.locationSeqId)?if_exists}">
-        <tr>
-            <td width="14%">&nbsp;</td>
-            <td width="6%"align="right">${uiLabelMap.ProductInventoryItemId}</td>
-            <td width="6%">&nbsp;</td>
-            <td width="74%">
-            <b>${inventoryItemId}</b>
-            </td>
-        </tr>
-
-        <tr>
-            <td width="14%">&nbsp;</td>
-            <td width="6%" align="right" nowrap>${uiLabelMap.ProductInventoryItemTypeId}</td>
-            <td width="6%">&nbsp;</td>
-            <td width="74%">
-            <#if inventoryItemType?exists>
-                ${(inventoryItemType.get("description",locale))?if_exists}
+        <div class="button-bar">
+          <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
+        </div>
+
+       <#if !(inventoryItem?exists)>
+            <form method="post" action="<@ofbizUrl>TransferInventoryItem</@ofbizUrl>">
+            <table cellspacing="0" class="basic-table">
+            <tr>
+                <td width="25%" align="right" class="label">${uiLabelMap.ProductInventoryItemId}</td>
+                <td width="6%">&nbsp;</td>
+                <td width="25%">
+                <input type="text" name="inventoryItemId" size="20" maxlength="20">
+                <input type="hidden" name="facilityId" value="${facilityId}">
+                </td>
+                <td width="50%">
+                <input type="submit" value="${uiLabelMap.ProductGetItem}">
+                </td>
+            </tr>
+            </table>
+            </form>
+        <#else>
+           <#if !(inventoryTransfer?exists)>
+                <form method="post" action="<@ofbizUrl>CreateInventoryTransfer</@ofbizUrl>" name="transferform" style="margin: 0;">
+            <#else>
+                <form method="post" action="<@ofbizUrl>UpdateInventoryTransfer</@ofbizUrl>" name="transferform" style="margin: 0;">
+                <input type="hidden" name="inventoryTransferId" value="${inventoryTransferId?if_exists}">
             </#if>
-            </td>
-        </tr>
-        <tr>
-            <td width="14%">&nbsp;</td>
-            <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductProductId}</div></td>
-            <td width="6%">&nbsp;</td>
-            <td width="74%">
-                <#if inventoryItem?exists && (inventoryItem.productId)?exists>
-                    <a href="/catalog/control/EditProduct?productId=${(inventoryItem.productId)?if_exists}" class="buttontext">${(inventoryItem.productId)?if_exists}</a>
-                </#if>
-            </td>
-        </tr>
-        <tr>
-            <td width="14%">&nbsp;</td>
-            <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductStatus}</div></td>
-            <td width="6%">&nbsp;</td>
-            <td width="74%">${(inventoryStatus.get("description",locale))?default("--")}</td>
-        </tr>
-
-        <tr>
-            <td width="14%">&nbsp;</td>
-            <td width="6%" align="right" nowrap>${uiLabelMap.ProductComments}</td>
-            <td width="6%">&nbsp;</td>
-            <td width="74%">${(inventoryItem.comments)?default("--")}</td>
-        </tr>
 
-        <tr>
-            <td width="14%">&nbsp;</td>
-            <td width="6%" align="right" nowrap><div class="tabletext">${uiLabelMap.ProductSerialAtpQoh}</div></td>
-            <td width="6%">&nbsp;</td>
-            <#if inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("NON_SERIAL_INV_ITEM")>
+            <script language="JavaScript" type="text/javascript">
+                function setNow(field) { eval('document.transferform.' + field + '.value="${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}"'); }
+            </script>
+
+            <table cellspacing="0" class="basic-table">
+            <input type="hidden" name="inventoryItemId" value="${inventoryItemId?if_exists}">
+            <input type="hidden" name="facilityId" value="${facilityId?if_exists}">
+            <input type="hidden" name="locationSeqId" value="${(inventoryItem.locationSeqId)?if_exists}">
+            <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%"align="right"><span class="label">${uiLabelMap.ProductInventoryItemId}</span></td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">${inventoryItemId}</td>
+            </tr>
+            <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductInventoryItemTypeId}</td>
+                <td width="6%">&nbsp;</td>
                 <td width="74%">
-                    ${(inventoryItem.availableToPromiseTotal)?if_exists}&nbsp;
-                    /&nbsp;${(inventoryItem.quantityOnHandTotal)?if_exists}
+                <#if inventoryItemType?exists>
+                    ${(inventoryItemType.get("description",locale))?if_exists}
+                </#if>
                 </td>
-            <#elseif inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("SERIALIZED_INV_ITEM")>
-                <td width="74%">${(inventoryItem.serialNumber)?if_exists}</td>
-            <#elseif inventoryItem?exists>
-                <td class="alert" width="74%">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)?if_exists} ${uiLabelMap.ProductUnknownSpecifyType}.</td>
-            </#if>
-        </tr>
-    <tr>
-        <td width="14%">&nbsp;</td>
-        <td colspan="3"><hr/></td>
-    </tr>
-    <tr>
-        <td width="14%">&nbsp;</td>
-        <td width="6%" align="left" nowrap>${uiLabelMap.ProductTransferStatus}</td>
-        <td width="6%">&nbsp;</td>
-        <td width="74%">
-        <select name="statusId">
-            <#if (inventoryTransfer.statusId)?exists>
-                <#assign curStatusItem = inventoryTransfer.getRelatedOneCache("StatusItem")>
-                <option value="${(inventoryTransfer.statusId)?if_exists}">${(curStatusItem.get("description",locale))?if_exists}</option>
-            </#if>
-            <#list statusItems as statusItem>
-            <option value="${(statusItem.statusId)?if_exists}">${(statusItem.get("description",locale))?if_exists}</option>
-            </#list>
-        </select>
-        </td>
-    </tr>
-    <tr>
-       <td width="14%">&nbsp;</td>
-        <td width="6%" align="right" nowrap>${uiLabelMap.ProductTransferSendDate}</td>
-        <td width="6%">&nbsp;</td>
-        <td width="74%">
-        <input type="text" name="sendDate" value="${(inventoryTransfer.sendDate)?if_exists}" size="22">
-        <a href="#" onclick="setNow('sendDate')" class="buttontext">${uiLabelMap.CommonNow}</a>
-        </td>
-    </tr>
-    <#if !(inventoryTransfer?exists)>
+            </tr>
+            <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductProductId}</span></td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                    <#if inventoryItem?exists && (inventoryItem.productId)?exists>
+                        <a href="/catalog/control/EditProduct?productId=${(inventoryItem.productId)?if_exists}" class="buttontext">${(inventoryItem.productId)?if_exists}</a>
+                    </#if>
+                </td>
+            </tr>
+            <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductStatus}</span></td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">${(inventoryStatus.get("description",locale))?default("--")}</td>
+            </tr>
+
+            <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductComments}</span></td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">${(inventoryItem.comments)?default("--")}</td>
+            </tr>
+
+            <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductSerialAtpQoh}</span></td>
+                <td width="6%">&nbsp;</td>
+                <#if inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("NON_SERIAL_INV_ITEM")>
+                    <td width="74%">
+                        ${(inventoryItem.availableToPromiseTotal)?if_exists}&nbsp;
+                        /&nbsp;${(inventoryItem.quantityOnHandTotal)?if_exists}
+                    </td>
+                <#elseif inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("SERIALIZED_INV_ITEM")>
+                    <td width="74%">${(inventoryItem.serialNumber)?if_exists}</td>
+                <#elseif inventoryItem?exists>
+                    <td class="alert" width="74%">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)?if_exists} ${uiLabelMap.ProductUnknownSpecifyType}.</td>
+                </#if>
+            </tr>
         <tr>
             <td width="14%">&nbsp;</td>
-            <td width="6%" align="right" nowrap>${uiLabelMap.ProductToFacilityContainer}</td>
-            <td width="6%">&nbsp;</td>
-            <td width="74%">
-            ${uiLabelMap.ProductSelectFacility}:
-            <select name="facilityIdTo">
-                <#list facilities as nextFacility>
-                <option value="${(nextFacility.facilityId)?if_exists}">${(nextFacility.facilityName)?if_exists} [${(nextFacility.facilityId)?if_exists}]</option>
-                </#list>
-            </select>
-            <br/>
-            ${uiLabelMap.ProductOrEnterContainerId}:
-            <input type="text" name="containerIdTo" value="${(inventoryTransfer.containerIdTo)?if_exists}" size="20" maxlength="20">
-            </td>
+            <td colspan="3"><hr/></td>
         </tr>
         <tr>
             <td width="14%">&nbsp;</td>
-            <td width="6%" align="right" nowrap>${uiLabelMap.ProductToLocation}</td>
+            <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductTransferStatus}</span></td>
             <td width="6%">&nbsp;</td>
             <td width="74%">
-                <input type="text" size="20" name="locationSeqIdTo" value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" maxlength="20">
-                <a href="javascript:call_fieldlookup2(document.transferform.locationSeqIdTo,'LookupFacilityLocation');">
-                    <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
-                </a>
+            <select name="statusId">
+                <#if (inventoryTransfer.statusId)?exists>
+                    <#assign curStatusItem = inventoryTransfer.getRelatedOneCache("StatusItem")>
+                    <option value="${(inventoryTransfer.statusId)?if_exists}">${(curStatusItem.get("description",locale))?if_exists}</option>
+                </#if>
+                <#list statusItems as statusItem>
+                <option value="${(statusItem.statusId)?if_exists}">${(statusItem.get("description",locale))?if_exists}</option>
+                </#list>
+            </select>
             </td>
         </tr>
         <tr>
-            <td width="14%">&nbsp;</td>
-            <td width="6%" align="right" nowrap>${uiLabelMap.ProductComments}</td>
+           <td width="14%">&nbsp;</td>
+            <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductTransferSendDate}</span></td>
             <td width="6%">&nbsp;</td>
             <td width="74%">
-            <input type="text" name="comments" size="60" maxlength="250">
+            <input type="text" name="sendDate" value="${(inventoryTransfer.sendDate)?if_exists}" size="22">
+            <a href="#" onclick="setNow('sendDate')" class="buttontext">${uiLabelMap.CommonNow}</a>
             </td>
         </tr>
+        <#if !(inventoryTransfer?exists)>
+            <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductToFacilityContainer}</span></td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                    <div>
+                        <select name="facilityIdTo">
+                            <#list facilities as nextFacility>
+                            <option value="${(nextFacility.facilityId)?if_exists}">${(nextFacility.facilityName)?if_exists} [${(nextFacility.facilityId)?if_exists}]</option>
+                            </#list>
+                        </select>
+                        <span class="tooltip">${uiLabelMap.ProductSelectFacility}</span>
+                        <br/>
+                        <input type="text" name="containerIdTo" value="${(inventoryTransfer.containerIdTo)?if_exists}" size="20" maxlength="20">
+                        <span class="tooltip">${uiLabelMap.ProductOrEnterContainerId}</span>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductToLocation}</span></td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                    <input type="text" size="20" name="locationSeqIdTo" value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" maxlength="20">
+                    <a href="javascript:call_fieldlookup2(document.transferform.locationSeqIdTo,'LookupFacilityLocation');">
+                        <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+                    </a>
+                </td>
+            </tr>
+            <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductComments}</span></td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                <input type="text" name="comments" size="60" maxlength="250">
+                </td>
+            </tr>
+            <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductQuantityToTransfer}</span></td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                <#if inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("NON_SERIAL_INV_ITEM")>
+                    <input type="text" size="5" name="xferQty" value="${(inventoryItem.availableToPromiseTotal)?if_exists}">
+                <#elseif inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("SERIALIZED_INV_ITEM")>
+                    <input type="hidden" name="xferQty" value="1">
+                    1
+                <#elseif inventoryItem?exists>
+                    <span class="alert">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)?if_exists} ${uiLabelMap.ProductUnknownSpecifyType}.</span>
+                </#if>
+                </td>
+            </tr>
+        <#else>
+            <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductTransferReceiveDate}</span></td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                <input type="text" name="receiveDate" value="${(inventoryTransfer.receiveDate)?if_exists}" size="22">
+                <a href="#" onclick="setNow('receiveDate')" class="buttontext">${uiLabelMap.CommonNow}</a>
+                </td>
+            </tr>
+            <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductToFacilityContainer}</span></td>
+                <td width="6%">&nbsp;</td>
+                <#assign fac = delegator.findByPrimaryKey("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", inventoryTransfer.facilityIdTo))>
+                <td width="74%">${(fac.facilityName)?default("&nbsp;")}</td>
+            </tr>
+            <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductToLocation}</span></td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                <input type="text" size="20" name="locationSeqIdTo" value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" maxlength="20">
+                    <a href="javascript:call_fieldlookup2(document.transferform.locationSeqIdTo,'LookupFacilityLocation?facilityId=${inventoryTransfer.facilityIdTo}');">
+                        <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+                    </a>
+                </td>
+            </tr>
+            <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductComments}</span></td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                <input type="text" name="comments" value="${(inventoryTransfer.comments)?if_exists}" size="60" maxlength="250">
+                </td>
+            </tr>
+        </#if>
         <tr>
-            <td width="14%">&nbsp;</td>
-            <td width="6%" align="right" nowrap>${uiLabelMap.ProductQuantityToTransfer}</td>
-            <td width="6%">&nbsp;</td>
-            <td width="74%">
-            <#if inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("NON_SERIAL_INV_ITEM")>
-                <input type="text" size="5" name="xferQty" value="${(inventoryItem.availableToPromiseTotal)?if_exists}">
-            <#elseif inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("SERIALIZED_INV_ITEM")>
-                <input type="hidden" name="xferQty" value="1">
-                1
-            <#elseif inventoryItem?exists>
-                <span class="alert">${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)?if_exists} ${uiLabelMap.ProductUnknownSpecifyType}.</span>
+            <td colspan="2">&nbsp;</td>
+            <#if !(inventoryTransfer?exists)>
+                <td colspan="1" align="left"><input type="submit" value="${uiLabelMap.ProductTransfer}"></td>
+            <#else>
+                <td colspan="1" align="left"><input type="submit" value="${uiLabelMap.CommonUpdate}"></td>
             </#if>
-            </td>
-        </tr>
-    <#else>
-        <tr>
-            <td width="14%">&nbsp;</td>
-            <td width="6%" align="right" nowrap>${uiLabelMap.ProductTransferReceiveDate}</td>
-            <td width="6%">&nbsp;</td>
-            <td width="74%">
-            <input type="text" name="receiveDate" value="${(inventoryTransfer.receiveDate)?if_exists}" size="22">
-            <a href="#" onclick="setNow('receiveDate')" class="buttontext">${uiLabelMap.CommonNow}</a>
-            </td>
-        </tr>
-        <tr>
-            <td width="14%">&nbsp;</td>
-            <td width="6%" align="right" nowrap>${uiLabelMap.ProductToFacilityContainer}</td>
-            <td width="6%">&nbsp;</td>
-            <#assign fac = delegator.findByPrimaryKey("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", inventoryTransfer.facilityIdTo))>
-            <td width="74%">${(fac.facilityName)?default("&nbsp;")}</td>
-        </tr>
-        <tr>
-            <td width="14%">&nbsp;</td>
-            <td width="6%" align="right" nowrap>${uiLabelMap.ProductToLocation}</td>
-            <td width="6%">&nbsp;</td>
-            <td width="74%">
-            <input type="text" size="20" name="locationSeqIdTo" value="${(inventoryTransfer.locationSeqIdTo)?if_exists}" maxlength="20">
-                <a href="javascript:call_fieldlookup2(document.transferform.locationSeqIdTo,'LookupFacilityLocation?facilityId=${inventoryTransfer.facilityIdTo}');">
-                    <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
-                </a>
-            </td>
-        </tr>
-        <tr>
-            <td width="14%">&nbsp;</td>
-            <td width="6%" align="right" nowrap>${uiLabelMap.ProductComments}</td>
-            <td width="6%">&nbsp;</td>
-            <td width="74%">
-            <input type="text" name="comments" value="${(inventoryTransfer.comments)?if_exists}" size="60" maxlength="250">
-            </td>
         </tr>
-    </#if>
-    <tr>
-        <td colspan="2">&nbsp;</td>
-        <#if !(inventoryTransfer?exists)>
-            <td colspan="1" align="left"><input type="submit" value="${uiLabelMap.ProductTransfer}"></td>
-        <#else>
-            <td colspan="1" align="left"><input type="submit" value="${uiLabelMap.CommonUpdate}"></td>
+        </table>
+        </form>
         </#if>
-    </tr>
-    </table>
-    </form>
-    </#if>
+    </div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=609427&r1=609426&r2=609427&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Sun Jan  6 14:06:04 2008
@@ -16,485 +16,492 @@
 specific language governing permissions and limitations
 under the License.
 -->
-
-<#if invalidProductId?exists>
-<div class="errorMessage">${invalidProductId}</div>
-</#if>
-
-<span class="head1">${uiLabelMap.ProductReceiveInventory}</span> <span class="head2">${uiLabelMap.CommonInto}&nbsp;<#if facility?has_content>"${facility.facilityName?default("Not Defined")}"</#if> [${uiLabelMap.CommonId} :${facility.facilityId?if_exists}]</span>
-<div class="button-bar">
-  <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
-</div>
-
-<script language="JavaScript">
-    function setNow(field) { eval('document.selectAllForm.' + field + '.value="${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}"'); }
-</script>
-
-<br/>
-
-<#-- Receiving Results -->
-<#if receivedItems?has_content>
-  <h3>${uiLabelMap.ProductReceiptPurchaseOrder} #${purchaseOrder.orderId}</h3>
-  <hr/>
-  <table class="basic-table" cellspacing="0">
-    <tr class="header-row">
-      <td>${uiLabelMap.ProductShipmentId}#</td>
-      <td>${uiLabelMap.ProductReceipt}#</td>
-      <td>${uiLabelMap.CommonDate}</td>
-      <td>${uiLabelMap.ProductPo} #</td>
-      <td>${uiLabelMap.ProductLine} #</td>
-      <td>${uiLabelMap.ProductProductId}</td>
-      <td>${uiLabelMap.ProductPerUnitPrice}</td>
-      <td>${uiLabelMap.CommonRejected}</td>
-      <td>${uiLabelMap.CommonAccepted}</td>
-    </tr>
-    <#list receivedItems as item>
-      <tr>
-        <td><a href="<@ofbizUrl>ViewShipment?shipmentId=${item.shipmentId?if_exists}</@ofbizUrl>" class="buttontext">${item.shipmentId?if_exists}</a></td>
-        <td>${item.receiptId}</td>
-        <td>${item.getString("datetimeReceived").toString()}</td>
-        <td><a href="/ordermgr/control/orderview?orderId=${item.orderId}" class="buttontext">${item.orderId}</a></td>
-        <td>${item.orderItemSeqId}</td>
-        <td>${item.productId?default("Not Found")}</td>
-        <td>${item.unitCost?default(0)?string("##0.00")}</td>
-        <td>${item.quantityRejected?default(0)?string.number}</td>
-        <td>${item.quantityAccepted?string.number}</td>
-      </tr>
-    </#list>
-    <tr><td colspan="9"><hr/></td></tr>
-  </table>
-  <br/>
-</#if>
-
-<#-- Single Product Receiving -->
-<#if requestParameters.initialSelected?exists && product?has_content>
-  <form method="post" action="<@ofbizUrl>receiveSingleInventoryProduct</@ofbizUrl>" name="selectAllForm">
-    <table border="0" cellpadding="2" cellspacing="0">
-      <#-- general request fields -->
-      <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/>
-      <input type="hidden" name="purchaseOrderId" value="${requestParameters.purchaseOrderId?if_exists}"/>
-      <#-- special service fields -->
-      <input type="hidden" name="productId" value="${requestParameters.productId?if_exists}"/>
-      <#if purchaseOrder?has_content>
-      <#assign unitCost = firstOrderItem.unitPrice?default(standardCosts.get(firstOrderItem.productId)?default(0))/>
-      <input type="hidden" name="orderId" value="${purchaseOrder.orderId}"/>
-      <input type="hidden" name="orderItemSeqId" value="${firstOrderItem.orderItemSeqId}"/>
-      <tr>
-        <td width="14%">&nbsp;</td>
-        <td width="6%" align="right" nowrap>${uiLabelMap.ProductPurchaseOrder}</td>
-        <td width="6%">&nbsp;</td>
-        <td width="74%">
-          <b>${purchaseOrder.orderId}</b>&nbsp;/&nbsp;<b>${firstOrderItem.orderItemSeqId}</b>
-          <#if 1 < purchaseOrderItemsSize>
-            (${uiLabelMap.ProductMultipleOrderItemsProduct} - ${purchaseOrderItemsSize}:1 ${uiLabelMap.ProductItemProduct})
-          <#else>
-            (${uiLabelMap.ProductSingleOrderItemProduct} - 1:1 ${uiLabelMap.ProductItemProduct})
-          </#if>
-        </td>
-      </tr>
-      </#if>
-      <tr>
-        <td width="14%">&nbsp;</td>
-        <td width="6%" align="right" nowrap>${uiLabelMap.ProductProductId}</td>
-        <td width="6%">&nbsp;</td>
-        <td width="74%">
-          <b>${requestParameters.productId?if_exists}</b>
-        </td>
-      </tr>
-      <tr>
-        <td width="14%">&nbsp;</td>
-        <td width="6%" align="right" nowrap>${uiLabelMap.ProductProductName}</td>
-        <td width="6%">&nbsp;</td>
-        <td width="74%">
-          <a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam?if_exists}" target="catalog" class="buttontext">${product.internalName?if_exists}</a>
-        </td>
-      </tr>
-      <tr>
-        <td width="14%">&nbsp;</td>
-        <td width="6%" align="right" nowrap>${uiLabelMap.ProductProductDescription}</td>
-        <td width="6%">&nbsp;</td>
-        <td width="74%">
-          ${product.description?if_exists}
-        </td>
-      </tr>
-      <tr>
-        <td width="14%">&nbsp;</td>
-        <td width="6%" align="right" nowrap>${uiLabelMap.ProductItemDescription}</td>
-        <td width="6%">&nbsp;</td>
-        <td width="74%">
-          <input type="text" name="itemDescription" size="30" maxlength="60"/>
-        </td>
-      </tr>
-      <tr>
-        <td width="14%">&nbsp;</td>
-        <td width="6%" align="right" nowrap>${uiLabelMap.ProductInventoryItemType}</td>
-        <td width="6%">&nbsp;</td>
-        <td width="74%">
-          <select name="inventoryItemTypeId" size="1">
-            <#list inventoryItemTypes as nextInventoryItemType>
-              <option value="${nextInventoryItemType.inventoryItemTypeId}"
-                <#if (facility.defaultInventoryItemTypeId?has_content) && (nextInventoryItemType.inventoryItemTypeId == facility.defaultInventoryItemTypeId)>
-                  selected="selected"
-                </#if>
-              >${nextInventoryItemType.get("description",locale)?default(nextInventoryItemType.inventoryItemTypeId)}</option>
-            </#list>
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td colspan="4">&nbsp;</td>
-      </tr>
-      <tr>
-        <td width="14%">&nbsp;</td>
-        <td width="6%" align="right" nowrap>${uiLabelMap.ProductFacilityOwner}</td>
-        <td width="6%">&nbsp;</td>
-        <td width="74%">
-            <input type="text" name="ownerPartyId" value="" size="20" maxlength="20">
-            <a href="javascript:call_fieldlookup2(document.selectAllForm.ownerPartyId, 'LookupPartyName');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Lookup"/></a>            
-        </td>
-      </tr>
-      <tr>
-        <td width="14%">&nbsp;</td>
-        <td width="6%" align="right" nowrap>${uiLabelMap.ProductDateReceived}</td>
-        <td width="6%">&nbsp;</td>
-        <td width="74%">
-          <input type="text" name="datetimeReceived" size="24" value="${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}">
-          <#-- <a href="#" onclick="setNow("datetimeReceived")" class="buttontext">[Now]</a> -->
-        </td>
-      </tr>
-
-      <#-- facility location(s) -->
-      <#assign facilityLocations = (product.getRelatedByAnd("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId)))?if_exists/>
-      <tr>
-        <td width="14%">&nbsp;</td>
-        <td width="6%" align="right" nowrap>${uiLabelMap.ProductFacilityLocation}</td>
-        <td width="6%">&nbsp;</td>
-        <td width="74%">
-          <#if facilityLocations?has_content>
-            <select name="locationSeqId">
-              <#list facilityLocations as productFacilityLocation>
-                <#assign facility = productFacilityLocation.getRelatedOneCache("Facility")/>
-                <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation")?if_exists/>
-                <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOneCache("TypeEnumeration"))?if_exists/>
-                <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option>
-              </#list>
-              <option value="">${uiLabelMap.ProductNoLocation}</option>
-            </select>
-          <#else>
-            <input type="text" name="locationSeqId" size="20" maxlength="20"/>
-                <a href="javascript:call_fieldlookup2(document.selectAllForm.locationSeqId,'LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>');">
-                    <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
-                </a>
-          </#if>
-        </td>
-      </tr>
-      <tr>
-        <td width="14%">&nbsp;</td>
-        <td width="6%" align="right" nowrap>${uiLabelMap.ProductRejectedReason}</td>
-        <td width="6%">&nbsp;</td>
-        <td width="74%">
-          <select name="rejectionId" size="1">
-            <option></option>
-            <#list rejectReasons as nextRejection>
-              <option value="${nextRejection.rejectionId}">${nextRejection.get("description",locale)?default(nextRejection.rejectionId)}</option>
-            </#list>
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td width="14%">&nbsp;</td>
-        <td width="6%" align="right" nowrap>${uiLabelMap.ProductQuantityRejected}</td>
-        <td width="6%">&nbsp;</td>
-        <td width="74%">
-          <input type="text" name="quantityRejected" size="5" value="0" />
-        </td>
-      </tr>
-      <tr>
-        <td width="14%">&nbsp;</td>
-        <td width="6%" align="right" nowrap>${uiLabelMap.ProductQuantityAccepted}</td>
-        <td width="6%">&nbsp;</td>
-        <td width="74%">
-          <input type="text" name="quantityAccepted" size="5" value="${defaultQuantity?default(1)?string.number}"/>
-        </td>
-      </tr>
-      <tr>
-        <td width="14%">&nbsp;</td>
-        <td width="6%" align="right" nowrap>${uiLabelMap.ProductPerUnitPrice}</td>
-        <td width="6%">&nbsp;</td>
-        <td width="74%">
-          <#-- get the default unit cost -->
-          <#if (!unitCost?exists || unitCost == 0.0)><#assign unitCost = standardCosts.get(product.productId)?default(0)/></#if>
-          <input type="text" name="unitCost" size="10" value="${unitCost}"/>
-        </td>
-      </tr>
-      <tr>
-        <td colspan="2">&nbsp;</td>
-        <td colspan="2"><input type="submit" value="${uiLabelMap.CommonReceive}"></td>
-      </tr>
-    </table>
-    <script language="JavaScript">
-      document.selectAllForm.quantityAccepted.focus();
-    </script>
-  </form>
-
-<#-- Select Shipment Screen -->
-<#elseif requestParameters.initialSelected?exists && !requestParameters.shipmentId?exists>
-  <h3>${uiLabelMap.ProductSelectShipmentReceive}</h3>
-  <form method="post" action="<@ofbizUrl>ReceiveInventory</@ofbizUrl>" name="selectAllForm">
-    <#-- general request fields -->
-    <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/>
-    <input type="hidden" name="purchaseOrderId" value="${requestParameters.purchaseOrderId?if_exists}"/>
-    <input type="hidden" name="initialSelected" value="Y"/>
-    <table width="100%" border="0" cellpadding="2" cellspacing="0">
-      <#list shipments?if_exists as shipment>
-        <#assign originFacility = shipment.getRelatedOneCache("OriginFacility")?if_exists/>
-        <#assign destinationFacility = shipment.getRelatedOneCache("DestinationFacility")?if_exists/>
-        <#assign statusItem = shipment.getRelatedOneCache("StatusItem")/>
-        <#assign shipmentType = shipment.getRelatedOneCache("ShipmentType")/>
-        <#assign shipmentDate = shipment.estimatedArrivalDate?if_exists/>
-        <tr>
-          <td><hr/></td>
-        </tr>
-        <tr>
-          <td>
-            <table width="100%" border="0" cellpadding="2" cellspacing="0">
-              <tr>
-                <td width="5%" nowrap><input type="radio" name="shipmentId" value="${shipment.shipmentId}"></td>
-                <td width="5%" nowrap>${shipment.shipmentId}</td>
-                <td>${shipmentType.get("description",locale)?default(shipmentType.shipmentTypeId?default(""))}</td>
-                <td>${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</td>
-                <td>${(originFacility.facilityName)?if_exists} [${shipment.originFacilityId?if_exists}]</td>
-                <td>${(destinationFacility.facilityName)?if_exists} [${shipment.destinationFacilityId?if_exists}]</td>
-                <td style="white-space: nowrap;">${(shipment.estimatedArrivalDate.toString())?if_exists}</td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </#list>
-      <tr>
-        <td><hr/></td>
-      </tr>
-      <tr>
-        <td>
-          <table width="100%" border="0" cellpadding="2" cellspacing="0">
-            <tr>
-              <td width="5%" nowrap><input type="radio" name="shipmentId" value="_NA_"></td>
-              <td width="5%" nowrap>${uiLabelMap.ProductNoSpecificShipment}</td>
-              <td colspan="5"></td>
+<div class="screenlet">
+    <div class="screenlet-title-bar">
+        <ul>
+            <li class="head3">${uiLabelMap.ProductReceiveInventory} ${uiLabelMap.CommonInto} <#if facility?has_content>"${facility.facilityName?default("Not Defined")}"</#if> [${uiLabelMap.CommonId} :${facility.facilityId?if_exists}]</li>
+        </ul>
+        <br class="clear"/>
+    </div>
+    <div class="screenlet-body">
+        <#if invalidProductId?exists>
+            <div class="errorMessage">${invalidProductId}</div>
+        </#if>        
+        <div class="button-bar">
+          <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
+        </div>
+
+        <script language="JavaScript">
+            function setNow(field) { eval('document.selectAllForm.' + field + '.value="${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}"'); }
+        </script>
+
+        <br/>
+
+        <#-- Receiving Results -->
+        <#if receivedItems?has_content>
+          <h3>${uiLabelMap.ProductReceiptPurchaseOrder} #${purchaseOrder.orderId}</h3>
+          <hr/>
+          <table class="basic-table" cellspacing="0">
+            <tr class="header-row">
+              <td>${uiLabelMap.ProductShipmentId}#</td>
+              <td>${uiLabelMap.ProductReceipt}#</td>
+              <td>${uiLabelMap.CommonDate}</td>
+              <td>${uiLabelMap.ProductPo} #</td>
+              <td>${uiLabelMap.ProductLine} #</td>
+              <td>${uiLabelMap.ProductProductId}</td>
+              <td>${uiLabelMap.ProductPerUnitPrice}</td>
+              <td>${uiLabelMap.CommonRejected}</td>
+              <td>${uiLabelMap.CommonAccepted}</td>
             </tr>
+            <#list receivedItems as item>
+              <tr>
+                <td><a href="<@ofbizUrl>ViewShipment?shipmentId=${item.shipmentId?if_exists}</@ofbizUrl>" class="buttontext">${item.shipmentId?if_exists}</a></td>
+                <td>${item.receiptId}</td>
+                <td>${item.getString("datetimeReceived").toString()}</td>
+                <td><a href="/ordermgr/control/orderview?orderId=${item.orderId}" class="buttontext">${item.orderId}</a></td>
+                <td>${item.orderItemSeqId}</td>
+                <td>${item.productId?default("Not Found")}</td>
+                <td>${item.unitCost?default(0)?string("##0.00")}</td>
+                <td>${item.quantityRejected?default(0)?string.number}</td>
+                <td>${item.quantityAccepted?string.number}</td>
+              </tr>
+            </#list>
+            <tr><td colspan="9"><hr/></td></tr>
           </table>
-        </td>
-      </tr>
-      <tr>
-        <td>&nbsp;<a href="javascript:document.selectAllForm.submit();" class="buttontext">${uiLabelMap.ProductReceiveSelectedShipment}</a></td>
-      </tr>
-    </table>
-  </form>
-
-<#-- Multi-Item PO Receiving -->
-<#elseif requestParameters.initialSelected?exists && purchaseOrder?has_content>
-  <form method="post" action="<@ofbizUrl>receiveInventoryProduct</@ofbizUrl>" name="selectAllForm">
-    <#-- general request fields -->
-    <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/>
-    <input type="hidden" name="purchaseOrderId" value="${requestParameters.purchaseOrderId?if_exists}"/>
-    <input type="hidden" name="initialSelected" value="Y"/>
-    <input type="hidden" name="_useRowSubmit" value="Y"/>
-    <#assign now = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()/>
-    <#assign rowCount = 0/>
-    <table width="100%" border="0" cellpadding="2" cellspacing="0">
-      <#if !purchaseOrderItems?exists || purchaseOrderItemsSize == 0>
-        <tr>
-          <td colspan="2">${uiLabelMap.ProductNoItemsPoReceive}.</td>
-        </tr>
-      <#else/>
-        <tr>
-          <td>
-            <h3>${uiLabelMap.ProductReceivePurchaseOrder} #${purchaseOrder.orderId}</h3>
-            <#if shipment?has_content>
-            <h3>${uiLabelMap.ProductShipmentId} #${shipment.shipmentId}</h3>
-            </#if>
-          </td>
-          <td align="right">
-            ${uiLabelMap.CommonSelectAll}
-            <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'selectAllForm');"/>
-          </td>
-        </tr>
-        <#list purchaseOrderItems as orderItem>
-          <#assign defaultQuantity = orderItem.quantity - receivedQuantities[orderItem.orderItemSeqId]?double/>
-          <#assign itemCost = orderItem.unitPrice?default(0)/>
-          <#assign salesOrderItem = salesOrderItems[orderItem.orderItemSeqId]?if_exists/>
-          <#if shipment?has_content>
-          <#assign defaultQuantity = shippedQuantities[orderItem.orderItemSeqId]?double - receivedQuantities[orderItem.orderItemSeqId]?double/>
-          </#if>
-          <#if 0 < defaultQuantity>
-          <#assign orderItemType = orderItem.getRelatedOne("OrderItemType")/>
-          <input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/>
-          <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/>
-          <input type="hidden" name="facilityId_o_${rowCount}" value="${requestParameters.facilityId?if_exists}"/>
-          <input type="hidden" name="datetimeReceived_o_${rowCount}" value="${now}"/>
-          <#if shipment?exists && shipment.shipmentId?has_content>
-            <input type="hidden" name="shipmentId_o_${rowCount}" value="${shipment.shipmentId}"/>
-          </#if>
-          <#if salesOrderItem?has_content>
-            <input type="hidden" name="priorityOrderId_o_${rowCount}" value="${salesOrderItem.orderId}"/>
-            <input type="hidden" name="priorityOrderItemSeqId_o_${rowCount}" value="${salesOrderItem.orderItemSeqId}"/>
-          </#if>
+          <br/>
+        </#if>
 
-          <tr>
-            <td colspan="2"><hr/></td>
-          </tr>
-          <tr>
-            <td>
-              <table width="100%" border="0" cellpadding="2" cellspacing="0">
-                <tr>
-                  <#if orderItem.productId?exists>
-                    <#assign product = orderItem.getRelatedOneCache("Product")/>
-                    <input type="hidden" name="productId_o_${rowCount}" value="${product.productId}"/>
-                    <td width="45%">
-                        ${orderItem.orderItemSeqId}:&nbsp;<a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam?if_exists}" target="catalog" class="buttontext">${product.productId}&nbsp;-&nbsp;${orderItem.itemDescription?if_exists}</a> : ${product.description?if_exists}
-                    </td>
+        <#-- Single Product Receiving -->
+        <#if requestParameters.initialSelected?exists && product?has_content>
+          <form method="post" action="<@ofbizUrl>receiveSingleInventoryProduct</@ofbizUrl>" name="selectAllForm">
+            <table class="basic-table" cellspacing="0">
+              <#-- general request fields -->
+              <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/>
+              <input type="hidden" name="purchaseOrderId" value="${requestParameters.purchaseOrderId?if_exists}"/>
+              <#-- special service fields -->
+              <input type="hidden" name="productId" value="${requestParameters.productId?if_exists}"/>
+              <#if purchaseOrder?has_content>
+              <#assign unitCost = firstOrderItem.unitPrice?default(standardCosts.get(firstOrderItem.productId)?default(0))/>
+              <input type="hidden" name="orderId" value="${purchaseOrder.orderId}"/>
+              <input type="hidden" name="orderItemSeqId" value="${firstOrderItem.orderItemSeqId}"/>
+              <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductPurchaseOrder}</td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                  <b>${purchaseOrder.orderId}</b>&nbsp;/&nbsp;<b>${firstOrderItem.orderItemSeqId}</b>
+                  <#if 1 < purchaseOrderItemsSize>
+                    (${uiLabelMap.ProductMultipleOrderItemsProduct} - ${purchaseOrderItemsSize}:1 ${uiLabelMap.ProductItemProduct})
                   <#else>
-                    <td width="45%">
-                        <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists}&nbsp;&nbsp;
-                        <input type="text" size="12" name="productId_o_${rowCount}"/>
-                        <a href="/catalog/control/EditProduct?externalLoginKey=${externalLoginKey}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
-                    </td>
+                    (${uiLabelMap.ProductSingleOrderItemProduct} - 1:1 ${uiLabelMap.ProductItemProduct})
                   </#if>
-                  <td align="right">${uiLabelMap.ProductLocation}:</td>
-                  <#-- location(s) -->
-                  <td align="right">
-                    <#assign facilityLocations = (orderItem.getRelatedByAnd("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId)))?if_exists/>
-                    <#if facilityLocations?has_content>
-                      <select name="locationSeqId_o_${rowCount}">
-                        <#list facilityLocations as productFacilityLocation>
-                          <#assign facility = productFacilityLocation.getRelatedOneCache("Facility")/>
-                          <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation")?if_exists/>
-                          <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOneCache("TypeEnumeration"))?if_exists/>
-                          <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option>
-                        </#list>
-                        <option value="">${uiLabelMap.ProductNoLocation}</option>
-                      </select>
-                    <#else>
-                      <input type="text" name="locationSeqId_o_${rowCount}" size="12"/>
-                          <a href="javascript:call_fieldlookup2(document.selectAllForm.locationSeqId_o_${rowCount},'LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>');">
-                              <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
-                          </a>
-                    </#if>
-                  </td>
-                  <td align="right">${uiLabelMap.ProductQtyReceived} :</td>
-                  <td align="right">
-                    <input type="text" name="quantityAccepted_o_${rowCount}" size="6" value="${defaultQuantity?string.number}"/>
-                  </td>
-                </tr>
-                <tr>
-                  <td width="45%">
-                    ${uiLabelMap.ProductInventoryItemType} :&nbsp;
-                    <select name="inventoryItemTypeId_o_${rowCount}" size="1">
-                      <#list inventoryItemTypes as nextInventoryItemType>
+                </td>
+              </tr>
+              </#if>
+              <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductProductId}</td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                  <b>${requestParameters.productId?if_exists}</b>
+                </td>
+              </tr>
+              <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductProductName}</td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                  <a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam?if_exists}" target="catalog" class="buttontext">${product.internalName?if_exists}</a>
+                </td>
+              </tr>
+              <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductProductDescription}</td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                  ${product.description?if_exists}
+                </td>
+              </tr>
+              <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductItemDescription}</td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" name="itemDescription" size="30" maxlength="60"/>
+                </td>
+              </tr>
+              <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductInventoryItemType}</td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                  <select name="inventoryItemTypeId" size="1">
+                    <#list inventoryItemTypes as nextInventoryItemType>
                       <option value="${nextInventoryItemType.inventoryItemTypeId}"
-                       <#if (facility.defaultInventoryItemTypeId?has_content) && (nextInventoryItemType.inventoryItemTypeId == facility.defaultInventoryItemTypeId)>
-                        selected="selected"
-                      </#if>
+                        <#if (facility.defaultInventoryItemTypeId?has_content) && (nextInventoryItemType.inventoryItemTypeId == facility.defaultInventoryItemTypeId)>
+                          selected="selected"
+                        </#if>
                       >${nextInventoryItemType.get("description",locale)?default(nextInventoryItemType.inventoryItemTypeId)}</option>
+                    </#list>
+                  </select>
+                </td>
+              </tr>
+              <tr>
+                <td colspan="4">&nbsp;</td>
+              </tr>
+              <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductFacilityOwner}</td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                    <input type="text" name="ownerPartyId" value="" size="20" maxlength="20">
+                    <a href="javascript:call_fieldlookup2(document.selectAllForm.ownerPartyId, 'LookupPartyName');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Lookup"/></a>            
+                </td>
+              </tr>
+              <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductDateReceived}</td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" name="datetimeReceived" size="24" value="${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()}">
+                  <#-- <a href="#" onclick="setNow("datetimeReceived")" class="buttontext">[Now]</a> -->
+                </td>
+              </tr>
+
+              <#-- facility location(s) -->
+              <#assign facilityLocations = (product.getRelatedByAnd("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId)))?if_exists/>
+              <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductFacilityLocation}</td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                  <#if facilityLocations?has_content>
+                    <select name="locationSeqId">
+                      <#list facilityLocations as productFacilityLocation>
+                        <#assign facility = productFacilityLocation.getRelatedOneCache("Facility")/>
+                        <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation")?if_exists/>
+                        <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOneCache("TypeEnumeration"))?if_exists/>
+                        <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option>
                       </#list>
+                      <option value="">${uiLabelMap.ProductNoLocation}</option>
                     </select>
-                  </td>
-                  <td align="right">${uiLabelMap.ProductRejectionReason} :</td>
-                  <td align="right">
-                    <select name="rejectionId_o_${rowCount}" size="1">
-                      <option></option>
-                      <#list rejectReasons as nextRejection>
+                  <#else>
+                    <input type="text" name="locationSeqId" size="20" maxlength="20"/>
+                        <a href="javascript:call_fieldlookup2(document.selectAllForm.locationSeqId,'LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>');">
+                            <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+                        </a>
+                  </#if>
+                </td>
+              </tr>
+              <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductRejectedReason}</td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                  <select name="rejectionId" size="1">
+                    <option></option>
+                    <#list rejectReasons as nextRejection>
                       <option value="${nextRejection.rejectionId}">${nextRejection.get("description",locale)?default(nextRejection.rejectionId)}</option>
-                      </#list>
-                    </select>
+                    </#list>
+                  </select>
+                </td>
+              </tr>
+              <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductQuantityRejected}</td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" name="quantityRejected" size="5" value="0" />
+                </td>
+              </tr>
+              <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductQuantityAccepted}</td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                  <input type="text" name="quantityAccepted" size="5" value="${defaultQuantity?default(1)?string.number}"/>
+                </td>
+              </tr>
+              <tr>
+                <td width="14%">&nbsp;</td>
+                <td width="6%" align="right" nowrap class="label">${uiLabelMap.ProductPerUnitPrice}</td>
+                <td width="6%">&nbsp;</td>
+                <td width="74%">
+                  <#-- get the default unit cost -->
+                  <#if (!unitCost?exists || unitCost == 0.0)><#assign unitCost = standardCosts.get(product.productId)?default(0)/></#if>
+                  <input type="text" name="unitCost" size="10" value="${unitCost}"/>
+                </td>
+              </tr>
+              <tr>
+                <td colspan="2">&nbsp;</td>
+                <td colspan="2"><input type="submit" value="${uiLabelMap.CommonReceive}"></td>
+              </tr>
+            </table>
+            <script language="JavaScript">
+              document.selectAllForm.quantityAccepted.focus();
+            </script>
+          </form>
+
+        <#-- Select Shipment Screen -->
+        <#elseif requestParameters.initialSelected?exists && !requestParameters.shipmentId?exists>
+          <h3>${uiLabelMap.ProductSelectShipmentReceive}</h3>
+          <form method="post" action="<@ofbizUrl>ReceiveInventory</@ofbizUrl>" name="selectAllForm">
+            <#-- general request fields -->
+            <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/>
+            <input type="hidden" name="purchaseOrderId" value="${requestParameters.purchaseOrderId?if_exists}"/>
+            <input type="hidden" name="initialSelected" value="Y"/>
+            <table class="basic-table" cellspacing="0">
+              <#list shipments?if_exists as shipment>
+                <#assign originFacility = shipment.getRelatedOneCache("OriginFacility")?if_exists/>
+                <#assign destinationFacility = shipment.getRelatedOneCache("DestinationFacility")?if_exists/>
+                <#assign statusItem = shipment.getRelatedOneCache("StatusItem")/>
+                <#assign shipmentType = shipment.getRelatedOneCache("ShipmentType")/>
+                <#assign shipmentDate = shipment.estimatedArrivalDate?if_exists/>
+                <tr>
+                  <td><hr/></td>
+                </tr>
+                <tr>
+                  <td>
+                    <table class="basic-table" cellspacing="0">
+                      <tr>
+                        <td width="5%" nowrap><input type="radio" name="shipmentId" value="${shipment.shipmentId}"></td>
+                        <td width="5%" nowrap>${shipment.shipmentId}</td>
+                        <td>${shipmentType.get("description",locale)?default(shipmentType.shipmentTypeId?default(""))}</td>
+                        <td>${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</td>
+                        <td>${(originFacility.facilityName)?if_exists} [${shipment.originFacilityId?if_exists}]</td>
+                        <td>${(destinationFacility.facilityName)?if_exists} [${shipment.destinationFacilityId?if_exists}]</td>
+                        <td style="white-space: nowrap;">${(shipment.estimatedArrivalDate.toString())?if_exists}</td>
+                      </tr>
+                    </table>
+                  </td>
+                </tr>
+              </#list>
+              <tr>
+                <td><hr/></td>
+              </tr>
+              <tr>
+                <td>
+                  <table class="basic-table" cellspacing="0">
+                    <tr>
+                      <td width="5%" nowrap><input type="radio" name="shipmentId" value="_NA_"></td>
+                      <td width="5%" nowrap>${uiLabelMap.ProductNoSpecificShipment}</td>
+                      <td colspan="5"></td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+              <tr>
+                <td>&nbsp;<a href="javascript:document.selectAllForm.submit();" class="buttontext">${uiLabelMap.ProductReceiveSelectedShipment}</a></td>
+              </tr>
+            </table>
+          </form>
+
+        <#-- Multi-Item PO Receiving -->
+        <#elseif requestParameters.initialSelected?exists && purchaseOrder?has_content>
+          <form method="post" action="<@ofbizUrl>receiveInventoryProduct</@ofbizUrl>" name="selectAllForm">
+            <#-- general request fields -->
+            <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/>
+            <input type="hidden" name="purchaseOrderId" value="${requestParameters.purchaseOrderId?if_exists}"/>
+            <input type="hidden" name="initialSelected" value="Y"/>
+            <input type="hidden" name="_useRowSubmit" value="Y"/>
+            <#assign now = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString()/>
+            <#assign rowCount = 0/>
+            <table class="basic-table" cellspacing="0">
+              <#if !purchaseOrderItems?exists || purchaseOrderItemsSize == 0>
+                <tr>
+                  <td colspan="2">${uiLabelMap.ProductNoItemsPoReceive}.</td>
+                </tr>
+              <#else/>
+                <tr>
+                  <td>
+                    <h3>${uiLabelMap.ProductReceivePurchaseOrder} #${purchaseOrder.orderId}</h3>
+                    <#if shipment?has_content>
+                    <h3>${uiLabelMap.ProductShipmentId} #${shipment.shipmentId}</h3>
+                    </#if>
                   </td>
-                  <td align="right">${uiLabelMap.ProductQtyRejected} :</td>
                   <td align="right">
-                    <input type="text" name="quantityRejected_o_${rowCount}" value="0" size="6"/>
+                    ${uiLabelMap.CommonSelectAll}
+                    <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'selectAllForm');"/>
                   </td>
                 </tr>
+                <#list purchaseOrderItems as orderItem>
+                  <#assign defaultQuantity = orderItem.quantity - receivedQuantities[orderItem.orderItemSeqId]?double/>
+                  <#assign itemCost = orderItem.unitPrice?default(0)/>
+                  <#assign salesOrderItem = salesOrderItems[orderItem.orderItemSeqId]?if_exists/>
+                  <#if shipment?has_content>
+                  <#assign defaultQuantity = shippedQuantities[orderItem.orderItemSeqId]?double - receivedQuantities[orderItem.orderItemSeqId]?double/>
+                  </#if>
+                  <#if 0 < defaultQuantity>
+                  <#assign orderItemType = orderItem.getRelatedOne("OrderItemType")/>
+                  <input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/>
+                  <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/>
+                  <input type="hidden" name="facilityId_o_${rowCount}" value="${requestParameters.facilityId?if_exists}"/>
+                  <input type="hidden" name="datetimeReceived_o_${rowCount}" value="${now}"/>
+                  <#if shipment?exists && shipment.shipmentId?has_content>
+                    <input type="hidden" name="shipmentId_o_${rowCount}" value="${shipment.shipmentId}"/>
+                  </#if>
+                  <#if salesOrderItem?has_content>
+                    <input type="hidden" name="priorityOrderId_o_${rowCount}" value="${salesOrderItem.orderId}"/>
+                    <input type="hidden" name="priorityOrderItemSeqId_o_${rowCount}" value="${salesOrderItem.orderItemSeqId}"/>
+                  </#if>
+
+                  <tr>
+                    <td colspan="2"><hr/></td>
+                  </tr>
+                  <tr>
+                    <td>
+                      <table class="basic-table" cellspacing="0">
+                        <tr>
+                          <#if orderItem.productId?exists>
+                            <#assign product = orderItem.getRelatedOneCache("Product")/>
+                            <input type="hidden" name="productId_o_${rowCount}" value="${product.productId}"/>
+                            <td width="45%">
+                                ${orderItem.orderItemSeqId}:&nbsp;<a href="/catalog/control/EditProduct?productId=${product.productId}${externalKeyParam?if_exists}" target="catalog" class="buttontext">${product.productId}&nbsp;-&nbsp;${orderItem.itemDescription?if_exists}</a> : ${product.description?if_exists}
+                            </td>
+                          <#else>
+                            <td width="45%">
+                                <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists}&nbsp;&nbsp;
+                                <input type="text" size="12" name="productId_o_${rowCount}"/>
+                                <a href="/catalog/control/EditProduct?externalLoginKey=${externalLoginKey}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
+                            </td>
+                          </#if>
+                          <td align="right">${uiLabelMap.ProductLocation}:</td>
+                          <#-- location(s) -->
+                          <td align="right">
+                            <#assign facilityLocations = (orderItem.getRelatedByAnd("ProductFacilityLocation", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId)))?if_exists/>
+                            <#if facilityLocations?has_content>
+                              <select name="locationSeqId_o_${rowCount}">
+                                <#list facilityLocations as productFacilityLocation>
+                                  <#assign facility = productFacilityLocation.getRelatedOneCache("Facility")/>
+                                  <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation")?if_exists/>
+                                  <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOneCache("TypeEnumeration"))?if_exists/>
+                                  <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option>
+                                </#list>
+                                <option value="">${uiLabelMap.ProductNoLocation}</option>
+                              </select>
+                            <#else>
+                              <input type="text" name="locationSeqId_o_${rowCount}" size="12"/>
+                                  <a href="javascript:call_fieldlookup2(document.selectAllForm.locationSeqId_o_${rowCount},'LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>');">
+                                      <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+                                  </a>
+                            </#if>
+                          </td>
+                          <td align="right">${uiLabelMap.ProductQtyReceived} :</td>
+                          <td align="right">
+                            <input type="text" name="quantityAccepted_o_${rowCount}" size="6" value="${defaultQuantity?string.number}"/>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td width="45%">
+                            ${uiLabelMap.ProductInventoryItemType} :&nbsp;
+                            <select name="inventoryItemTypeId_o_${rowCount}" size="1">
+                              <#list inventoryItemTypes as nextInventoryItemType>
+                              <option value="${nextInventoryItemType.inventoryItemTypeId}"
+                               <#if (facility.defaultInventoryItemTypeId?has_content) && (nextInventoryItemType.inventoryItemTypeId == facility.defaultInventoryItemTypeId)>
+                                selected="selected"
+                              </#if>
+                              >${nextInventoryItemType.get("description",locale)?default(nextInventoryItemType.inventoryItemTypeId)}</option>
+                              </#list>
+                            </select>
+                          </td>
+                          <td align="right">${uiLabelMap.ProductRejectionReason} :</td>
+                          <td align="right">
+                            <select name="rejectionId_o_${rowCount}" size="1">
+                              <option></option>
+                              <#list rejectReasons as nextRejection>
+                              <option value="${nextRejection.rejectionId}">${nextRejection.get("description",locale)?default(nextRejection.rejectionId)}</option>
+                              </#list>
+                            </select>
+                          </td>
+                          <td align="right">${uiLabelMap.ProductQtyRejected} :</td>
+                          <td align="right">
+                            <input type="text" name="quantityRejected_o_${rowCount}" value="0" size="6"/>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td>&nbsp;</td>
+                          <td align="right">${uiLabelMap.ProductFacilityOwner}:</td>
+                          <td align="right"><input type="text" name="ownerPartyId_o_${rowCount}" size="20" maxlength="20" value="${facility.ownerPartyId}"/></td>
+                          <td align="right">${uiLabelMap.ProductPerUnitPrice} :</td>
+                          <td align="right">
+                            <input type="hidden" name="currencyUomId_o_${rowCount}" value="${currencyUomId?if_exists}"/>
+                            <input type="text" name="unitCost_o_${rowCount}" value="${itemCost}" size="6" maxlength="20"/>
+                            ${currencyUomId?if_exists}
+                          </td>
+                        </tr>
+                      </table>
+                    </td>
+                    <td align="right">
+                      <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');"/>
+                    </td>
+                  </tr>
+                  <#assign rowCount = rowCount + 1>
+                  </#if>
+                </#list>
                 <tr>
-                  <td>&nbsp;</td>
-                  <td align="right">${uiLabelMap.ProductFacilityOwner}:</td>
-                  <td align="right"><input type="text" name="ownerPartyId_o_${rowCount}" size="20" maxlength="20" value="${facility.ownerPartyId}"/></td>
-                  <td align="right">${uiLabelMap.ProductPerUnitPrice} :</td>
-                  <td align="right">
-                    <input type="hidden" name="currencyUomId_o_${rowCount}" value="${currencyUomId?if_exists}"/>
-                    <input type="text" name="unitCost_o_${rowCount}" value="${itemCost}" size="6" maxlength="20"/>
-                    ${currencyUomId?if_exists}
+                  <td colspan="2">
+                    <hr/>
                   </td>
                 </tr>
-              </table>
-            </td>
-            <td align="right">
-              <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');"/>
-            </td>
-          </tr>
-          <#assign rowCount = rowCount + 1>
-          </#if>
-        </#list>
-        <tr>
-          <td colspan="2">
-            <hr/>
-          </td>
-        </tr>
-        <#if rowCount == 0>
-          <tr>
-            <td colspan="2">${uiLabelMap.ProductNoItemsPo} #${purchaseOrder.orderId} ${uiLabelMap.ProductToReceive}.</td>
-          </tr>
-          <tr>
-            <td colspan="2" align="right">
-              <a href="<@ofbizUrl>ReceiveInventory?facilityId=${requestParameters.facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReturnToReceiving}</a>
-            </td>
-          </tr>
+                <#if rowCount == 0>
+                  <tr>
+                    <td colspan="2">${uiLabelMap.ProductNoItemsPo} #${purchaseOrder.orderId} ${uiLabelMap.ProductToReceive}.</td>
+                  </tr>
+                  <tr>
+                    <td colspan="2" align="right">
+                      <a href="<@ofbizUrl>ReceiveInventory?facilityId=${requestParameters.facilityId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReturnToReceiving}</a>
+                    </td>
+                  </tr>
+                <#else>
+                  <tr>
+                    <td colspan="2" align="right">
+                      <a href="javascript:document.selectAllForm.submit();" class="buttontext">${uiLabelMap.ProductReceiveSelectedProduct}</a>
+                    </td>
+                  </tr>
+                </#if>
+              </#if>
+            </table>
+            <input type="hidden" name="_rowCount" value="${rowCount}"/>
+          </form>
+          <script language="JavaScript" type="text/javascript">selectAll('selectAllForm');</script>
+
+        <#-- Initial Screen -->
         <#else>
-          <tr>
-            <td colspan="2" align="right">
-              <a href="javascript:document.selectAllForm.submit();" class="buttontext">${uiLabelMap.ProductReceiveSelectedProduct}</a>
-            </td>
-          </tr>
+          <form name="selectAllForm" method="post" action="<@ofbizUrl>ReceiveInventory</@ofbizUrl>">
+            <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/>
+            <input type="hidden" name="initialSelected" value="Y"/>
+            <table class="basic-table" cellspacing="0">
+              <tr><td colspan="4"><h3>${uiLabelMap.ProductReceiveItem}</h3></td></tr>
+              <tr>
+                <td width="25%" align="right" class="label">${uiLabelMap.ProductPurchaseOrderNumber}</td>
+                <td>&nbsp;</td>
+                <td width="25%">
+                  <input type="text" name="purchaseOrderId" size="20" maxlength="20" value="${requestParameters.purchaseOrderId?if_exists}">
+                    <a href="javascript:call_fieldlookup2(document.selectAllForm.purchaseOrderId,'LookupPurchaseOrderHeaderAndShipInfo');">
+                      <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+                    </a>
+                </td>
+                <td class="tooltip">${uiLabelMap.ProductLeaveSingleProductReceiving}</td>
+              </tr>
+              <tr>
+                <td width="25%" align="right" class="label">${uiLabelMap.ProductProductId}</td>
+                <td>&nbsp;</td>
+                <td width="25%">
+                  <input type="text" name="productId" size="20" maxlength="20" value="${requestParameters.productId?if_exists}"/>
+                    <a href="javascript:call_fieldlookup2(document.selectAllForm.productId,'LookupProduct');">
+                      <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
+                    </a>
+                </td>
+                <td class="tooltip">${uiLabelMap.ProductLeaveEntirePoReceiving}</td>
+              </tr>
+              <tr>
+                <td colspan="2">&nbsp;</td>
+                <td colspan="2">
+                  <a href="javascript:document.selectAllForm.submit();" class="buttontext">${uiLabelMap.ProductReceiveProduct}</a>
+                </td>
+              </tr>
+            </table>
+          </form>
         </#if>
-      </#if>
-    </table>
-    <input type="hidden" name="_rowCount" value="${rowCount}"/>
-  </form>
-  <script language="JavaScript" type="text/javascript">selectAll('selectAllForm');</script>
-
-<#-- Initial Screen -->
-<#else>
-  <form name="selectAllForm" method="post" action="<@ofbizUrl>ReceiveInventory</@ofbizUrl>">
-    <input type="hidden" name="facilityId" value="${requestParameters.facilityId?if_exists}"/>
-    <input type="hidden" name="initialSelected" value="Y"/>
-    <table border="0" cellpadding="2" cellspacing="0">
-      <tr><td colspan="4"><h3>${uiLabelMap.ProductReceiveItem}</h3></td></tr>
-      <tr>
-        <td width="25%" align="right">${uiLabelMap.ProductPurchaseOrderNumber}</td>
-        <td>&nbsp;</td>
-        <td width="25%">
-          <input type="text" name="purchaseOrderId" size="20" maxlength="20" value="${requestParameters.purchaseOrderId?if_exists}">
-            <a href="javascript:call_fieldlookup2(document.selectAllForm.purchaseOrderId,'LookupPurchaseOrderHeaderAndShipInfo');">
-              <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
-            </a>
-        </td>
-        <td>(${uiLabelMap.ProductLeaveSingleProductReceiving})</td>
-      </tr>
-      <tr>
-        <td width="25%" align="right">${uiLabelMap.ProductProductId}</td>
-        <td>&nbsp;</td>
-        <td width="25%">
-          <input type="text" name="productId" size="20" maxlength="20" value="${requestParameters.productId?if_exists}"/>
-            <a href="javascript:call_fieldlookup2(document.selectAllForm.productId,'LookupProduct');">
-              <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/>
-            </a>
-        </td>
-        <td>(${uiLabelMap.ProductLeaveEntirePoReceiving})</td>
-      </tr>
-      <tr>
-        <td colspan="2">&nbsp;</td>
-        <td colspan="2">
-          <a href="javascript:document.selectAllForm.submit();" class="buttontext">${uiLabelMap.ProductReceiveProduct}</a>
-        </td>
-      </tr>
-    </table>
-  </form>
-</#if>
+    </div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=609427&r1=609426&r2=609427&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Sun Jan  6 14:06:04 2008
@@ -843,9 +843,23 @@
             <widgets>
                 <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://product/webapp/facility/facility/EditContactMech.ftl"/></html>
-                        </platform-specific>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleEditFacilityContactMech}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <platform-specific>
+                                            <html><html-template location="component://product/webapp/facility/facility/EditContactMech.ftl"/></html>
+                                        </platform-specific>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
+                        
                     </decorator-section>
                 </decorator-screen>
             </widgets>



Mime
View raw message