svn commit: r574816 - in /ofbiz/trunk/applications/accounting: webapp/accounting/WEB-INF/controller.xml webapp/accounting/admin/AdminTabBar.ftl widget/AccountingScreens.xml widget/AdminScreens.xml

[apatel-2]

Author: apatel
Date: Wed Sep 12 00:19:56 2007
New Revision: 574816

URL: http://svn.apache.org/viewvc?rev=574816&view=rev
Log:
Re-Org of admin screens/menus

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl
    ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
    ofbiz/trunk/applications/accounting/widget/AdminScreens.xml

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=574816&r1=574815&r2=574816&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Wed Sep 12 00:19:56 2007
@@ -1459,7 +1459,6 @@
     <view-map name="ListGlobalGlAccounts" type="screen" page="component://accounting/widget/AccountingScreens.xml#ListGlAccounts"/>
     <view-map name="ListGlAccountsReport" type="screenfop" page="component://accounting/widget/AccountingScreens.xml#ListGlAccountsReport" content-type="application/pdf" encoding="none"/>
     <view-map name="ListGlAccountsExport" type="screenxml" page="component://accounting/widget/AccountingScreens.xml#ListGlAccountsExport" content-type="text/xml"/>
-    <view-map name="ListGlAccountOrganization" type="screen" page="component://accounting/widget/AccountingScreens.xml#ListGlAccountOrganization"/>
     <view-map name="GlAccountNavigate" type="screen" page="component://accounting/widget/AccountingScreens.xml#GlAccountNavigate"/>
     <view-map name="AssignGlAccount" type="screen" page="component://accounting/widget/AccountingScreens.xml#AssignGlAccount"/>
 
@@ -1533,6 +1532,7 @@
     <view-map name="EditTaxAuthorityPartyInfo" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#EditTaxAuthorityPartyInfo"/>
 
     <!-- administrative pages -->
+    <view-map name="ListGlAccountOrganization" type="screen" page="component://accounting/widget/AdminScreens.xml#ListGlAccountOrganization"/>
     <view-map name="ListCompanies" type="screen" page="component://accounting/widget/AdminScreens.xml#ListCompanies"/>
     <view-map name="TimePeriods" type="screen" page="component://accounting/widget/AdminScreens.xml#TimePeriods"/>
     <view-map name="PartyAcctgPreference" type="screen" page="component://accounting/widget/AdminScreens.xml#PartyAcctgPreference"/>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl?rev=574816&r1=574815&r2=574816&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl Wed Sep 12 00:19:56 2007
@@ -22,12 +22,11 @@
 <h1>${title?if_exists} ${labelTitleProperty?if_exists} ${uiLabelMap.CommonFor} ${uiLabelMap.Organization}: ${organizationPartyId}</h1>
 <div class="button-bar button-style-1">
   <ul>
+    <li<#if selected == "ListGlAccountOrganization"> class="selected"</#if>><a href="<@ofbizUrl>ListGlAccountOrganization?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AcctgListGlAcctOrg}</a></li>
     <li<#if selected == "TimePeriods"> class="selected"</#if>><a href="<@ofbizUrl>TimePeriods?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.TimePeriod}</a></li>
     <li<#if selected == "PartyAcctgPreference"> class="selected"</#if>><a href="<@ofbizUrl>PartyAcctgPreference?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingPreference}</a></li>
     <li<#if selected == "ChecksTabButton"> class="selected"</#if>><a href="<@ofbizUrl>listChecksToPrint?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingChecks}</a></li>
     <li<#if selected == "ViewFXConversions"> class="selected"</#if>><a href="<@ofbizUrl>viewFXConversions?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingFX}</a></li>
-    <li<#if selected == "EditGlJournalEntry"> class="selected"</#if>><a href="<@ofbizUrl>EditGlJournalEntry?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingManualJournalEntry}</a></li>
-    <li<#if selected == "ListUnpostedAcctgTrans"> class="selected"</#if>><a href="<@ofbizUrl>ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingManualPostTrans}</a></li>
     <li<#if selected == "GlAccountAssignment"> class="selected"</#if>><a href="<@ofbizUrl>GlAccountAssignment?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingGlAccountDefault}</a></li>
   </ul>
   <br class="clear"/>

Modified: ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml?rev=574816&r1=574815&r2=574816&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml Wed Sep 12 00:19:56 2007
@@ -182,26 +182,6 @@
         </section>
     </screen>
     
-    <screen name="ListGlAccountOrganization">
-        <section>
-            <actions>
-                <set field="titleProperty" value="AcctgListGlAcctOrg"/>
-                <set field="tabButtonItem" value="ListGlAccountOrganization"/>
-                <set field="labelTitleProperty" value="AcctgListGlAcctOrg"/>
-                <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="GenericDecorator">
-                    <decorator-section name="body">
-                        <include-form name="ListGlAccountOrganization" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
-                        <!-- include-form name="ListGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/ -->
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
     <screen name="AssignGlAccount">
         <section>
             <actions>

Modified: ofbiz/trunk/applications/accounting/widget/AdminScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AdminScreens.xml?rev=574816&r1=574815&r2=574816&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AdminScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AdminScreens.xml Wed Sep 12 00:19:56 2007
@@ -42,6 +42,25 @@
         </section>
     </screen>
 
+    <screen name="ListGlAccountOrganization">
+        <section>
+            <actions>
+                <set field="titleProperty" value="AcctgListGlAcctOrg"/>
+                <set field="tabButtonItem" value="ListGlAccountOrganization"/>
+                <set field="labelTitleProperty" value="AcctgListGlAcctOrg"/>
+                <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="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-form name="ListGlAccountOrganization" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
     <screen name="TimePeriods">
         <section>
             <actions>