svn commit: r752811 - in /ofbiz/trunk/applications/accounting: webapp/accounting/agreement/AgreementForms.xml widget/AgreementScreens.xml

[hansbak-2]

Author: hansbak
Date: Thu Mar 12 09:26:55 2009
New Revision: 752811

URL: http://svn.apache.org/viewvc?rev=752811&view=rev
Log:
agreement termlist did not show: fixed

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
    ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml?rev=752811&r1=752810&r2=752811&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Thu Mar 12 09:26:55 2009
@@ -28,7 +28,7 @@
         </field>
         <field name="agreementTypeId" title="${uiLabelMap.AccountingAgreementTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="AgreementType" key-field-name="agreementTypeId"/>
+                <entity-options description="${description}" entity-name="AgreementType"/>
             </drop-down>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.AccountingPartyIdFrom}">
@@ -179,12 +179,11 @@
     <form name="ListAgreementTerms" target="updateAgreementTerm" list-name="agreementTerms" paginate-target="ListAgreementTerms" title="" type="list"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-            <entity-condition entity-name="AgreementTerm">
-                <condition-list>
-                    <condition-expr field-name="agreementId" from-field="agreementId"/>
-                    <condition-expr field-name="agreementItemSeqId" from-field="null"/>
-                </condition-list>
-            </entity-condition>
+            <entity-and entity-name="AgreementTerm" list="agreementTerms">
+                <field-map field-name="agreementId" from-field="agreementId"/>
+                <order-by field-name="agreementItemSeqId"/>
+                <order-by field-name="agreementItemId"/>
+            </entity-and>
         </actions>
         <auto-fields-service service-name="updateAgreementTerm" />
         <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>

Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=752811&r1=752810&r2=752811&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Thu Mar 12 09:26:55 2009
@@ -70,8 +70,6 @@
             <actions>
                 <set field="titleProperty" value="PageTitleFindAgreement"/>
                 <set field="headerItem" value="agreements"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">