svn commit: r1552909 - in /ofbiz/branches/release13.07: ./ applications/product/widget/facility/InventoryForms.xml

Author: jleroux
Date: Sat Dec 21 14:26:05 2013
New Revision: 1552909

URL: http://svn.apache.org/r1552909
Log:
"Applied fix from trunk for revision: 1552908"
------------------------------------------------------------------------
r1552908 | jleroux | 2013-12-21 15:24:51 +0100 (sam. 21 déc. 2013) | 3 lignes

Fix a bug reported by Chris Snow at https://issues.apache.org/jira/browse/OFBIZ-2847 for "Create New Inventory Item - user entered Inventory Item Id overwritten with system generated one"

It does not make sense to allow entering an inventoryItemId. It is and must be generated by the system anyway (to prevent collisions)
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release13.07/   (props changed)
    ofbiz/branches/release13.07/applications/product/widget/facility/InventoryForms.xml

Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1552908

Modified: ofbiz/branches/release13.07/applications/product/widget/facility/InventoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/widget/facility/InventoryForms.xml?rev=1552909&r1=1552908&r2=1552909&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/widget/facility/InventoryForms.xml (original)
+++ ofbiz/branches/release13.07/applications/product/widget/facility/InventoryForms.xml Sat Dec 21 14:26:05 2013
@@ -34,15 +34,14 @@ under the License.
             </entity-one>
         </actions>
         <alt-target use-when="inventoryItemId==null" target="CreateInventoryItem"/>
-        <auto-fields-service service-name="updateInventoryItem" map-name="inventoryItem"/>
+        <auto-fields-service service-name="updateInventoryItem" map-name="inventoryItem"/>        
 
         <!-- ignored fields -->
         <field name="oldAvailableToPromise"><ignored/></field>
         <field name="oldQuantityOnHand"><ignored/></field>
-
+        
         <!-- custom formatted fields -->
-        <field use-when="inventoryItem!=null" name="inventoryItemId" tooltip="${uiLabelMap.ProductNotModificationRecrationInventoryItem}"><display/></field>
-        <field use-when="inventoryItem==null" name="inventoryItemId"><text/></field>
+        <field name="inventoryItemId" tooltip="${uiLabelMap.ProductNotModificationRecrationInventoryItem}"><display/></field>
         <field name="inventoryItemTypeId" title="${uiLabelMap.ProductInventoryItemTypeId}">
             <drop-down allow-empty="false">
                 <entity-options entity-name="InventoryItemType" description="${description}" key-field-name="inventoryItemTypeId"/>