svn commit: r918769 - in /ofbiz/trunk/applications/accounting/widget: ap/CommonScreens.xml ar/CommonScreens.xml

[doogie-3]

Author: doogie
Date: Wed Mar  3 23:27:42 2010
New Revision: 918769

URL: http://svn.apache.org/viewvc?rev=918769&view=rev
Log:
Fix bad screen definitions, you can't reference a
value(defaultOrganizationPartyId) before it is set.  That variable was
being set by the decorator, which hadn't yet run when the initial
actions were being run for the main screens in these webapps.

Modified:
    ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml

Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=918769&r1=918768&r2=918769&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Wed Mar  3 23:27:42 2010
@@ -44,13 +44,19 @@
                 <set field="tabButtonItem" value="main"></set>
                 <set field="parameters.portalPageId" value="ApPortalPage"/>
                 <set field="invoiceTypeId" value="PURCHASE_INVOICE"/>
-                <set field="organizationPartyId" from-field="organizationPartyId" default-value="${defaultOrganizationPartyId}"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/>
+                        <section>
+                            <actions>
+                                <set field="organizationPartyId" from-field="organizationPartyId" default-value="${defaultOrganizationPartyId}"/>
+                                <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy"/>
+                            </actions>
+                            <widgets>
+                                <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/>
+                            </widgets>
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=918769&r1=918768&r2=918769&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Wed Mar  3 23:27:42 2010
@@ -46,13 +46,19 @@
                 <set field="headerItem" value="main"/>
                 <set field="parameters.portalPageId" value="ArPortalPage"/>
                 <set field="invoiceTypeId" value="SALES_INVOICE"/>
-                <set field="organizationPartyId" from-field="organizationPartyId" default-value="${defaultOrganizationPartyId}"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/>
+                        <section>
+                            <actions>
+                                <set field="organizationPartyId" from-field="organizationPartyId" default-value="${defaultOrganizationPartyId}"/>
+                                <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy"/>
+                            </actions>
+                            <widgets>
+                                <include-screen name="PortalPageScreen" location="component://common/widget/CommonScreens.xml"/>
+                            </widgets>
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -183,4 +189,4 @@
         </section>
     </screen>
 
-</screens>
\ No newline at end of file
+</screens>