svn commit: r1612487 - in /ofbiz/branches/release11.04: ./ applications/product/widget/catalog/ProductForms.xml applications/product/widget/catalog/ProductScreens.xml

[jacopoc]

Author: jacopoc
Date: Tue Jul 22 07:15:34 2014
New Revision: 1612487

URL: http://svn.apache.org/r1612487
Log:
Applied fix from trunk for revision: 1611321
===

This reverts most of the changes committed in rev.951013 for OFBIZ-3802 because they caused a few issues as reported in the same Jira ticket.


Modified:
    ofbiz/branches/release11.04/   (props changed)
    ofbiz/branches/release11.04/applications/product/widget/catalog/ProductForms.xml
    ofbiz/branches/release11.04/applications/product/widget/catalog/ProductScreens.xml

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1611321

Modified: ofbiz/branches/release11.04/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/widget/catalog/ProductForms.xml?rev=1612487&r1=1612486&r2=1612487&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/branches/release11.04/applications/product/widget/catalog/ProductForms.xml Tue Jul 22 07:15:34 2014
@@ -915,17 +915,8 @@ under the License.
         <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="listIt"
+    <form name="ListSupplierProducts" type="list" target="updateSupplierProduct" title="" list-name="productSuppliers"
         odd-row-style="alternate-row" default-table-style="basic-table">
-        <actions>
-            <service service-name="performFind" result-map="result" result-map-list="listIt">
-                <field-map field-name="inputFields" from-field="requestParameters"/>
-                <field-map field-name="entityName" value="SupplierProduct"/>
-                <field-map field-name="orderBy" from-field="parameters.sortField"/>
-                <field-map field-name="viewIndex" from-field="viewIndex"/>
-                <field-map field-name="viewSize" from-field="viewSize"/>
-            </service>
-        </actions>
         <field name="partyId" title="${uiLabelMap.ProductSupplier}">
             <display-entity entity-name="PartyNameView" also-hidden="true" description="${firstName} ${middleName} ${lastName} ${groupName}">
                 <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext">
@@ -935,10 +926,10 @@ under the License.
         </field>
         <field name="supplierProductId"><display/></field>
         <field name="minimumOrderQuantity" title="${uiLabelMap.ProductMinimumOrderQuantity}" sort-field="true">
-            <display type="date-time"/>
+            <display/>
         </field>
         <field name="orderQtyIncrements" title="${uiLabelMap.ProductOrderQtyIncrements}" sort-field="true">
-            <display type="date-time"/>
+            <display/>
         </field>
         <field name="supplierPrefOrderId">
             <display-entity entity-name="SupplierPrefOrder"/>

Modified: ofbiz/branches/release11.04/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/widget/catalog/ProductScreens.xml?rev=1612487&r1=1612486&r2=1612487&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/branches/release11.04/applications/product/widget/catalog/ProductScreens.xml Tue Jul 22 07:15:34 2014
@@ -877,7 +877,11 @@ under the License.
 
                 <!-- default currency in framework/common/config/general.properties -->
                 <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
-
+                <set field="orderBy" from-field="parameters.sortField" default-value="partyId"/>
+                <entity-and entity-name="SupplierProduct" list="productSuppliers">
+                    <field-map field-name="productId" from-field="parameters.productId"/>
+                    <order-by field-name="${orderBy}"/>
+                </entity-and>
                 <entity-one entity-name="SupplierProduct" value-field="supplierProduct" auto-field-map="true"/>
             </actions>
             <widgets>