svn commit: r553803 - /ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml

[jacopoc]

Author: jacopoc
Date: Fri Jul  6 02:12:35 2007
New Revision: 553803

URL: http://svn.apache.org/viewvc?view=rev&rev=553803
Log:
Misc cleanups for the Add SupplierProduct form definition.

Modified:
    ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?view=diff&rev=553803&r1=553802&r2=553803
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Fri Jul  6 02:12:35 2007
@@ -523,13 +523,15 @@
     </form>
 
     <!-- SupplierProduct -->
-    <form name="AddSupplierProduct" type="single" target="updateSupplierProduct" title="" default-map-name="supplierProduct"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+    <form name="AddSupplierProduct" type="single" target="updateSupplierProduct" title="" default-map-name="supplierProduct">
         <alt-target use-when="supplierProduct==null" target="createSupplierProduct"/>
         <auto-fields-service service-name="updateSupplierProduct" map-name=""/>
-        <!-- productId, partyId, and availableFromDate are primary keys of SupplierProduct and should not be updatable, so we use use-when to change the behavior of the form
+        <!-- productId, partyId, and availableFromDate, minimumOrderQuantity, currencyUomId are primary keys of SupplierProduct and should not be updatable, so we use use-when to change the behavior of the form
         if there is a SupplierProduct value available.  productId is always hidden (assuming it exists) so this is not an issue -->
         <field name="productId"><hidden value="${productId}"/></field>
+        <field name="partyId" title="${uiLabelMap.ProductSupplier}" use-when="supplierProduct!=null">
+            <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"/>
+        </field>
         <field name="partyId" title="${uiLabelMap.ProductSupplier}" use-when="supplierProduct==null">
             <drop-down allow-empty="false">
                 <entity-options entity-name="PartyRoleAndPartyDetail" description="${groupName} ${firstName} ${lastName} [${partyId}]">
@@ -539,6 +541,29 @@
                 </entity-options>
             </drop-down>
         </field>
+        <field name="availableFromDate" use-when="supplierProduct==null">
+            <date-time default-value="${bsh: org.ofbiz.base.util.UtilDateTime.nowTimestamp()}"/>
+        </field>
+        <field name="availableFromDate" use-when="supplierProduct!=null">
+            <display/>
+        </field>
+        <field name="minimumOrderQuantity" use-when="supplierProduct==null">
+            <text default-value="0" size="5"/>
+        </field>
+        <field name="minimumOrderQuantity" use-when="supplierProduct!=null">
+            <display/>
+        </field>
+        <field name="currencyUomId" title="${uiLabelMap.ProductCurrencyUomId}" use-when="supplierProduct==null">
+            <drop-down allow-empty="false" no-current-selected-key="${defaultCurrencyUomId}">
+                <entity-options entity-name="Uom" key-field-name="uomId" description="${description} [${uomId}]">
+                    <entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="currencyUomId" title="${uiLabelMap.ProductCurrencyUomId}" use-when="supplierProduct!=null">
+            <display-entity entity-name="Uom" key-field-name="uomId"/>
+        </field>
         <field name="supplierPrefOrderId">
             <drop-down allow-empty="true">
                 <entity-options entity-name="SupplierPrefOrder" key-field-name="supplierPrefOrderId" description="${description}">
@@ -553,21 +578,6 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="partyId" title="${uiLabelMap.ProductSupplier}" use-when="supplierProduct!=null" widget-style="tabletext">
-            <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"/>
-        </field>
-        <field name="availableFromDate" use-when="supplierProduct==null">
-            <date-time default-value="${bsh: org.ofbiz.base.util.UtilDateTime.nowTimestamp()}"/>
-        </field>
-        <field name="availableFromDate" use-when="supplierProduct!=null" widget-style="tabletext">
-            <display/>
-        </field>
-        <field name="minimumOrderQuantity" use-when="supplierProduct==null">
-            <text default-value="0" size="5"/>
-        </field>
-        <field name="minimumOrderQuantity" use-when="supplierProduct!=null" widget-style="tabletext">
-            <display/>
-        </field>
         <field name="quantityUomId" title="${uiLabelMap.ProductQuantityUomId}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="UomAndType" key-field-name="uomId" description="${typeDescription}: ${description} (${abbreviation})">
@@ -577,22 +587,14 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="currencyUomId" title="${uiLabelMap.ProductCurrencyUomId}">
-            <drop-down allow-empty="false" no-current-selected-key="${defaultCurrencyUomId}">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description} [${uomId}]">
-                    <entity-constraint name="uomTypeId" value="CURRENCY_MEASURE"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
         <field name="canDropShip" title="${uiLabelMap.ProductSupplierCanDropShip}">
             <drop-down allow-empty="false" no-current-selected-key="N">
                 <option key="Y" description="${uiLabelMap.CommonY}"/>
                 <option key="N" description="${uiLabelMap.CommonN}"/>
             </drop-down>
         </field>
-        <field use-when="supplierProduct == null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
-        <field use-when="supplierProduct != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field use-when="supplierProduct == null" name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
+        <field use-when="supplierProduct != null" name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
     <form name="ListSupplierProducts" type="list" target="updateSupplierProduct" title="" list-name="productSuppliers"
         default-title-style="boxhead" default-widget-style="tabletext" default-tooltip-style="tabletext" default-table-style="boxoutside" even-row-style="viewManyTR2" odd-row-style="viewManyTR1" header-row-style="boxtop">