svn commit: r574777 - in /ofbiz/trunk/applications/accounting: config/ webapp/accounting/WEB-INF/ webapp/accounting/chartofaccounts/ widget/

[apatel-2]

Author: apatel
Date: Tue Sep 11 20:50:22 2007
New Revision: 574777

URL: http://svn.apache.org/viewvc?rev=574777&view=rev
Log:
added find Journal entry screen.

Added:
    ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml
Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml
    ofbiz/trunk/applications/accounting/widget/AccountingScreens.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=574777&r1=574776&r2=574777&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Tue Sep 11 20:50:22 2007
@@ -25,7 +25,11 @@
 
 AcctgGlPartyLabel=GL Party :
 AcctgGlAcctLabel=GL Account :
+AcctgPartyGlJournalSummary=Summary
+AcctgGlJournalEntry=GL Journal
+AcctgFindGlJournalEntry=Find Journal Entry
 AcctgEditGlJournalEntry=Journal Entry
+AcctgNewGlJournalEntry=New Journal Entry
 AcctgAssignGlAccount=Assign GL Account
 AcctgChartOfAcctsTabMenu=Chart of Accounts
 AcctgListGlAcctOrg=List GL Organization

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=574777&r1=574776&r2=574777&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Tue Sep 11 20:50:22 2007
@@ -441,6 +441,10 @@
         <response name="success" type="view" value="EditGlJournalEntry"/>
         <response name="error" type="view" value="EditGlJournalEntry"/>
     </request-map>
+    <request-map uri="FindGlJournalEntry">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="FindGlJournalEntry"/>
+    </request-map>
     <request-map uri="EditGlJournalEntry">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="EditGlJournalEntry"/>
@@ -1445,6 +1449,7 @@
     
     <!-- 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="EditGlJournalEntry" type="screen" page="component://accounting/widget/AccountingScreens.xml#EditGlJournalEntry"/>
     <view-map name="ListUnpostedAcctgTrans" type="screen" page="component://accounting/widget/AccountingScreens.xml#ListUnpostedAcctgTrans"/>
     

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml?rev=574777&r1=574776&r2=574777&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml Tue Sep 11 20:50:22 2007
@@ -21,65 +21,6 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     
-    <form name="EditGlJournalEntry" type="single" target="createGlJournalEntry" title="" default-map-name="journal">
-        <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}">
-            <drop-down>
-                <entity-options entity-name="AcctgTransType" description="${description}">
-                    <entity-order-by field-name="acctgTransTypeId"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="glFiscalTypeId">
-            <drop-down>
-                <entity-options entity-name="GlFiscalType" description="${description}">
-                    <entity-order-by field-name="glFiscalTypeId"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="organizationPartyId" parameter-name="organizationPartyId">
-            <drop-down>
-                <entity-options entity-name="PartyRoleAndPartyDetail" key-field-name="partyId" description="${partyId}">
-                <!-- entity-options entity-name="PartyRoleAndPartyDetail" description="${organizationPartyId}" -->
-                    <entity-constraint name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
-                    <entity-order-by field-name="partyId"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="partyId" parameter-name="partyId">
-            <drop-down>
-                <entity-options entity-name="Party" key-field-name="partyId" description="${partyId}">
-                    <entity-order-by field-name="partyId"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="roleTypeId" parameter-name="roleTypeId">
-            <drop-down>
-                <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}">
-                    <entity-order-by field-name="roleTypeId"/>
-                </entity-options>
-            </drop-down>
-        </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="debitGlAccountId">
-            <drop-down>
-                <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}" key-field-name="glAccountId">
-                    <entity-order-by field-name="glAccountId"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="creditGlAccountId">
-            <drop-down>
-                <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}" key-field-name="glAccountId">
-                    <entity-order-by field-name="glAccountId"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="amount"><text size="20" maxlength="20"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
-    </form>
-
     <form name="ListGlAccountOrganization" list-name="listIt" target="" title="" type="list" paginate-target="ListGlAccountOrganization">
         <actions>
             <set field="entityName" value="GlAccountOrganization"/>

Modified: ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml?rev=574777&r1=574776&r2=574777&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml Tue Sep 11 20:50:22 2007
@@ -115,11 +115,30 @@
         </section>
     </screen>
 
+    <screen name="FindGlJournalEntry">
+        <section>
+            <actions>
+                <set field="titleProperty" value="AcctgFindGlJournalEntry"/>
+                <set field="tabButtonItem" value="FindGlJournalEntry"/>
+                <set field="labelTitleProperty" value="AcctgFindGlJournalEntry"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonPartyAccountsDecorator"  location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-menu name="JournalEntryActionsBar" location="component://accounting/widget/Menus.xml"/>
+                        <include-form name="FindGlJournalEntry" location="component://accounting/widget/JournalEntryForms.xml"/>
+                        <include-form name="ListJournalEntries" location="component://accounting/widget/JournalEntryForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
     <screen name="EditGlJournalEntry">
         <section>
             <actions>
                 <set field="titleProperty" value="AcctgEditGlJournalEntry"/>
-                <set field="tabButtonItem" value="EditGlJournalEntry"/>
+                <set field="tabButtonItem" value="FindGlJournalEntry"/>
                 <set field="labelTitleProperty" value="AcctgEditGlJournalEntry"/>
                 <!-- entity-condition entity-name="GlAccountOrganization" list-name="entityList" use-cache="true" >
                     <condition-expr field-name="glAccountId" operator="greater" value="0" />
@@ -132,7 +151,8 @@
             <widgets>
                 <decorator-screen name="CommonPartyAccountsDecorator"  location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="EditGlJournalEntry" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+                        <include-menu name="JournalEntryActionsBar" location="component://accounting/widget/Menus.xml"/>
+                        <include-form name="EditGlJournalEntry" 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=574777&r1=574776&r2=574777&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Tue Sep 11 20:50:22 2007
@@ -246,12 +246,13 @@
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <section>
+                        <section><condition><not><if-empty field-name="organizationPartyId"/></not></condition>
                             <widgets>
                                 <include-menu name="PartyAccountsTabBar" location="component://accounting/widget/Menus.xml"/>
                                 <decorator-section-include name="body"/>
                             </widgets>
                         </section>
+                        <!-- Todo: Add fail widget to show partyId missing error -->
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Added: ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml?rev=574777&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml Tue Sep 11 20:50:22 2007
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<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">
+        <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}">
+            <drop-down>
+                <entity-options entity-name="AcctgTransType" description="${description}">
+                    <entity-order-by field-name="acctgTransTypeId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="glFiscalTypeId">
+            <drop-down>
+                <entity-options entity-name="GlFiscalType" description="${description}">
+                    <entity-order-by field-name="glFiscalTypeId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="organizationPartyId" parameter-name="organizationPartyId">
+            <drop-down>
+                <entity-options entity-name="PartyRoleAndPartyDetail" key-field-name="partyId" description="${partyId}">
+                <!-- entity-options entity-name="PartyRoleAndPartyDetail" description="${organizationPartyId}" -->
+                    <entity-constraint name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
+                    <entity-order-by field-name="partyId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="partyId" parameter-name="partyId">
+            <drop-down>
+                <entity-options entity-name="Party" key-field-name="partyId" description="${partyId}">
+                    <entity-order-by field-name="partyId"/>
+                </entity-options>
+            </drop-down>
+        </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="debitGlAccountId">
+            <drop-down>
+                <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}" key-field-name="glAccountId">
+                    <entity-order-by field-name="glAccountId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="creditGlAccountId">
+            <drop-down>
+                <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}" key-field-name="glAccountId">
+                    <entity-order-by field-name="glAccountId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+        <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="listIt">
+        <actions>
+            <service result-map-list-name="listIt" result-map-name="result" service-name="performFind">
+                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="entityName" value="AcctgTrans"/>
+            </service>
+        </actions>
+        <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>
+
+    <form name="EditGlJournalEntry" type="single" target="createGlJournalEntry" title="" default-map-name="journal">
+        <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}">
+            <drop-down>
+                <entity-options entity-name="AcctgTransType" description="${description}">
+                    <entity-order-by field-name="acctgTransTypeId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="glFiscalTypeId">
+            <drop-down>
+                <entity-options entity-name="GlFiscalType" description="${description}">
+                    <entity-order-by field-name="glFiscalTypeId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="organizationPartyId" parameter-name="organizationPartyId">
+            <drop-down>
+                <entity-options entity-name="PartyRoleAndPartyDetail" key-field-name="partyId" description="${partyId}">
+                <!-- entity-options entity-name="PartyRoleAndPartyDetail" description="${organizationPartyId}" -->
+                    <entity-constraint name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
+                    <entity-order-by field-name="partyId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="partyId" parameter-name="partyId">
+            <drop-down>
+                <entity-options entity-name="Party" key-field-name="partyId" description="${partyId}">
+                    <entity-order-by field-name="partyId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="roleTypeId" parameter-name="roleTypeId">
+            <drop-down>
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}">
+                    <entity-order-by field-name="roleTypeId"/>
+                </entity-options>
+            </drop-down>
+        </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="debitGlAccountId">
+            <drop-down>
+                <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}" key-field-name="glAccountId">
+                    <entity-order-by field-name="glAccountId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="creditGlAccountId">
+            <drop-down>
+                <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}" key-field-name="glAccountId">
+                    <entity-order-by field-name="glAccountId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="amount"><text size="20" maxlength="20"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+
+</forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=574777&r1=574776&r2=574777&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Tue Sep 11 20:50:22 2007
@@ -398,14 +398,24 @@
     
     <menu name="PartyAccountsTabBar" default-menu-item-name="PartyAccountsSummary" default-selected-style="selected"
         menu-container-style="button-bar tab-bar" type="simple">  
-        <menu-item name="PartyAccountsSummary" title="${uiLabelMap.CommonSummary}">
+        <menu-item name="PartyAccountsSummary" title="${uiLabelMap.AcctgPartyGlJournalSummary}">
             <link target="PartyAccountsSummary?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
-        <menu-item name="EditGlJournalEntry" title="${uiLabelMap.AcctgEditGlJournalEntry}">
-            <link target="EditGlJournalEntry?organizationPartyId=${organizationPartyId}"/>
+        <menu-item name="FindGlJournalEntry" title="${uiLabelMap.AcctgGlJournalEntry}">
+            <link target="FindGlJournalEntry?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
         <menu-item name="ListUnpostedAcctgTrans" title="${uiLabelMap.AccountingManualPostTrans}">
             <link target="ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}"/>
+        </menu-item>
+    </menu>
+    
+    <menu name="JournalEntryActionsBar" menu-container-style="button-bar button-style-2" type="simple"
+        default-selected-style="selected">  
+        <menu-item name="FindGlJournalEntry" title="${uiLabelMap.AcctgFindGlJournalEntry}">
+            <link target="FindGlJournalEntry?organizationPartyId=${organizationPartyId}"/>
+        </menu-item>
+        <menu-item name="NewJournalEnty" title="${uiLabelMap.AcctgNewGlJournalEntry}">
+            <link target="EditGlJournalEntry?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
     </menu>