svn commit: r826708 - in /ofbiz/trunk/applications/accounting/widget: CommonScreens.xml GlScreens.xml

[apatel-2]

Author: apatel
Date: Mon Oct 19 16:04:53 2009
New Revision: 826708

URL: http://svn.apache.org/viewvc?rev=826708&view=rev
Log:
Moved CommonPartyAccountsDecorator from CommonScreens.xml to GlScreens.xml. Added partyGlDecoratorLocation parameter. The pattern of having decorator for set of screens in same file as screens is much more flexible. Same pattern is used in many our screens sets in accounting e.g Payment, Invoices, BillingAccount etc.

Modified:
    ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/GlScreens.xml

Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=826708&r1=826707&r2=826708&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Mon Oct 19 16:04:53 2009
@@ -176,28 +176,6 @@
         </section>
     </screen>
 
-    <screen name="CommonPartyAccountsDecorator">
-        <section>
-            <actions>
-                <set field="tabButtonItemTop" value="PartyAccounts"/>
-                <entity-one entity-name="PartyNameView" value-field="currentOrganization" auto-field-map="false">
-                    <field-map field-name="partyId" from-field="organizationPartyId"/>
-                </entity-one>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <include-menu name="OrganizationAccountingTabBar" location="component://accounting/widget/Menus.xml"/>
-                        <container>
-                            <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label>
-                        </container>
-                        <decorator-section-include name="body"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
     <screen name="CommonOrganizationAccountingReportsDecorator">
         <section>
             <actions>

Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=826708&r1=826707&r2=826708&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Mon Oct 19 16:04:53 2009
@@ -21,6 +21,28 @@
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
 
+    <screen name="CommonPartyAccountsDecorator">
+        <section>
+            <actions>
+                <set field="tabButtonItemTop" value="PartyAccounts"/>
+                <entity-one entity-name="PartyNameView" value-field="currentOrganization" auto-field-map="false">
+                    <field-map field-name="partyId" from-field="organizationPartyId"/>
+                </entity-one>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-menu name="OrganizationAccountingTabBar" location="component://accounting/widget/Menus.xml"/>
+                        <container>
+                            <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label>
+                        </container>
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
     <screen name="PartyAccountsSummary">
         <section>
             <actions>
@@ -33,7 +55,7 @@
                 </entity-condition -->
             </actions>
             <widgets>
-                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.partyGlDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <widgets>
@@ -86,7 +108,7 @@
                 <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.partyGlDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.AccountingAcctgTrans}">
                             <container>
@@ -189,7 +211,7 @@
                 <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.partyGlDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.AccountingAcctgTransEntries}">
                             <include-form name="FindAcctgTransEntries" location="component://accounting/widget/GlForms.xml"/>
@@ -303,7 +325,7 @@
                 <set field="labelTitleProperty" value="AccountingCreateAcctgTransAndEntries"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.partyGlDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.AccountingCreateAcctgTransAndEntries}">
                             <include-form name="CreateAcctgTransAndEntries" location="component://accounting/widget/GlForms.xml"/>
@@ -334,7 +356,7 @@
                 </entity-and>
             </actions>
             <widgets>
-                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.partyGlDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <condition>
@@ -458,7 +480,7 @@
                 </entity-condition>
             </actions>
             <widgets>
-                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.partyGlDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.PageTitleUnpostedTransactions}">
                             <include-form name="ListUnpostedAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
@@ -563,7 +585,7 @@
                 <set field="labelTitleProperty" value="AccountingCreateAnAccountingTransaction"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.partyGlDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.AccountingCreateAnAccountingTransaction}">
                             <include-form name="CreateAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
@@ -584,7 +606,7 @@
                 <set field="glAccountId" from-field="parameters.glAccountId"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.partyGlDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.AccountingAcctRecon}">
                             <include-form name="FindGlAccountReconciliation" location="component://accounting/widget/GlForms.xml"/>
@@ -614,7 +636,7 @@
                 <entity-one entity-name="GlReconciliation" value-field="glReconciliation"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.partyGlDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.AccountingEditAcctRecon}">
                             <include-form name="EditGlReconciliation" location="component://accounting/widget/GlForms.xml"/>
@@ -637,7 +659,7 @@
                 <set field="glAccountId" from-field="parameters.glAccountId"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.partyGlDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.AccountingAcctRecons}">
                             <include-form name="FindGlAccountReconciliations" location="component://accounting/widget/GlForms.xml"/>