[OFBiz] SVN: r7855 - in trunk/applications/product: entitydef webapp/catalog/product

[jacopo@svn.ofbiz.org]

Author: jacopo
Date: 2006-06-24 00:05:32 -0500 (Sat, 24 Jun 2006)
New Revision: 7855

Modified:
   trunk/applications/product/entitydef/entitymodel.xml
   trunk/applications/product/webapp/catalog/product/ProductForms.xml
Log:
Added missing fk definition (to the Uom entity) for the SupplierProduct.quantityUomId field.
Fixed the quantityUomId field definition of the EditSupplierProduct form: now the drop down box is populated with records from the Uom entity instead of the UomType entity.
Other misc improvements to the SupplierProduct's related forms: new <display-entity/> definitions and a new column (with order-by link) for the supplierPrefOrderId field.


Modified: trunk/applications/product/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/product/entitydef/entitymodel.xml	2006-06-24 04:33:07 UTC (rev 7854)
+++ trunk/applications/product/entitydef/entitymodel.xml	2006-06-24 05:05:32 UTC (rev 7855)
@@ -3682,6 +3682,9 @@
       <relation type="one" fk-name="SUPPL_PROD_CUOM" title="Currency" rel-entity-name="Uom">
         <key-map field-name="currencyUomId" rel-field-name="uomId"/>
       </relation>
+      <relation type="one" fk-name="SUPPL_PROD_QUOM" title="Quantity" rel-entity-name="Uom">
+        <key-map field-name="quantityUomId" rel-field-name="uomId"/>
+      </relation>
     </entity>
     <entity entity-name="SupplierProductFeature" 
             package-name="org.ofbiz.product.supplier"

Modified: trunk/applications/product/webapp/catalog/product/ProductForms.xml
===================================================================
--- trunk/applications/product/webapp/catalog/product/ProductForms.xml	2006-06-24 04:33:07 UTC (rev 7854)
+++ trunk/applications/product/webapp/catalog/product/ProductForms.xml	2006-06-24 05:05:32 UTC (rev 7855)
@@ -566,8 +566,10 @@
         </field>
         <field name="quantityUomId" title="${uiLabelMap.ProductQuantityUomId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="UomType" key-field-name="uomTypeId" description="${description}">
-                    <entity-order-by field-name="description"/>
+                <entity-options entity-name="UomAndType" key-field-name="uomId" description="${typeDescription}: ${description} (${abbreviation})">
+                    <entity-constraint name="uomTypeId" operator="not-equals" value="CURRENCY_MEASURE"/>
+                    <entity-order-by field-name="typeDescription"/>
+                    <entity-order-by field-name="uomId"/>
                 </entity-options>
             </drop-down>
         </field>
@@ -599,9 +601,13 @@
             header-link="EditProductSuppliers?productId=${productId}&amp;orderBy=minimumOrderQuantity" header-link-style="buttontext">
                 <display/>
         </field>
+        <field name="supplierPrefOrderId" widget-area-style="tabletextright"
+            header-link="EditProductSuppliers?productId=${productId}&amp;orderBy=supplierPrefOrderId" header-link-style="buttontext">
+                <display-entity entity-name="SupplierPrefOrder"/>
+        </field>
         <field name="availableFromDate" title="${uiLabelMap.ProductAvailableFromDate}" red-when="after-now"><display/></field>
         <field name="availableThruDate" title="${uiLabelMap.ProductAvailableThruDate}" red-when="before-now"><display/></field>
-        <field name="quantityUomId"><display/></field>
+        <field name="quantityUomId"><display-entity entity-name="Uom" key-field-name="uomId"/></field>
         <field name="supplierCommissionPerc" title="Comm. Perc."><display/></field>
         <field name="lastPrice" widget-area-style="tabletextright"
             header-link="EditProductSuppliers?productId=${productId}&amp;orderBy=lastPrice"  header-link-style="buttontext">