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

[jacopoc]

Author: jacopoc
Date: Thu Nov 22 07:28:00 2007
New Revision: 597431

URL: http://svn.apache.org/viewvc?rev=597431&view=rev
Log:
Misc cleanups and enhancements to the ui related to accounting transactions.
Implemented new screen to search/display accounting transaction entries.

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/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/JournalEntryForms.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=597431&r1=597430&r2=597431&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Thu Nov 22 07:28:00 2007
@@ -157,6 +157,8 @@
 AccountingEquities=Equities
 AccountingExpirationDate=Expiration Date
 AccountingExternalAccountId=Accounting External Account Id
+AccountingAcctgTranss=Accounting Transactions
+AccountingAcctgTransEntries=Accounting Transactions Entries
 AccountingFindInvoices=Find Invoices
 AccountingFindPayment=Find Payment
 AccountingFindPayments=Find 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=597431&r1=597430&r2=597431&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Thu Nov 22 07:28:00 2007
@@ -401,9 +401,9 @@
         <response name="success" type="view" value="NewGlJournalEntry"/>
         <response name="error" type="view" value="NewGlJournalEntry"/>
     </request-map>
-    <request-map uri="FindGlJournalEntry">
+    <request-map uri="FindAcctgTrans">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="FindGlJournalEntry"/>
+        <response name="success" type="view" value="FindAcctgTrans"/>
     </request-map>
     <request-map uri="NewGlJournalEntry">
         <security https="true" auth="true"/>
@@ -435,6 +435,11 @@
         <response name="success" type="view" value="EditAcctgTrans"/>
         <response name="error" type="view" value="EditAcctgTrans"/>
     </request-map>
+    <request-map uri="FindAcctgTransEntries">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="FindAcctgTransEntries"/>
+    </request-map>
+
     <request-map uri="updateAcctgTransEntry">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateAcctgTransEntry"/>
@@ -523,10 +528,6 @@
         <response name="success" type="view" value="EditGlobalGlAccountRoles"/>
         <response name="error" type="view" value="EditGlobalGlAccountRoles"/>
     </request-map>
-    <request-map uri="AccountActivitiesDetail">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="AccountActivitiesDetail"/>
-    </request-map>
     <request-map uri="ListGlAccountEntries">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="ListGlAccountEntries"/>
@@ -1441,9 +1442,10 @@
     
     <!-- Party Accounts -->
     <view-map name="PartyAccountsSummary" type="screen" page="component://accounting/widget/AccountingScreens.xml#PartyAccountsSummary"/>
-    <view-map name="FindGlJournalEntry" type="screen" page="component://accounting/widget/AccountingScreens.xml#FindGlJournalEntry"/>
+    <view-map name="FindAcctgTrans" type="screen" page="component://accounting/widget/AccountingScreens.xml#FindAcctgTrans"/>
     <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="FindAcctgTransEntries" type="screen" page="component://accounting/widget/AccountingScreens.xml#FindAcctgTransEntries"/>
     <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"/>
@@ -1462,7 +1464,6 @@
     <view-map name="EditGlobalGlAccountOrganizations" type="screen" page="component://accounting/widget/AccountingScreens.xml#EditGlobalGlAccountOrganizations"/>
     <view-map name="EditGlobalGlAccountRoles" type="screen" page="component://accounting/widget/AccountingScreens.xml#EditGlobalGlAccountRoles"/>
 
-    <view-map name="AccountActivitiesDetail" type="screen" page="component://accounting/widget/AccountingScreens.xml#AccountActivitiesDetail"/>
     <view-map name="ListGlAccountEntries" type="screen" page="component://accounting/widget/AccountingScreens.xml#ListGlAccountEntries"/>
     <view-map name="ListAcctgTransEntries" type="screen" page="component://accounting/widget/AccountingScreens.xml#ListAcctgTransEntries"/>
     

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=597431&r1=597430&r2=597431&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml Thu Nov 22 07:28:00 2007
@@ -27,14 +27,14 @@
         <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">
+    <form name="ListGlAccountOrganization" list-name="listIt" target="" title="" type="list">
         <actions>
-            <entity-condition entity-name="GlAccountOrganization">
+            <entity-condition entity-name="GlAccountOrganizationAndClass">
                 <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"/>
+        <auto-fields-entity entity-name="GlAccountOrganizationAndClass" default-field-type="display"/>
         <field name="glAccountId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${glAccountId}" target="GlAccountNavigate?glAccountId=${glAccountId}"/>
         </field>
@@ -185,28 +185,6 @@
             </drop-down>
         </field>
     </form>
-    
-    <form name="ListUnpostedAcctgTrans" type="list" title="Unposted Accounting Transactions" list-name="transactions">
-        <field name="acctgTransId" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${acctgTransId}" target="ListAcctgTransEntries?acctgTransId=${acctgTransId}"/>
-        </field>                
-        <field name="transactionDate"><display/></field>                
-        <field name="acctgTransTypeId"><display-entity entity-name="AcctgTransType" description="${description}"/></field>
-        <field name="glFiscalTypeId"><display-entity entity-name="GlFiscalType" description="${description}"/></field>
-        <field name="invoiceId" use-when="invoiceId!=null" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice?invoiceId=${invoiceId}"/>
-        </field>
-        <field name="invoiceId" use-when="invoiceId==null"><display/></field>
-        <field name="paymentId" use-when="paymentId!=null">
-            <hyperlink also-hidden="false" description="${paymentId}" target="editPayment?paymentId=${paymentId}"/>
-        </field>
-        <field name="paymentId" use-when="paymentId==null"><display/></field>
-        <field name="partyId"><display/></field>                
-        <field name="post" title="${uiLabelMap.AccountingPostTransaction}" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.AccountingPostTransaction}" target="postAcctgTrans?acctgTransId=${acctgTransId}&amp;organizationPartyId=${organizationPartyId}" also-hidden="false"/>
-        </field>              
-    </form>
-    
     
     <!-- forms for managing FX rates -->
     <form name="ListConversions" type="list" list-name="conversions">

Modified: ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml?rev=597431&r1=597430&r2=597431&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml Thu Nov 22 07:28:00 2007
@@ -118,6 +118,9 @@
                                     <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>
+                                        <link text="${uiLabelMap.PageTitleUnpostedTransactions}" style="buttontext" target="ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}"/>
+                                    </container>
                                 </container>
                                 <container style="righthalf">
                                     <container>
@@ -140,12 +143,12 @@
         </section>
     </screen>
 
-    <screen name="FindGlJournalEntry">
+    <screen name="FindAcctgTrans">
         <section>
             <actions>
-                <set field="titleProperty" value="AcctgFindGlJournalEntry"/>
-                <set field="tabButtonItem" value="FindGlJournalEntry"/>
-                <set field="labelTitleProperty" value="AcctgFindGlJournalEntry"/>
+                <set field="titleProperty" value="AccountingAcctgTrans"/>
+                <set field="tabButtonItem" value="FindAcctgTrans"/>
+                <set field="labelTitleProperty" value="AccountingAcctgTrans"/>
                 <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
             </actions>
             <widgets>
@@ -153,14 +156,40 @@
                     <decorator-section name="body">
                         <container>
                             <link text="${uiLabelMap.AcctgNewGlJournalEntry}" style="buttontext" target="NewGlJournalEntry?organizationPartyId=${organizationPartyId}"/>
+                            <link text="${uiLabelMap.PageTitleUnpostedTransactions}" style="buttontext" target="ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}"/>
                         </container>
-                        <include-form name="FindGlJournalEntry" location="component://accounting/widget/JournalEntryForms.xml"/>
+                        <include-form name="FindAcctgTrans" location="component://accounting/widget/JournalEntryForms.xml"/>
+                        <section>
+                            <condition>
+                                <if-compare field-name="parameters.performSearch" operator="equals" value="Y"/>
+                            </condition>
+                            <widgets>
+                                <include-form name="ListAcctgTrans" location="component://accounting/widget/JournalEntryForms.xml"/>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="FindAcctgTransEntries">
+        <section>
+            <actions>
+                <set field="titleProperty" value="AccountingAcctgTransEntries"/>
+                <set field="tabButtonItem" value="FindAcctgTransEntries"/>
+                <set field="labelTitleProperty" value="AccountingAcctgTransEntries"/>
+                <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-form name="FindAcctgTransEntries" location="component://accounting/widget/JournalEntryForms.xml"/>
                         <section>
                             <condition>
                                 <if-compare field-name="parameters.performSearch" operator="equals" value="Y"/>
                             </condition>
                             <widgets>
-                                <include-form name="ListJournalEntries" location="component://accounting/widget/JournalEntryForms.xml"/>
+                                <include-form name="ListFindAcctgTransEntries" location="component://accounting/widget/JournalEntryForms.xml"/>
                             </widgets>
                         </section>
                     </decorator-section>
@@ -173,7 +202,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="AcctgNewGlJournalEntry"/>
-                <set field="tabButtonItem" value="FindGlJournalEntry"/>
+                <set field="tabButtonItem" value="FindAcctgTrans"/>
                 <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
                 <set field="labelTitleProperty" value="AcctgNewGlJournalEntry"/>
             </actions>
@@ -192,7 +221,7 @@
             <actions>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="title" value="Edit Accounting transaction"/>
-                <set field="tabButtonItem" value="FindGlJournalEntry"/>
+                <set field="tabButtonItem" value="FindAcctgTrans"/>
                 <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
                 <set field="acctgTransId" from-field="parameters.acctgTransId"/>
                 <script location="component://accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/editGlJournalEntry.bsh"/>
@@ -245,7 +274,7 @@
         <section>
             <actions>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="tabButtonItem" value="ListUnpostedAcctgTrans"/>
+                <set field="tabButtonItem" value="FindAcctgTrans"/>
                 <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
                 <set field="labelTitleProperty" value="${uiLabelMap.PageTitleUnpostedTransactions}"/>
                 <set field="partyId" from-field="parameters.organizationPartyId"/>
@@ -257,7 +286,7 @@
             <widgets>
                 <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="ListUnpostedAcctgTrans" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+                        <include-form name="ListUnpostedAcctgTrans" location="component://accounting/widget/JournalEntryForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=597431&r1=597430&r2=597431&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Thu Nov 22 07:28:00 2007
@@ -281,7 +281,7 @@
             <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="OrganizationAccountingTabBar" location="component://accounting/widget/Menus.xml"/>
                         <container>
                             <label style="head1">${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label>
                         </container>
@@ -303,7 +303,7 @@
             <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="OrganizationAccountingTabBar" 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>

Modified: ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml?rev=597431&r1=597430&r2=597431&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml Thu Nov 22 07:28:00 2007
@@ -21,7 +21,7 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
 
-    <form name="FindGlJournalEntry" type="single" target="FindGlJournalEntry" title="" default-map-name="journal">
+    <form name="FindAcctgTrans" target="FindAcctgTrans" type="single" title="" default-map-name="journal">
         <field name="organizationPartyId"><hidden/></field>
         <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}">
             <drop-down allow-empty="true">
@@ -37,15 +37,15 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="partyId" title="${uiLabelMap.PartyPartyId}">
-            <lookup target-form-name="LookupPartyName" size="20" maxlength="20"/>
-        </field>
         <field name="isPosted">
             <drop-down allow-empty="true">
                 <option description="${uiLabelMap.CommonNo}" key="N"/>
                 <option description="${uiLabelMap.CommonYes}" key="Y"/>
             </drop-down>
         </field>
+        <field name="partyId" title="${uiLabelMap.PartyPartyId}">
+            <lookup target-form-name="LookupPartyName" size="20" maxlength="20"/>
+        </field>
         <field name="invoiceId"><text size="20" maxlength="20"/></field>
         <field name="paymentId"><text size="20" maxlength="20"/></field>
         <field name="produtId"><text size="20" maxlength="20"/></field>
@@ -54,16 +54,20 @@
         <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
 
-    <form name="ListJournalEntries" type="list" title="List Journal Transactions" list-name="acctgTransList">
+    <form name="ListAcctgTrans" type="list" title="List Accounting Transactions" list-name="acctgTransList">
         <actions>
             <entity-condition entity-name="AcctgTransAndEntries" list-name="acctgTransList" distinct="true">
                 <condition-list>
                     <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <condition-expr field-name="acctgTransTypeId" operator="equals" env-name="parameters.acctgTransTypeId" ignore-if-empty="true"/>
+                    <condition-expr field-name="glFiscalTypeId" operator="equals" env-name="parameters.glFiscalTypeId" ignore-if-empty="true"/>
                     <condition-expr field-name="isPosted" operator="equals" env-name="parameters.isPosted" ignore-if-empty="true"/>
                     <condition-expr field-name="partyId" operator="equals" env-name="parameters.partyId" ignore-if-empty="true"/>
-                    <condition-expr field-name="acctgTransTypeId" operator="equals" env-name="parameters.acctgTransTypeId" ignore-if-empty="true"/>
+                    <condition-expr field-name="invoiceId" operator="equals" env-name="parameters.invoiceId" ignore-if-empty="true"/>
+                    <condition-expr field-name="paymentId" operator="equals" env-name="parameters.paymentId" ignore-if-empty="true"/>
+                    <condition-expr field-name="productId" operator="equals" env-name="parameters.productId" ignore-if-empty="true"/>
+                    <condition-expr field-name="workEffortId" operator="equals" env-name="parameters.workEffortId" ignore-if-empty="true"/>
                     <condition-expr field-name="acctgTransId" operator="equals" env-name="parameters.acctgTransId" ignore-if-empty="true"/>
-                    <condition-expr field-name="glFiscalTypeId" operator="equals" env-name="parameters.glFiscalTypeId" ignore-if-empty="true"/>
                 </condition-list>
                 <select-field field-name="acctgTransId"/>
                 <select-field field-name="transactionDate"/>
@@ -126,6 +130,107 @@
         </field>              
     </form>
 
+    <form name="FindAcctgTransEntries" target="FindAcctgTransEntries" type="single" title="">
+        <field name="organizationPartyId"><hidden/></field>
+        <field name="glAccountId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="GlAccountOrganizationAndClass" description="[${glAccountId}] ${accountCode} ${accountName}">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <entity-order-by field-name="glAccountId"/>
+                    <entity-order-by field-name="accountCode"/>
+                    <entity-order-by field-name="accountName"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="AcctgTransType" description="${description}">
+                    <entity-order-by field-name="acctgTransTypeId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="glFiscalTypeId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="GlFiscalType" description="${description}">
+                    <entity-order-by field-name="glFiscalTypeId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="isPosted">
+            <drop-down allow-empty="true">
+                <option description="${uiLabelMap.CommonNo}" key="N"/>
+                <option description="${uiLabelMap.CommonYes}" key="Y"/>
+            </drop-down>
+        </field>
+        <field name="partyId" title="${uiLabelMap.PartyPartyId}">
+            <lookup target-form-name="LookupPartyName" size="20" maxlength="20"/>
+        </field>
+        <field name="invoiceId"><text size="20" maxlength="20"/></field>
+        <field name="paymentId"><text size="20" maxlength="20"/></field>
+        <field name="produtId"><text size="20" maxlength="20"/></field>
+        <field name="workEffortId"><text size="20" maxlength="20"/></field>
+        <field name="performSearch"><hidden value="Y"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field>
+    </form>
+    <form name="ListFindAcctgTransEntries" type="list" title="List Accounting Transaction Entries" list-name="acctgTransEntryList">
+        <actions>
+            <entity-condition entity-name="AcctgTransAndEntries" list-name="acctgTransEntryList">
+                <condition-list>
+                    <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <condition-expr field-name="glAccountId" operator="equals" env-name="parameters.glAccountId" ignore-if-empty="true"/>
+                    <condition-expr field-name="acctgTransTypeId" operator="equals" env-name="parameters.acctgTransTypeId" ignore-if-empty="true"/>
+                    <condition-expr field-name="glFiscalTypeId" operator="equals" env-name="parameters.glFiscalTypeId" ignore-if-empty="true"/>
+                    <condition-expr field-name="isPosted" operator="equals" env-name="parameters.isPosted" ignore-if-empty="true"/>
+                    <condition-expr field-name="partyId" operator="equals" env-name="parameters.partyId" ignore-if-empty="true"/>
+                    <condition-expr field-name="invoiceId" operator="equals" env-name="parameters.invoiceId" ignore-if-empty="true"/>
+                    <condition-expr field-name="paymentId" operator="equals" env-name="parameters.paymentId" ignore-if-empty="true"/>
+                    <condition-expr field-name="productId" operator="equals" env-name="parameters.productId" ignore-if-empty="true"/>
+                    <condition-expr field-name="workEffortId" operator="equals" env-name="parameters.workEffortId" ignore-if-empty="true"/>
+                    <condition-expr field-name="acctgTransId" operator="equals" env-name="parameters.acctgTransId" ignore-if-empty="true"/>
+                </condition-list>
+                <order-by field-name="-transactionDate"/>
+                <order-by field-name="glAccountId"/>
+            </entity-condition>
+        </actions>
+        <row-actions>
+            <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get(&quot;glAccountId&quot;);return new Boolean(!(prev!=null&amp;&amp;prev.equals(glAccountId)));}" type="Boolean"/>
+        </row-actions>
+        <field name="glAccountId" position="1" use-when="showPosition1" widget-area-style="viewManyTR1"><display/></field>
+        <field name="glAccountDescription" title="${uiLabelMap.CommonDescription}" position="1" use-when="showPosition1" widget-area-style="viewManyTR1">
+            <display description="${accountCode} ${accountName}"/>
+        </field>
+        <field name="glAccountClassId" position="1" use-when="showPosition1" widget-area-style="viewManyTR1">
+            <display-entity entity-name="GlAccountClass" />
+        </field>
+        
+        <field name="acctgTransId" widget-style="buttontext" position="2">
+            <hyperlink also-hidden="false" description="${acctgTransId}" target="EditAcctgTrans?acctgTransId=${acctgTransId}&amp;organizationPartyId=${organizationPartyId}"/>
+        </field>
+        <field name="acctgTransEntrySeqId" widget-style="buttontext" position="2">
+            <hyperlink also-hidden="false" description="${acctgTransEntrySeqId}" target="EditAcctgTransEntry?acctgTransId=${acctgTransId}&amp;acctgTransEntrySeqId=${acctgTransEntrySeqId}&amp;organizationPartyId=${organizationPartyId}"/>
+        </field>
+        <field name="transactionDate" position="2"><display/></field>
+        <field name="acctgTransTypeId" position="2"><display-entity entity-name="AcctgTransType" description="${description}"/></field>
+        <field name="glFiscalTypeId" position="2"><display-entity entity-name="GlFiscalType" description="${description}"/></field>
+        <field name="invoiceId" position="2" use-when="invoiceId!=null" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice?invoiceId=${invoiceId}"/>
+        </field>
+        <field name="invoiceId" position="2" use-when="invoiceId==null"><display/></field>
+        <field name="paymentId" position="2" use-when="paymentId!=null">
+            <hyperlink also-hidden="false" description="${paymentId}" target="editPayment?paymentId=${paymentId}"/>
+        </field>
+        <field name="paymentId" position="2" use-when="paymentId==null"><display/></field>
+        <field name="workEffortId" position="2"><display/></field>
+        <field name="partyId" position="2" title="${uiLabelMap.PartyParty}">
+            <display-entity entity-name="PartyNameView" description="${groupName}${firstName} ${lastName} [${partyId}]"/>
+        </field>
+        <field name="productId" position="2"><display/></field>
+        <field name="isPosted" position="2"><display/></field>
+        <field name="postedDate" position="2"><display/></field>
+        <field name="debitCreditFlag" position="2"><display/></field>
+        <field name="amount" position="2"><display type="currency" currency="${currencyUomId}"/></field>
+    </form>
+
     <form name="NewGlJournalEntry" type="single" target="createGlJournalEntry" title="" default-map-name="journal">
         <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}">
             <drop-down>
@@ -248,24 +353,24 @@
         <field use-when="acctgTransEntry!=null" name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext" ><submit button-type="text-link"/></field>
         <field use-when="acctgTransEntry==null" name="createButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext" ><submit button-type="text-link"/></field>
     </form>
-    <form name="ListAcctgTransEntries" type="list" list-name="acctgTransEntries"  default-entity-name="AcctgTransEntry">
+    <form name="ListAcctgTransEntries" type="list" list-name="acctgTransEntries" default-entity-name="AcctgTransEntry">
+        <field name="organizationPartyId"><hidden/></field>
         <field name="acctgTransId"><hidden/></field>
-        <field name="acctgTransEntrySeqId"><hidden/></field>    
+        <field name="acctgTransEntrySeqId"><display/></field>    
         <field name="glAccountId">
             <display-entity entity-name="GlAccount" description="${accountName}">
-                <sub-hyperlink target="ListGlAccountEntries?glAccountId=${glAccountId}" description="[${glAccountId}]"/>
+                <sub-hyperlink target="FindAcctgTransEntries?glAccountId=${glAccountId}&amp;organizationPartyId=${organizationPartyId}" description="[${glAccountId}]"/>
              </display-entity>
         </field>
         <field name="description"><display/></field>
         <field name="voucherRef"><display/></field>
         <field name="partyId"><display/></field>
-        <field name="organizationPartyId"><display/></field>
         <field name="productId"><display/></field>
-        <field name="debitCreditFlag"><display/></field>
-        <field name="amount"><display/></field>
         <field name="reconcileStatusId"><display/></field>
         <field name="settlementTermId"><display/></field>
         <field name="isSummary"><display/></field>
+        <field name="debitCreditFlag"><display/></field>
+        <field name="amount"><display type="currency" currency="${currencyUomId}"/></field>
         <field name="EditButton" title="" widget-style="buttontext" use-when="isPosted==null">
             <hyperlink description="${uiLabelMap.CommonEdit}" target="EditAcctgTrans?acctgTransId=${acctgTransId}&amp;editAcctgTransEntrySeqId=${acctgTransEntrySeqId}&amp;organizationPartyId=${organizationPartyId}"/>
         </field>

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=597431&r1=597430&r2=597431&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Thu Nov 22 07:28:00 2007
@@ -413,16 +413,16 @@
             <link target="PartyAccountsSummary?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
     </menu>
-    <menu name="PartyAccountsTabBar" default-menu-item-name="PartyAccountsSummary" default-selected-style="selected"
+    <menu name="OrganizationAccountingTabBar" default-menu-item-name="PartyAccountsSummary" default-selected-style="selected"
         menu-container-style="button-bar tab-bar" type="simple">
         <menu-item name="PartyAccountsSummary" title="${uiLabelMap.AcctgPartyGlJournalSummary}">
             <link target="PartyAccountsSummary?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
-        <menu-item name="FindGlJournalEntry" title="${uiLabelMap.AcctgGlJournalEntry}">
-            <link target="FindGlJournalEntry?organizationPartyId=${organizationPartyId}"/>
+        <menu-item name="FindAcctgTrans" title="${uiLabelMap.AccountingAcctgTranss}">
+            <link target="FindAcctgTrans?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
-        <menu-item name="ListUnpostedAcctgTrans" title="${uiLabelMap.AccountingManualPostTrans}">
-            <link target="ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}"/>
+        <menu-item name="FindAcctgTransEntries" title="${uiLabelMap.AccountingAcctgTransEntries}">
+            <link target="FindAcctgTransEntries?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
         <menu-item name="ChecksTabButton" title="${uiLabelMap.AccountingChecks}">
             <link target="listChecksToPrint?organizationPartyId=${organizationPartyId}"/>