svn commit: r710030 - in /ofbiz/trunk/applications/product/webapp: catalog/product/EditProductInventoryItems.ftl facility/facility/FacilityForms.xml facility/inventory/InventoryForms.xml

[bibryam]

Author: bibryam
Date: Mon Nov  3 01:40:47 2008
New Revision: 710030

URL: http://svn.apache.org/viewvc?rev=710030&view=rev
Log:
Show inventory item status also for NON_SERIALIZED items. Reported by wudongqing on user list.

Modified:
    ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
    ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
    ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl?rev=710030&r1=710029&r2=710030&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl Mon Nov  3 01:40:47 2008
@@ -52,9 +52,7 @@
                <#if showEmpty || (inventoryItem.inventoryItemTypeId?if_exists == "SERIALIZED_INV_ITEM" && inventoryItem.statusId?if_exists != "INV_DELIVERED")
                               || (inventoryItem.inventoryItemTypeId?if_exists == "NON_SERIAL_INV_ITEM" && ((inventoryItem.availableToPromiseTotal?exists && inventoryItem.availableToPromiseTotal != 0) || (inventoryItem.quantityOnHandTotal?exists && inventoryItem.quantityOnHandTotal != 0)))>
                     <#assign curInventoryItemType = inventoryItem.getRelatedOne("InventoryItemType")>
-                    <#if inventoryItem.inventoryItemTypeId?if_exists == "SERIALIZED_INV_ITEM">
-                        <#assign curStatusItem = inventoryItem.getRelatedOneCache("StatusItem")?if_exists>
-                    </#if>
+                    <#assign curStatusItem = inventoryItem.getRelatedOneCache("StatusItem")?if_exists>
                     <#assign facilityLocation = inventoryItem.getRelatedOne("FacilityLocation")?if_exists>
                     <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOneCache("TypeEnumeration"))?if_exists>
                     <#if curInventoryItemType?exists>
@@ -63,16 +61,12 @@
                             <td>&nbsp;${(curInventoryItemType.get("description",locale))?if_exists}</td>
                             <td>
                                 <div>
-                                    <#if inventoryItem.inventoryItemTypeId?if_exists == "SERIALIZED_INV_ITEM">
-                                        <#if curStatusItem?has_content>
-                                            ${(curStatusItem.get("description",locale))?if_exists}
-                                        <#elseif inventoryItem.statusId?has_content>
-                                            [${inventoryItem.statusId}]
-                                        <#else>
-                                            ${uiLabelMap.CommonNotSet}&nbsp;
-                                        </#if>
+                                    <#if curStatusItem?has_content>
+                                        ${(curStatusItem.get("description",locale))?if_exists}
+                                    <#elseif inventoryItem.statusId?has_content>
+                                        [${inventoryItem.statusId}]
                                     <#else>
-                                        &nbsp;
+                                        ${uiLabelMap.CommonNotSet}&nbsp;
                                     </#if>
                                 </div>
                             </td>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?rev=710030&r1=710029&r2=710030&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Mon Nov  3 01:40:47 2008
@@ -85,7 +85,7 @@
         <field name="inventoryItemTypeId" title="${uiLabelMap.ProductInventoryItemTypeId}">
             <display-entity entity-name="InventoryItemType"/>
         </field>
-        <field name="statusId"><display/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
         <field name="datetimeReceived"><display/></field>
         <field name="expireDate" title="${uiLabelMap.ProductExpireDate}"><display/></field>
         <field name="productId">

Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml?rev=710030&r1=710029&r2=710030&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml Mon Nov  3 01:40:47 2008
@@ -27,6 +27,7 @@
             <set field="productId" from-field="inventoryItem.productId"/>
             <set field="facilityId" from-field="inventoryItem.facilityId"/>
             <set field="locationSeqId" from-field="inventoryItem.locationSeqId"/>
+            <set field="statusId" from-field="inventoryItem.statusId"/>
             <entity-one entity-name="FacilityLocation" value-name="facilityLocation">
                 <field-map field-name="locationSeqId" env-name="locationSeqId"/>
                 <field-map field-name="facilityId" env-name="facilityId"/>