svn commit: r574830 - in /ofbiz/trunk/applications/accounting: webapp/accounting/WEB-INF/controller.xml webapp/accounting/admin/AdminForms.xml webapp/accounting/chartofaccounts/GlAccountTabBar.ftl widget/AdminScreens.xml

[apatel-2]

Author: apatel
Date: Wed Sep 12 01:05:53 2007
New Revision: 574830

URL: http://svn.apache.org/viewvc?rev=574830&view=rev
Log:
Added screen for managing OrgChartofAccounts from CompanyAdmin screen.

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl
    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=574830&r1=574829&r2=574830&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 01:05:53 2007
@@ -513,7 +513,7 @@
         <security https="true" auth="true"/>
         <event type="service" invoke="createGlAccountOrganization"/>
         <response name="success" type="view" value="ListGlAccountOrganization"/>
-        <response name="error" type="view" value="EditGlobalGlAccountOrganizations"/>
+        <response name="error" type="view" value="ListGlAccountOrganization"/>
     </request-map>
     <request-map uri="updateGlAccountOrganization">
         <security https="true" auth="true"/>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml?rev=574830&r1=574829&r2=574830&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml Wed Sep 12 01:05:53 2007
@@ -26,6 +26,33 @@
         <field name="admin" title="${uiLabelMap.AccountingAdmin}"><hyperlink target="AdminMain?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingAdmin}"/></field>
         <field name="accounts" title="${uiLabelMap.AccountingAccounts}"><hyperlink target="EditGlJournalEntry?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingAccounts}"/></field>
     </form>
+
+    <form name="ListGlAccountOrganization" list-name="listIt" target="" title="" type="list" paginate-target="ListGlAccountOrganization">
+        <actions>
+            <entity-condition entity-name="GlAccountOrganization">
+                <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
+                <order-by field-name="glAccountId"/>
+            </entity-condition>
+        </actions>
+        <auto-fields-entity entity-name="GlAccountOrganization" default-field-type="display"/>
+        <field name="glAccountId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${glAccountId}" target="GlAccountNavigate?glAccountId=${glAccountId}"/>
+        </field>
+    </form>
+
+    <!-- Displays the form for assigning accounts to a party or company -->
+    <!-- TODO: Localize field names -->
+    <form name="AssignGlAccount" type="single" target="createGlAccountOrganization" title="" default-map-name="account">
+        <field name="glAccountId">
+            <drop-down>
+                <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}">
+                    <entity-order-by field-name="glAccountId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="organizationPartyId"><hidden/></field>
+        <field name="submitButton" title="${uiLabelMap.AccountingCreateAssignment}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
     
     <form name="PartyAcctgPreference" type="single" target="createPartyAcctgPreference" default-service-name="createPartyAcctgPreference" default-map-name="partyAcctgPreference">
         <alt-target use-when="partyAcctgPreference!=null" target="updatePartyAcctgPreference"/>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl?rev=574830&r1=574829&r2=574830&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl Wed Sep 12 01:05:53 2007
@@ -23,8 +23,6 @@
     <li<#if selected == "FindGlobalGlAccount"> class="selected"</#if>><a href="<@ofbizUrl>FindGlobalGlAccount</@ofbizUrl>">${uiLabelMap.AcctgChartOfAcctsTabMenu}</a></li>
     <li<#if selected == "GlAccountNavigate"> class="selected"</#if>><a href="<@ofbizUrl>GlAccountNavigate</@ofbizUrl>">${uiLabelMap.AcctgNavigateAccts}</a></li>
     <li<#if selected == "AssignGlAccount"> class="selected"</#if>><a href="<@ofbizUrl>AssignGlAccount</@ofbizUrl>">${uiLabelMap.AcctgAssignGlAccount}</a></li>
-    <li<#if selected == "EditGlJournalEntry"> class="selected"</#if>><a href="<@ofbizUrl>EditGlJournalEntry</@ofbizUrl>">${uiLabelMap.AcctgEditGlJournalEntry}</a></li>
-    <li<#if selected == "ListGlAccountOrganization"> class="selected"</#if>><a href="<@ofbizUrl>ListGlAccountOrganization</@ofbizUrl>">${uiLabelMap.AcctgListGlAcctOrg}</a></li>
   </ul>
   <br class="clear"/>
 </div>

Modified: ofbiz/trunk/applications/accounting/widget/AdminScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AdminScreens.xml?rev=574830&r1=574829&r2=574830&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AdminScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AdminScreens.xml Wed Sep 12 01:05:53 2007
@@ -54,7 +54,8 @@
             <widgets>
                 <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="ListGlAccountOrganization" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+                        <include-form name="ListGlAccountOrganization" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+                        <include-form name="AssignGlAccount" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>