[OFBiz] SVN: r7037 - in trunk/applications/product/webapp/facility: facility inventory

[jacopo@svn.ofbiz.org]

Author: jacopo
Date: 2006-03-21 10:27:16 -0600 (Tue, 21 Mar 2006)
New Revision: 7037

Modified:
   trunk/applications/product/webapp/facility/facility/FindFacilityTransfers.ftl
   trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
Log:
Fixed bug that could occur when no status is selected for an inventory transfer.

Modified: trunk/applications/product/webapp/facility/facility/FindFacilityTransfers.ftl
===================================================================
--- trunk/applications/product/webapp/facility/facility/FindFacilityTransfers.ftl	2006-03-21 10:30:28 UTC (rev 7036)
+++ trunk/applications/product/webapp/facility/facility/FindFacilityTransfers.ftl	2006-03-21 16:27:16 UTC (rev 7037)
@@ -59,8 +59,10 @@
             </td>
             <td><div class="tabletext">&nbsp;${(transfer.sendDate)?if_exists}</div></td>
             <td>
-                <#assign transferStatus = delegator.findByPrimaryKey("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", transfer.statusId))>
-                <div class="tabletext">&nbsp;${(transferStatus.description)?if_exists}</div>
+                <#if (transfer.statusId)?exists>
+                    <#assign transferStatus = delegator.findByPrimaryKey("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", transfer.statusId))>
+                    <div class="tabletext">&nbsp;${(transferStatus.description)?if_exists}</div>
+                </#if>
             </td>
             <td align="center"><div class="tabletext"><a href="<@ofbizUrl>TransferInventoryItem?inventoryTransferId=${(transfer.inventoryTransferId)?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonEdit}]</a></div></td>
             </tr>
@@ -91,8 +93,10 @@
             </td>
             <td><div class="tabletext">&nbsp;${(transfer.sendDate)?if_exists}</div></td>
             <td>
-                <#assign transferStatus = delegator.findByPrimaryKey("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", transfer.statusId))>
-                <div class="tabletext">&nbsp;${(transferStatus.description)?if_exists}</div>
+                <#if (transfer.statusId)?exists>
+                    <#assign transferStatus = delegator.findByPrimaryKey("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", transfer.statusId))>
+                    <div class="tabletext">&nbsp;${(transferStatus.description)?if_exists}</div>
+                </#if>
             </td>
             <td align="center"><div class="tabletext"><a href="<@ofbizUrl>TransferInventoryItem?inventoryTransferId=${(transfer.inventoryTransferId)?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonEdit}]</a></div></td>
             </tr>

Modified: trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
===================================================================
--- trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl	2006-03-21 10:30:28 UTC (rev 7036)
+++ trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl	2006-03-21 16:27:16 UTC (rev 7037)
@@ -146,10 +146,10 @@
         <td width="6%">&nbsp;</td>
         <td width="74%">
         <select name="statusId" class="selectBox">
-            <#if (inventoryTransfer.getRelatedOneCache("StatusItem"))?exists>
+            <#if (inventoryTransfer.statusId)?exists>
                 <#assign curStatusItem = inventoryTransfer.getRelatedOneCache("StatusItem")>
+                <option value="${(inventoryTransfer.statusId)?if_exists}">${(curStatusItem.description)?if_exists}</option>
             </#if>
-            <option value="${(inventoryTransfer.statusId)?if_exists}">${(curStatusItem.description)?if_exists}</option>
             <#list statusItems as statusItem>
             <option value="${(statusItem.statusId)?if_exists}">${(statusItem.get("description",locale))?if_exists}</option>
             </#list>