svn commit: r826934 - /ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml

[apatel-2]

Author: apatel
Date: Tue Oct 20 03:02:06 2009
New Revision: 826934

URL: http://svn.apache.org/viewvc?rev=826934&view=rev
Log:
Moving reading agreement entity to decorator was not very good Idea. It broke create new agreement screen. Putting part of the code back where it was.

Modified:
    ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml

Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=826934&r1=826933&r2=826934&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Tue Oct 20 03:02:06 2009
@@ -27,8 +27,6 @@
         <section>
             <actions>
                 <set field="headerItem" value="agreements"/>
-                <set field="agreementId" from-field="parameters.agreementId"/>
-                <entity-one entity-name="Agreement" value-field="agreement"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -112,6 +110,9 @@
             <actions>
                 <set field="titleProperty" value="PageTitleEditAgreement"/>
                 <set field="tabButtonItem" value="AgreementMain"/>
+                <set field="agreementId" from-field="parameters.agreementId"/>
+                <entity-one entity-name="Agreement" value-field="agreement"/>
+                
             </actions>
             <widgets>
                 <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
@@ -143,6 +144,8 @@
             <actions>
                 <set field="titleProperty" value="PageTitleListAgreementItems"/>
                 <set field="tabButtonItem" value="AgreementItems"/>
+                <set field="agreementId" from-field="parameters.agreementId"/>
+                <entity-one entity-name="Agreement" value-field="agreement"/>
                 <entity-and entity-name="AgreementItem" list="agreementItems">
                     <field-map from-field="agreement.agreementId" field-name="agreementId"/>
                 </entity-and>
@@ -170,6 +173,8 @@
                 <set field="titleProperty" value="PageTitleEditAgreementItem"/>
                 <set field="tabButtonItem" value="AgreementItems"/>
                 <set field="buttonBarItem" value="EditAgreementItem"/>
+                <set field="agreementId" from-field="parameters.agreementId"/>
+                <entity-one entity-name="Agreement" value-field="agreement"/>
                 <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
                 <set field="agreementItemSeqId" from-field="parameters.agreementItemSeqId"/>
                 <entity-one entity-name="AgreementItem" value-field="agreementItem"/>
@@ -197,6 +202,8 @@
                 <set field="titleProperty" value="PageTitleEditAgreementTerm"/>
                 <set field="tabButtonItem" value="AgreementTerms"/>
                 <set field="buttonBarItem" value="EditAgreementTerms"/>
+                <set field="agreementId" from-field="parameters.agreementId"/>
+                <entity-one entity-name="Agreement" value-field="agreement"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
@@ -217,6 +224,8 @@
                 <set field="titleProperty" value="PageTitleListAgreementPromoAppls"/>
                 <set field="tabButtonItem" value="AgreementItems"/>
                 <set field="buttonBarItem" value="ListAgreementPromoAppls"/>
+                <set field="agreementId" from-field="parameters.agreementId"/>
+                <entity-one entity-name="Agreement" value-field="agreement"/>
                 <entity-one entity-name="AgreementItem" value-field="agreementItem"/>
                 <entity-and entity-name="AgreementPromoAppl" list="agreementPromoAppls">
                     <field-map from-field="agreement.agreementId" field-name="agreementId"/>
@@ -248,6 +257,8 @@
                 <set field="titleProperty" value="PageTitleEditAgreementPromoAppl"/>
                 <set field="tabButtonItem" value="AgreementItems"/>
                 <set field="buttonBarItem" value="ListAgreementPromoAppls"/>
+                <set field="agreementId" from-field="parameters.agreementId"/>
+                <entity-one entity-name="Agreement" value-field="agreement"/>
                 <set field="agreementTermId" from-field="parameters.agreementTermId"/>
                 <entity-one entity-name="AgreementItem" value-field="agreementItem" auto-field-map="true"/>
                 <entity-one entity-name="AgreementPromoAppl" value-field="agreementPromoAppl" auto-field-map="true"/>
@@ -276,6 +287,8 @@
                 <set field="titleProperty" value="PageTitleListAgreementItemTerms"/>
                 <set field="tabButtonItem" value="AgreementItems"/>
                 <set field="buttonBarItem" value="ListAgreementItemTerms"/>
+                <set field="agreementId" from-field="parameters.agreementId"/>
+                <entity-one entity-name="Agreement" value-field="agreement"/>
                 <entity-one entity-name="AgreementItem" value-field="agreementItem"/>
                 <entity-and entity-name="AgreementTerm" list="agreementTerms">
                     <field-map from-field="agreement.agreementId" field-name="agreementId"/>