svn commit: r633410 - in /ofbiz/trunk/applications/product: webapp/catalog/product/ProductForms.xml widget/catalog/ProductScreens.xml

[jacopoc]

Author: jacopoc
Date: Tue Mar  4 02:10:04 2008
New Revision: 633410

URL: http://svn.apache.org/viewvc?rev=633410&view=rev
Log:
Fixed list of purchase agreement prices in the Product>Agreement screen.

Modified:
    ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
    ofbiz/trunk/applications/product/widget/catalog/ProductScreens.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?rev=633410&r1=633409&r2=633410&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Tue Mar  4 02:10:04 2008
@@ -1327,19 +1327,22 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 
-    <form name="ListPurchaseAgreements" type="list" list-name="purchaseAgreements"
+    <form name="ListSupplierProductAgreements" type="list" list-name="supplierProductAgreements"
         odd-row-style="alternate-row" default-table-style="basic-table">
+        <row-actions>
+            <entity-one entity-name="Agreement" value-name="agreement"/>
+        </row-actions>
         <field name="agreementId" widget-style="buttontext">
-            <hyperlink target="/accounting/control/EditAgreementItemProduct?agreementId=${agreementId}&amp;agreementItemSeqId=${agreementItemSeqId}&amp;productId=${productId}" target-type="inter-app"
-                description="${agreementId}/${agreementItemSeqId}" also-hidden="false"/>
+            <hyperlink target="/accounting/control/EditAgreement?agreementId=${agreementId}" target-type="inter-app"
+                description="${agreementId}" also-hidden="false"/>
         </field>
-        <field name="partyIdTo" title="${uiLabelMap.ProductSupplier}"><display/></field>
-        <field name="agreementText"><display/></field>
-        <field name="description"><display/></field>
-        <field name="fromDate"><display/></field>
-        <field name="thruDate"><display/></field>
+        <field name="partyId" title="${uiLabelMap.ProductSupplier}"><display/></field>
+        <field name="agreementText"><display description="${agreement.agreementText}"/></field>
+        <field name="description"><display description="${agreement.description}"/></field>
+        <field name="availableFromDate"><display/></field>
+        <field name="availableThruDate"><display/></field>
         <field name="currencyUomId"><display/></field>
-        <field name="price"><display/></field>
+        <field name="lastPrice"><display/></field>
     </form>
     <form name="ListSalesAgreements" type="list" list-name="salesAgreements"
         odd-row-style="alternate-row" default-table-style="basic-table">

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=633410&r1=633409&r2=633410&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Tue Mar  4 02:10:04 2008
@@ -166,11 +166,13 @@
     
                 <set field="productId" from-field="parameters.productId"/>
                 <entity-one entity-name="Product" value-name="product"/>
-                <entity-and entity-name="AgreementItemAndProductAppl" list-name="purchaseAgreements">
-                    <field-map field-name="productId"/>
-                    <field-map field-name="agreementTypeId" value="PURCHASE_AGREEMENT"/>
-                    <order-by field-name="fromDate"/>
-                </entity-and>
+                <entity-condition entity-name="SupplierProduct" list-name="supplierProductAgreements">
+                    <condition-list>
+                        <condition-expr field-name="productId" env-name="productId"/>
+                        <condition-expr field-name="agreementId" operator="not-equals" env-name="nullField"/>
+                    </condition-list>
+                    <order-by field-name="availableFromDate"/>
+                </entity-condition>
                 <entity-and entity-name="AgreementItemAndProductAppl" list-name="salesAgreements">
                     <field-map field-name="productId"/>
                     <field-map field-name="agreementTypeId" value="SALES_AGREEMENT"/>
@@ -194,7 +196,7 @@
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <include-form name="ListPurchaseAgreements" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+                                        <include-form name="ListSupplierProductAgreements" location="component://product/webapp/catalog/product/ProductForms.xml"/>
                                     </widgets>
                                 </section>
                             </container>