svn commit: r597157 - in /ofbiz/trunk/applications/accounting: config/ webapp/accounting/WEB-INF/ webapp/accounting/admin/ widget/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r597157 - in /ofbiz/trunk/applications/accounting: config/ webapp/accounting/WEB-INF/ webapp/accounting/admin/ widget/

jacopoc
Author: jacopoc
Date: Wed Nov 21 09:46:17 2007
New Revision: 597157

URL: http://svn.apache.org/viewvc?rev=597157&view=rev
Log:
Further ui cleanups for the Accounting screens.

Removed:
    ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminChecksTabBar.ftl
    ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl
Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
    ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
    ofbiz/trunk/applications/accounting/widget/AdminScreens.xml
    ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/Menus.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?rev=597157&r1=597156&r2=597157&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Wed Nov 21 09:46:17 2007
@@ -45,6 +45,7 @@
 
 AccountingAccount=Account
 AccountingAccountId=Account ID
+AccountingAccounting=Accounting
 AccountingAccountLimit=Account Limit
 AccountingAccountNumber=Account Number
 AccountingAccountType=Account Type
@@ -377,6 +378,7 @@
 AccountingSalesInvoiceToRevenue=Sales Invoice type to Revenue GL Account Number assignment list
 AccountingSecurityCodeCard=Card Security Code
 AccountingSendChecks=Mark Checks Sent
+AccountingSetup=Setup
 AccountingShowAllFixedAssets=Show All Fixed Assets
 AccountingShowAllInvoices=Show All Invoices
 AccountingShowAllPayments=Show All Payments

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=597157&r1=597156&r2=597157&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Wed Nov 21 09:46:17 2007
@@ -1439,6 +1439,8 @@
     <view-map name="NewGlJournalEntry" type="screen" page="component://accounting/widget/AccountingScreens.xml#NewGlJournalEntry"/>
     <view-map name="EditAcctgTrans" type="screen" page="component://accounting/widget/AccountingScreens.xml#EditAcctgTrans"/>
     <view-map name="ListUnpostedAcctgTrans" type="screen" page="component://accounting/widget/AccountingScreens.xml#ListUnpostedAcctgTrans"/>
+    <view-map name="ListChecksToPrint" type="screen" page="component://accounting/widget/AccountingScreens.xml#ListChecksToPrint"/>
+    <view-map name="ListChecksToSend" type="screen" page="component://accounting/widget/AccountingScreens.xml#ListChecksToSend"/>
     
     <!-- GlAccount, GlJournalEntry, AcctgTrans -->
     <view-map name="AddGlAccount" type="screen" page="component://accounting/widget/AccountingScreens.xml#AddGlAccount"/>
@@ -1528,8 +1530,6 @@
     <view-map name="GlAccountSalInvoice" type="screen" page="component://accounting/widget/AdminScreens.xml#GlAccountSalInvoice"/>
     <view-map name="GlAccountTypePaymentType" type="screen" page="component://accounting/widget/AdminScreens.xml#GlAccountTypePaymentType"/>
     <view-map name="GlAccountNrPaymentMethod" type="screen" page="component://accounting/widget/AdminScreens.xml#GlAccountNrPaymentMethod"/>
-    <view-map name="ListChecksToPrint" type="screen" page="component://accounting/widget/AdminScreens.xml#ListChecksToPrint"/>
-    <view-map name="ListChecksToSend" type="screen" page="component://accounting/widget/AdminScreens.xml#ListChecksToSend"/>
     
     <!-- Manual Credit Card Transaction -->
     <view-map name="FindGatewayResponses" page="component://accounting/widget/TransactionScreens.xml#FindGatewayResponses" type="screen"/>

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=597157&r1=597156&r2=597157&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml Wed Nov 21 09:46:17 2007
@@ -23,8 +23,8 @@
         
     <form name="ListCompanies" type="list" title="Internal Organizations" list-name="parties">
         <field name="partyId" title="${uiLabelMap.AccountingCompanies}"><display-entity entity-name="PartyGroup" description="${groupName}"/></field>
-        <field name="admin" title="${uiLabelMap.AccountingAdmin}"><hyperlink target="AdminMain?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingAdmin}"/></field>
-        <field name="accounts" title="${uiLabelMap.AccountingAccounts}"><hyperlink target="PartyAccountsSummary?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingAccounts}"/></field>
+        <field name="setup" title="${uiLabelMap.CommonEmptyHeader}"><hyperlink target="AdminMain?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingSetup}"/></field>
+        <field name="accounting" title="${uiLabelMap.CommonEmptyHeader}"><hyperlink target="PartyAccountsSummary?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingAccounting}"/></field>
     </form>
 
     <form name="ListGlAccountOrganization" list-name="listIt" target="" title="" type="list" paginate-target="ListGlAccountOrganization">

Modified: ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml?rev=597157&r1=597156&r2=597157&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml Wed Nov 21 09:46:17 2007
@@ -101,6 +101,7 @@
                 <set field="titleProperty" value="PartyAccountsSummary"/>
                 <set field="tabButtonItem" value="PartyAccountsSummary"/>
                 <set field="labelTitleProperty" value="PartyAccountsSummary"/>
+                <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
                 <!-- entity-condition entity-name="GlAccountOrganization" list-name="entityList" use-cache="true" >
                     <condition-expr field-name="glAccountId" operator="greater" value="0" />
                 </entity-condition -->
@@ -108,17 +109,29 @@
             <widgets>
                 <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <label style="head1">${uiLabelMap.PartyAccountsSummary}</label>
-                            <section>
-                                <widgets>                                                  
-                                    <container style="lefthalf">
-                                        <include-screen name="JournalEntryShortcuts"/>
+                        <section>
+                            <widgets>
+                                <container style="lefthalf">
+                                    <container>
+                                        <link target="NewGlJournalEntry?organizationPartyId=${organizationPartyId}&amp;debitGlAccountClassId=CURRENT_ASSET&amp;creditGlAccountClassId=REVENUE&amp;acctgTransTypeId=SALES_ACCTG_TRANS" text="${uiLabelMap.AccountingCreateSalesJournalEntry}" style="buttontext"/>
+                                    </container>
+                                    <container>
+                                        <link target="NewGlJournalEntry?organizationPartyId=${organizationPartyId}&amp;debitGlAccountClassId=CASH_EQUIVALENT&amp;creditGlAccountClassId=CURRENT_LIABILITY&amp;acctgTransTypeId=PAYMENT_ACCTG_TRANS" text="${uiLabelMap.AccountingCreatePaymentJournalEntry}" style="buttontext"/>
+                                    </container>
+                                </container>
+                                <container style="righthalf">
+                                    <container>
+                                        <link target="TrialBalance?organizationPartyId=${organizationPartyId}" text="${uiLabelMap.AccountingTrialBalance}" style="buttontext"/>
+                                    </container>
+                                    <container>
+                                        <link target="IncomeStatement?organizationPartyId=${organizationPartyId}" text="${uiLabelMap.AccountingIncomeStatement}" style="buttontext"/>
                                     </container>
-                                    <container style="righthalf">
-                                        <include-screen name="AccountingReports"/>
+                                    <container>
+                                        <link target="BalanceSheet?organizationPartyId=${organizationPartyId}" text="${uiLabelMap.AccountingBalanceSheet}" style="buttontext"/>
                                     </container>
-                                </widgets>
-                            </section>                        
+                                </container>
+                            </widgets>
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -131,6 +144,7 @@
                 <set field="titleProperty" value="AcctgFindGlJournalEntry"/>
                 <set field="tabButtonItem" value="FindGlJournalEntry"/>
                 <set field="labelTitleProperty" value="AcctgFindGlJournalEntry"/>
+                <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
@@ -486,6 +500,88 @@
             </widgets>
         </section>
     </screen>
-    
+
+    <screen name="ListChecksToPrint">
+        <section>
+            <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="titleProperty" value="AccountingPrintChecks"/>
+                <set field="tabButtonItem" value="ChecksTabButton"/>
+                <set field="tabButtonItem2" value="PrintChecksTabButton"/>
+                <set field="labelTitleProperty" value="${uiLabelMap.AccountingPrintChecks}"/>
+                <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
+
+                <!-- find payments of paymentMethodType PERSONAL_CHECK or COMPANY_CHECK with statusId NOT_PAID -->
+                <entity-condition entity-name="Payment" list-name="payments">
+                    <condition-list combine="and">
+                        <condition-expr field-name="partyIdFrom" operator="equals" env-name="organizationPartyId"/>
+                        <condition-expr field-name="statusId" operator="equals" value="PMNT_NOT_PAID"/>
+                        <condition-list combine="or">
+                            <condition-expr field-name="paymentMethodTypeId" operator="equals" value="PERSONAL_CHECK"/>
+                            <condition-expr field-name="paymentMethodTypeId" operator="equals" value="COMPANY_CHECK"/>
+                        </condition-list>
+                    </condition-list>
+                    <order-by field-name="effectiveDate"/>
+                </entity-condition>
+                <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/filterOutReceipts.bsh"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonAdminChecksDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="checks-body">
+                        <section>
+                        <condition><if-has-permission permission="ACCOUNTING" action="_PRINT_CHECKS"/></condition>
+                        <widgets>
+                            <include-form name="ListChecksToPrint" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+                        </widgets>
+                        <fail-widgets>
+                            <label style="head3">${uiLabelMap.AccountingPrintChecksPermissionError}</label>
+                        </fail-widgets>
+                      </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="ListChecksToSend">
+        <section>
+            <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="titleProperty" value="AccountingSendChecks"/>
+                <set field="tabButtonItem" value="ChecksTabButton"/>
+                <set field="tabButtonItem2" value="SendChecksTabButton"/>
+                <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
+
+                <!-- find payments of paymentMethodType PERSONAL_CHECK or COMPANY_CHECK with statusId NOT_PAID -->
+                <entity-condition entity-name="Payment" list-name="payments">
+                    <condition-list combine="and">
+                        <condition-expr field-name="partyIdFrom" operator="equals" env-name="organizationPartyId"/>
+                        <condition-expr field-name="statusId" operator="equals" value="PMNT_NOT_PAID"/>
+                        <condition-list combine="or">
+                            <condition-expr field-name="paymentMethodTypeId" operator="equals" value="PERSONAL_CHECK"/>
+                            <condition-expr field-name="paymentMethodTypeId" operator="equals" value="COMPANY_CHECK"/>
+                        </condition-list>
+                    </condition-list>
+                    <order-by field-name="effectiveDate"/>
+                </entity-condition>
+                <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/filterOutReceipts.bsh"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonAdminChecksDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="checks-body">
+                        <section>
+                        <condition><if-has-permission permission="PAY_INFO" action="_UPDATE"/></condition>
+                        <widgets>
+                            <include-form name="ListChecksToSend" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+                        </widgets>
+                        <fail-widgets>
+                            <label style="head3">${uiLabelMap.AccountingUpdatePaymentPermissionError}</label>
+                        </fail-widgets>
+                      </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
 </screens>
 

Modified: ofbiz/trunk/applications/accounting/widget/AdminScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AdminScreens.xml?rev=597157&r1=597156&r2=597157&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AdminScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AdminScreens.xml Wed Nov 21 09:46:17 2007
@@ -244,111 +244,4 @@
             </widgets>
         </section>
     </screen>
-
-    <!-- generates the subtab of [Checks] using AdminChecksTabBar -->
-    <screen name="CommonAdminChecksDecorator">
-        <section>
-            <widgets>
-                <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <widgets>
-                                <container>
-                                    <label style="head1" text="${title}"/>
-                                </container>
-                                <platform-specific>
-                                    <html><html-template location="component://accounting/webapp/accounting/admin/AdminChecksTabBar.ftl"/></html>
-                                </platform-specific>
-
-                                <decorator-section-include name="checks-body"/>
-                            </widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="ListChecksToPrint">
-        <section>
-            <actions>
-                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="titleProperty" value="AccountingPrintChecks"/>
-                <set field="tabButtonItem" value="ChecksTabButton"/>
-                <set field="labelTitleProperty" value="${uiLabelMap.AccountingPrintChecks}"/>
-                <set field="checksTabButtonItem" value="PrintChecksTabButton"/>
-                <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
-
-                <!-- find payments of paymentMethodType PERSONAL_CHECK or COMPANY_CHECK with statusId NOT_PAID -->
-                <entity-condition entity-name="Payment" list-name="payments">
-                    <condition-list combine="and">
-                        <condition-expr field-name="partyIdFrom" operator="equals" env-name="organizationPartyId"/>
-                        <condition-expr field-name="statusId" operator="equals" value="PMNT_NOT_PAID"/>
-                        <condition-list combine="or">
-                            <condition-expr field-name="paymentMethodTypeId" operator="equals" value="PERSONAL_CHECK"/>
-                            <condition-expr field-name="paymentMethodTypeId" operator="equals" value="COMPANY_CHECK"/>
-                        </condition-list>
-                    </condition-list>
-                    <order-by field-name="effectiveDate"/>
-                </entity-condition>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/filterOutReceipts.bsh"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonAdminChecksDecorator">
-                    <decorator-section name="checks-body">
-                        <section>
-                        <condition><if-has-permission permission="ACCOUNTING" action="_PRINT_CHECKS"/></condition>
-                        <widgets>
-                            <include-form name="ListChecksToPrint" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
-                        </widgets>
-                        <fail-widgets>
-                            <label style="head3">${uiLabelMap.AccountingPrintChecksPermissionError}</label>
-                        </fail-widgets>
-                      </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="ListChecksToSend">
-        <section>
-            <actions>
-                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="titleProperty" value="AccountingSendChecks"/>
-                <set field="tabButtonItem" value="ChecksTabButton"/>
-                <set field="checksTabButtonItem" value="SendChecksTabButton"/>
-                <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
-
-                <!-- find payments of paymentMethodType PERSONAL_CHECK or COMPANY_CHECK with statusId NOT_PAID -->
-                <entity-condition entity-name="Payment" list-name="payments">
-                    <condition-list combine="and">
-                        <condition-expr field-name="partyIdFrom" operator="equals" env-name="organizationPartyId"/>
-                        <condition-expr field-name="statusId" operator="equals" value="PMNT_NOT_PAID"/>
-                        <condition-list combine="or">
-                            <condition-expr field-name="paymentMethodTypeId" operator="equals" value="PERSONAL_CHECK"/>
-                            <condition-expr field-name="paymentMethodTypeId" operator="equals" value="COMPANY_CHECK"/>
-                        </condition-list>
-                    </condition-list>
-                    <order-by field-name="effectiveDate"/>
-                </entity-condition>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/filterOutReceipts.bsh"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonAdminChecksDecorator">
-                    <decorator-section name="checks-body">
-                        <section>
-                        <condition><if-has-permission permission="PAY_INFO" action="_UPDATE"/></condition>
-                        <widgets>
-                            <include-form name="ListChecksToSend" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
-                        </widgets>
-                        <fail-widgets>
-                            <label style="head3">${uiLabelMap.AccountingUpdatePaymentPermissionError}</label>
-                        </fail-widgets>
-                      </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
 </screens>

Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=597157&r1=597156&r2=597157&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Wed Nov 21 09:46:17 2007
@@ -273,7 +273,7 @@
     <screen name="CommonPartyAccountsDecorator">
         <section>
             <actions>
-                <set field="tabButtonItemTop" value="PartyAccountsSummary"/>
+                <set field="tabButtonItemTop" value="PartyAccounts"/>
                 <entity-one entity-name="PartyNameView" value-name="currentOrganization" auto-field-map="false">
                     <field-map field-name="partyId" env-name="organizationPartyId"/>
                 </entity-one>
@@ -292,6 +292,30 @@
         </section>
     </screen>
     
+    <screen name="CommonAdminChecksDecorator">
+        <section>
+            <actions>
+                <set field="tabButtonItemTop" value="PartyAccounts"/>
+                <entity-one entity-name="PartyNameView" value-name="currentOrganization" auto-field-map="false">
+                    <field-map field-name="partyId" env-name="organizationPartyId"/>
+                </entity-one>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-menu name="PartyAccountsTabBar" location="component://accounting/widget/Menus.xml"/>
+                        <include-menu name="PartyAccountingChecksTabBar" location="component://accounting/widget/Menus.xml"/>
+                        <container>
+                            <label style="head1">${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label>
+                        </container>
+                        <decorator-section-include name="checks-body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+
     <screen name="CommonFinAccountDecorator">
         <section>
             <actions>

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=597157&r1=597156&r2=597157&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Wed Nov 21 09:46:17 2007
@@ -406,10 +406,10 @@
     
     <menu name="PartyTopTabBar" selected-menuitem-context-field-name="tabButtonItemTop" default-menu-item-name="PartyAccountsSummary" default-selected-style="selected"
         menu-container-style="button-bar tab-bar" type="simple">
-        <menu-item name="Admin" title="${uiLabelMap.AccountingAccounts}">
+        <menu-item name="Admin" title="${uiLabelMap.AccountingSetup}">
             <link target="AdminMain?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
-        <menu-item name="PartyAccountsSummary" title="${uiLabelMap.AcctgPartyGlJournalSummary}">
+        <menu-item name="PartyAccounts" title="${uiLabelMap.AccountingAccounting}">
             <link target="PartyAccountsSummary?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
     </menu>
@@ -424,6 +424,9 @@
         <menu-item name="ListUnpostedAcctgTrans" title="${uiLabelMap.AccountingManualPostTrans}">
             <link target="ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
+        <menu-item name="ChecksTabButton" title="${uiLabelMap.AccountingChecks}">
+            <link target="listChecksToPrint?organizationPartyId=${organizationPartyId}"/>
+        </menu-item>
     </menu>
     <menu name="PartyAdminTabBar" default-menu-item-name="ListGlAccountOrganization" default-selected-style="selected"
         menu-container-style="button-bar tab-bar" type="simple">  
@@ -436,9 +439,6 @@
         <menu-item name="PartyAcctgPreference" title="${uiLabelMap.AccountingPreference}">
             <link target="PartyAcctgPreference?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
-        <menu-item name="ChecksTabButton" title="${uiLabelMap.AccountingChecks}">
-            <link target="listChecksToPrint?organizationPartyId=${organizationPartyId}"/>
-        </menu-item>
         <menu-item name="ViewFXConversions" title="${uiLabelMap.AccountingFX}">
             <link target="viewFXConversions?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
@@ -461,26 +461,14 @@
             <link target="GlAccountNrPaymentMethod?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
     </menu>
-
-    <menu name="JournalEntryShortcuts" menu-container-style="${shortCutsMenuStyle}" type="simple">  
-        <menu-item name="CreateSalesJournalEntry" title="${uiLabelMap.AccountingCreateSalesJournalEntry}">
-            <link target="NewGlJournalEntry?organizationPartyId=${organizationPartyId}&amp;debitGlAccountClassId=CURRENT_ASSET&amp;creditGlAccountClassId=REVENUE&amp;acctgTransTypeId=SALES_ACCTG_TRANS"/>
-        </menu-item>
-        <menu-item name="CreatePaymentJournalEntry" title="${uiLabelMap.AccountingCreatePaymentJournalEntry}">
-            <link target="NewGlJournalEntry?organizationPartyId=${organizationPartyId}&amp;debitGlAccountClassId=CASH_EQUIVALENT&amp;creditGlAccountClassId=CURRENT_LIABILITY&amp;acctgTransTypeId=PAYMENT_ACCTG_TRANS"/>
-        </menu-item>
-    </menu>
-    <menu name="AccountingReports" menu-container-style="${shortCutsMenuStyle}" type="simple">  
-        <menu-item name="TrialBalance" title="${uiLabelMap.AccountingTrialBalance}">
-            <link target="TrialBalance?organizationPartyId=${organizationPartyId}"/>
-        </menu-item>
-        <menu-item name="IncomeStatement" title="${uiLabelMap.AccountingIncomeStatement}">
-            <link target="IncomeStatement?organizationPartyId=${organizationPartyId}"/>
+    <menu name="PartyAccountingChecksTabBar" selected-menuitem-context-field-name="tabButtonItem2" default-menu-item-name="GlAccountSalInvoice" default-selected-style="selected"
+        menu-container-style="button-bar tab-bar" type="simple">  
+        <menu-item name="PrintChecksTabButton" title="${uiLabelMap.AccountingPrintChecks}">
+            <link target="listChecksToPrint?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
-        <menu-item name="BalanceSheet" title="${uiLabelMap.AccountingBalanceSheet}">
-            <link target="BalanceSheet?organizationPartyId=${organizationPartyId}"/>
+        <menu-item name="SendChecksTabButton" title="${uiLabelMap.AccountingSendChecks}">
+            <link target="listChecksToSend?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
     </menu>
-    
 </menus>