svn commit: r599645 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.properties webapp/accounting/WEB-INF/controller.xml widget/CommonScreens.xml widget/GlForms.xml widget/GlScreens.xml

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

svn commit: r599645 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.properties webapp/accounting/WEB-INF/controller.xml widget/CommonScreens.xml widget/GlForms.xml widget/GlScreens.xml

apatel-2
Author: apatel
Date: Thu Nov 29 16:02:52 2007
New Revision: 599645

URL: http://svn.apache.org/viewvc?rev=599645&view=rev
Log:
New screen to manually create an AcctgTrans.

Ashish, Thanks for patch.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/GlForms.xml
    ofbiz/trunk/applications/accounting/widget/GlScreens.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?rev=599645&r1=599644&r2=599645&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Thu Nov 29 16:02:52 2007
@@ -127,6 +127,7 @@
 AccountingCopyAgreement=Copy Agreement
 AccountingCouldNotFindGlAccount=Could not find GlAccount with ID
 AccountingCreateAcctgTransAndEntries=Quick Create an Accounting Transaction
+AccountingCreateAnAccountingTransaction=Create an Accounting Transaction
 AccountingCreateAssignment=Create Assignment
 AccountingCreateBillingAccount=Create Billing Account
 AccountingCreateBillingAccountPermissionError=Security Error: to run createBillingAccount you must have the ACCOUNTING_CREATE or ACCOUNTING_ADMIN permission <br>

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=599645&r1=599644&r2=599645&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 29 16:02:52 2007
@@ -452,6 +452,16 @@
         <response name="success" type="view" value="EditAcctgTrans"/>
         <response name="error" type="view" value="EditAcctgTrans"/>
     </request-map>
+    <request-map uri="newAcctgTrans">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="NewAcctgTrans"/>
+    </request-map>
+    <request-map uri="createAcctgTrans">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createAcctgTrans"/>
+        <response name="success" type="view" value="EditAcctgTrans"/>
+        <response name="error" type="view" value="NewAcctgTrans"/>
+    </request-map>
 
     <!-- GlAccount requests -->
     <request-map uri="AssignGlAccount">
@@ -1568,7 +1578,7 @@
     <view-map name="ListUnpostedAcctgTrans" type="screen" page="component://accounting/widget/GlScreens.xml#ListUnpostedAcctgTrans"/>
     <view-map name="ListChecksToPrint" type="screen" page="component://accounting/widget/GlScreens.xml#ListChecksToPrint"/>
     <view-map name="ListChecksToSend" type="screen" page="component://accounting/widget/GlScreens.xml#ListChecksToSend"/>
-    
+    <view-map name="NewAcctgTrans" type="screen" page="component://accounting/widget/GlScreens.xml#NewAcctgTrans"/>    
     <!-- GlAccount, GlJournalEntry, AcctgTrans -->
     <view-map name="AddGlAccount" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#AddGlAccount"/>
     <view-map name="FindGlobalGlAccount" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#ListGlAccounts"/>

Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=599645&r1=599644&r2=599645&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Thu Nov 29 16:02:52 2007
@@ -283,7 +283,7 @@
                     <decorator-section name="body">
                         <include-menu name="OrganizationAccountingTabBar" location="component://accounting/widget/Menus.xml"/>
                         <container>
-                            <label style="head1">${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label>
+                            <label style="head1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label>
                         </container>
                         <decorator-section-include name="body"/>
                     </decorator-section>

Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=599645&r1=599644&r2=599645&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Thu Nov 29 16:02:52 2007
@@ -1,433 +1,486 @@
-<?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="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">
-                <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="glJournalId">
-            <drop-down allow-empty="true">
-                <entity-options entity-name="GlJournal" description="${glJournalName} [${glJournalId}]">
-                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
-                    <entity-order-by field-name="glJournalName"/>
-                </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="shipmentId"><text size="20" maxlength="20"/></field>
-        <field name="fromDate"><date-time/></field>
-        <field name="thruDate"><date-time/></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="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="glJournalId" operator="equals" env-name="parameters.glJournalId" 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="shipmentId" operator="equals" env-name="parameters.shipmentId" ignore-if-empty="true"/>
-                    <condition-expr field-name="acctgTransId" operator="equals" env-name="parameters.acctgTransId" ignore-if-empty="true"/>
-                    <condition-expr field-name="transactionDate" operator="greater-equals" env-name="parameters.fromDate" ignore-if-empty="true"/>
-                    <condition-expr field-name="transactionDate" operator="less" env-name="parameters.thruDate" ignore-if-empty="true"/>
-                </condition-list>
-                <select-field field-name="acctgTransId"/>
-                <select-field field-name="transactionDate"/>
-                <select-field field-name="acctgTransTypeId"/>
-                <select-field field-name="glFiscalTypeId"/>
-                <select-field field-name="invoiceId"/>
-                <select-field field-name="paymentId"/>
-                <select-field field-name="workEffortId"/>
-                <select-field field-name="shipmentId"/>
-                <select-field field-name="partyId"/>
-                <select-field field-name="isPosted"/>
-                <select-field field-name="postedDate"/>
-                <order-by field-name="-transactionDate"/>
-            </entity-condition>
-        </actions>
-
-        <field name="acctgTransId" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${acctgTransId}" target="EditAcctgTrans?acctgTransId=${acctgTransId}&amp;organizationPartyId=${organizationPartyId}"/>
-        </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="workEffortId"><display/></field>
-        <field name="shipmentId"><display/></field>
-        <field name="partyId" title="${uiLabelMap.PartyParty}">
-            <display-entity entity-name="PartyNameView" description="${groupName}${firstName} ${lastName} [${partyId}]"/>
-        </field>
-        <field name="isPosted"><display/></field>
-        <field name="postedDate"><display/></field>
-        <field name="postAcctgTrans" title="${uiLabelMap.CommonEmptyHeader}" use-when="&quot;N&quot;.equals(isPosted)" widget-style="buttontext">
-            <hyperlink target="postAcctgTrans?acctgTransId=${acctgTransId}" description="Post"/>
-        </field>
-        <field name="postAcctgTrans" title="${uiLabelMap.CommonEmptyHeader}" use-when="!&quot;N&quot;.equals(isPosted)"><display/></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="EditAcctgTrans?acctgTransId=${acctgTransId}&amp;organizationPartyId=${organizationPartyId}"/>
-        </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="workEffortId" position="2"><display/></field>
-        <field name="shipmentId" position="2"><display/></field>
-        <field name="verify" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.AccountingVerifyTransaction}" target="postAcctgTrans?acctgTransId=${acctgTransId}&amp;organizationPartyId=${organizationPartyId}&amp;verifyOnly=Y" also-hidden="false"/>
-        </field>
-        <field name="post" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.AccountingPostTransaction}" target="postAcctgTrans?acctgTransId=${acctgTransId}&amp;organizationPartyId=${organizationPartyId}" also-hidden="false"/>
-        </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="glJournalId">
-            <drop-down allow-empty="true">
-                <entity-options entity-name="GlJournal" description="${glJournalName} [${glJournalId}]">
-                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
-                    <entity-order-by field-name="glJournalName"/>
-                </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="shipmentId"><text size="20" maxlength="20"/></field>
-        <field name="fromDate"><date-time/></field>
-        <field name="thruDate"><date-time/></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="glJournalId" operator="equals" env-name="parameters.glJournalId" 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="shipmentId" operator="equals" env-name="parameters.shipmentId" ignore-if-empty="true"/>
-                    <condition-expr field-name="acctgTransId" operator="equals" env-name="parameters.acctgTransId" ignore-if-empty="true"/>
-                    <condition-expr field-name="transactionDate" operator="greater-equals" env-name="parameters.fromDate" ignore-if-empty="true"/>
-                    <condition-expr field-name="transactionDate" operator="less" env-name="parameters.thruDate" ignore-if-empty="true"/>
-                </condition-list>
-                <order-by field-name="glAccountId"/>
-                <order-by field-name="-transactionDate"/>
-            </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"><display/></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="shipmentId" 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="CreateAcctgTransAndEntries" type="single" target="quickCreateAcctgTransAndEntries" title="">
-        <actions>
-            <set field="debitGlAccountClassId" from-field="parameters.debitGlAccountClassId"/>
-            <set field="creditGlAccountClassId" from-field="parameters.creditGlAccountClassId"/>
-        </actions>
-        <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
-        <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="partyId" title="${uiLabelMap.PartyPartyId}">
-            <lookup target-form-name="LookupPartyName" size="20" maxlength="20"/>
-        </field>
-        <field name="roleTypeId" parameter-name="roleTypeId">
-            <drop-down allow-empty="true">
-                <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="workEffortId"><text size="20" maxlength="20"/></field>
-        <field name="debitGlAccountId" use-when="debitGlAccountClassId!=null">
-            <drop-down>
-                <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]">
-                    <entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/>
-                    <entity-constraint name="glAccountClassId" operator="equals" env-name="debitGlAccountClassId" ignore-if-null="true"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="debitGlAccountId" use-when="debitGlAccountClassId==null">
-            <drop-down>
-                <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]">
-                    <entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="creditGlAccountId" use-when="creditGlAccountClassId!=null">
-            <drop-down>
-                <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]">
-                    <entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/>
-                    <entity-constraint name="glAccountClassId" operator="equals" env-name="creditGlAccountClassId" ignore-if-null="true"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="creditGlAccountId" use-when="creditGlAccountClassId==null">
-            <drop-down>
-                <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]">
-                    <entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="amount"><text size="20" maxlength="20"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
-    </form>
-
-    <form name="EditAcctgTrans" type="single" target="updateAcctgTrans" default-map-name="acctgTrans">
-        <field name="acctgTransId"><display/></field>
-        <field name="organizationPartyId" map-name="parameter"><hidden/></field>
-        <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="transactionDate"><date-time/></field>
-        <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
-    </form>
-
-    <form name="EditAcctgTransEntry" type="single" target="updateAcctgTransEntry" default-map-name="acctgTransEntry" default-entity-name="AcctgTransEntry">
-        <alt-target use-when="acctgTransEntry==null" target="createAcctgTransEntry"/>
-        <field name="organizationPartyId"><hidden/></field>
-        <field name="acctgTransId"><hidden/></field>
-        <field name="acctgTransEntrySeqId"><hidden/></field>    
-        <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="acctgTransEntryTypeId" ><hidden value="_NA_"/></field>
-        <field name="description"><text size="30"/></field>
-        <field name="glAccountId" widget-style="selectBox">
-            <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="glAccountId">
-            <drop-down>
-                <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]">
-                    <entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="amount"><text size="30"/></field>
-        <field name="voucherRef"><text size="30"/></field>
-        <field name="partyId"><text size="30"/></field>
-        <field name="productId"><text size="20"/></field>
-        <field name="debitCreditFlag">
-            <drop-down current="selected">
-                <option description="Credit" key="C"/>
-                <option description="Debit" key="D"/>
-            </drop-down>
-        </field>
-        <field name="reconcileStatusId"><text size="30"/></field>
-        <field name="settlementTermId"><text size="20"/></field>
-        <field name="isSummary"><text size="10"/></field>
-        <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">
-        <field name="organizationPartyId"><hidden/></field>
-        <field name="acctgTransId"><hidden/></field>
-        <field name="acctgTransEntrySeqId"><display/></field>    
-        <field name="glAccountId">
-            <display-entity entity-name="GlAccount" description="${accountName}">
-                <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="productId"><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>
-        <field name="removeButton" title="" widget-style="buttontext" use-when="isPosted==null">
-            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteAcctgTransEntry?acctgTransId=${acctgTransId}&amp;acctgTransEntrySeqId=${acctgTransEntrySeqId}&amp;organizationPartyId=${organizationPartyId}"/>
-        </field>
-    </form>
+<?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="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">
+                <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="glJournalId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="GlJournal" description="${glJournalName} [${glJournalId}]">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <entity-order-by field-name="glJournalName"/>
+                </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="shipmentId"><text size="20" maxlength="20"/></field>
+        <field name="fromDate"><date-time/></field>
+        <field name="thruDate"><date-time/></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="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="glJournalId" operator="equals" env-name="parameters.glJournalId" 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="shipmentId" operator="equals" env-name="parameters.shipmentId" ignore-if-empty="true"/>
+                    <condition-expr field-name="acctgTransId" operator="equals" env-name="parameters.acctgTransId" ignore-if-empty="true"/>
+                    <condition-expr field-name="transactionDate" operator="greater-equals" env-name="parameters.fromDate" ignore-if-empty="true"/>
+                    <condition-expr field-name="transactionDate" operator="less" env-name="parameters.thruDate" ignore-if-empty="true"/>
+                </condition-list>
+                <select-field field-name="acctgTransId"/>
+                <select-field field-name="transactionDate"/>
+                <select-field field-name="acctgTransTypeId"/>
+                <select-field field-name="glFiscalTypeId"/>
+                <select-field field-name="invoiceId"/>
+                <select-field field-name="paymentId"/>
+                <select-field field-name="workEffortId"/>
+                <select-field field-name="shipmentId"/>
+                <select-field field-name="partyId"/>
+                <select-field field-name="isPosted"/>
+                <select-field field-name="postedDate"/>
+                <order-by field-name="-transactionDate"/>
+            </entity-condition>
+        </actions>
+
+        <field name="acctgTransId" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${acctgTransId}" target="EditAcctgTrans?acctgTransId=${acctgTransId}&amp;organizationPartyId=${organizationPartyId}"/>
+        </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="workEffortId"><display/></field>
+        <field name="shipmentId"><display/></field>
+        <field name="partyId" title="${uiLabelMap.PartyParty}">
+            <display-entity entity-name="PartyNameView" description="${groupName}${firstName} ${lastName} [${partyId}]"/>
+        </field>
+        <field name="isPosted"><display/></field>
+        <field name="postedDate"><display/></field>
+        <field name="postAcctgTrans" title="${uiLabelMap.CommonEmptyHeader}" use-when="&quot;N&quot;.equals(isPosted)" widget-style="buttontext">
+            <hyperlink target="postAcctgTrans?acctgTransId=${acctgTransId}" description="Post"/>
+        </field>
+        <field name="postAcctgTrans" title="${uiLabelMap.CommonEmptyHeader}" use-when="!&quot;N&quot;.equals(isPosted)"><display/></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="EditAcctgTrans?acctgTransId=${acctgTransId}&amp;organizationPartyId=${organizationPartyId}"/>
+        </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="workEffortId" position="2"><display/></field>
+        <field name="shipmentId" position="2"><display/></field>
+        <field name="verify" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+            <hyperlink description="${uiLabelMap.AccountingVerifyTransaction}" target="postAcctgTrans?acctgTransId=${acctgTransId}&amp;organizationPartyId=${organizationPartyId}&amp;verifyOnly=Y" also-hidden="false"/>
+        </field>
+        <field name="post" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+            <hyperlink description="${uiLabelMap.AccountingPostTransaction}" target="postAcctgTrans?acctgTransId=${acctgTransId}&amp;organizationPartyId=${organizationPartyId}" also-hidden="false"/>
+        </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="glJournalId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="GlJournal" description="${glJournalName} [${glJournalId}]">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+                    <entity-order-by field-name="glJournalName"/>
+                </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="shipmentId"><text size="20" maxlength="20"/></field>
+        <field name="fromDate"><date-time/></field>
+        <field name="thruDate"><date-time/></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="glJournalId" operator="equals" env-name="parameters.glJournalId" 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="shipmentId" operator="equals" env-name="parameters.shipmentId" ignore-if-empty="true"/>
+                    <condition-expr field-name="acctgTransId" operator="equals" env-name="parameters.acctgTransId" ignore-if-empty="true"/>
+                    <condition-expr field-name="transactionDate" operator="greater-equals" env-name="parameters.fromDate" ignore-if-empty="true"/>
+                    <condition-expr field-name="transactionDate" operator="less" env-name="parameters.thruDate" ignore-if-empty="true"/>
+                </condition-list>
+                <order-by field-name="glAccountId"/>
+                <order-by field-name="-transactionDate"/>
+            </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"><display/></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="shipmentId" 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="CreateAcctgTransAndEntries" type="single" target="quickCreateAcctgTransAndEntries" title="">
+        <actions>
+            <set field="debitGlAccountClassId" from-field="parameters.debitGlAccountClassId"/>
+            <set field="creditGlAccountClassId" from-field="parameters.creditGlAccountClassId"/>
+        </actions>
+        <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
+        <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="partyId" title="${uiLabelMap.PartyPartyId}">
+            <lookup target-form-name="LookupPartyName" size="20" maxlength="20"/>
+        </field>
+        <field name="roleTypeId" parameter-name="roleTypeId">
+            <drop-down allow-empty="true">
+                <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="workEffortId"><text size="20" maxlength="20"/></field>
+        <field name="debitGlAccountId" use-when="debitGlAccountClassId!=null">
+            <drop-down>
+                <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/>
+                    <entity-constraint name="glAccountClassId" operator="equals" env-name="debitGlAccountClassId" ignore-if-null="true"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="debitGlAccountId" use-when="debitGlAccountClassId==null">
+            <drop-down>
+                <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="creditGlAccountId" use-when="creditGlAccountClassId!=null">
+            <drop-down>
+                <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/>
+                    <entity-constraint name="glAccountClassId" operator="equals" env-name="creditGlAccountClassId" ignore-if-null="true"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="creditGlAccountId" use-when="creditGlAccountClassId==null">
+            <drop-down>
+                <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="amount"><text size="20" maxlength="20"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
+    </form>
+
+    <form name="EditAcctgTrans" type="single" target="updateAcctgTrans" default-map-name="acctgTrans">
+        <field name="acctgTransId"><display/></field>
+        <field name="organizationPartyId" map-name="parameter"><hidden/></field>
+        <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="transactionDate"><date-time/></field>
+        <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+    </form>
+
+    <form name="EditAcctgTransEntry" type="single" target="updateAcctgTransEntry" default-map-name="acctgTransEntry" default-entity-name="AcctgTransEntry">
+        <alt-target use-when="acctgTransEntry==null" target="createAcctgTransEntry"/>
+        <field name="organizationPartyId"><hidden/></field>
+        <field name="acctgTransId"><hidden/></field>
+        <field name="acctgTransEntrySeqId"><hidden/></field>    
+        <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="acctgTransEntryTypeId" ><hidden value="_NA_"/></field>
+        <field name="description"><text size="30"/></field>
+        <field name="glAccountId" widget-style="selectBox">
+            <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="glAccountId">
+            <drop-down>
+                <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${accountName} [${glAccountId}]">
+                    <entity-constraint name="organizationPartyId" operator="equals" env-name="parameters.organizationPartyId"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="amount"><text size="30"/></field>
+        <field name="voucherRef"><text size="30"/></field>
+        <field name="partyId"><text size="30"/></field>
+        <field name="productId"><text size="20"/></field>
+        <field name="debitCreditFlag">
+            <drop-down current="selected">
+                <option description="Credit" key="C"/>
+                <option description="Debit" key="D"/>
+            </drop-down>
+        </field>
+        <field name="reconcileStatusId"><text size="30"/></field>
+        <field name="settlementTermId"><text size="20"/></field>
+        <field name="isSummary"><text size="10"/></field>
+        <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">
+        <field name="organizationPartyId"><hidden/></field>
+        <field name="acctgTransId"><hidden/></field>
+        <field name="acctgTransEntrySeqId"><display/></field>    
+        <field name="glAccountId">
+            <display-entity entity-name="GlAccount" description="${accountName}">
+                <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="productId"><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>
+        <field name="removeButton" title="" widget-style="buttontext" use-when="isPosted==null">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteAcctgTransEntry?acctgTransId=${acctgTransId}&amp;acctgTransEntrySeqId=${acctgTransEntrySeqId}&amp;organizationPartyId=${organizationPartyId}"/>
+        </field>
+    </form>
+    <form name="CreateAcctgTrans" type="single" target="createAcctgTrans">
+        <auto-fields-service service-name="createAcctgTrans"/>
+        <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
+        <field name="acctgTransTypeId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="AcctgTransType" description="${description}">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="glFiscalTypeId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="GlFiscalType" description="${description}" key-field-name="glFiscalTypeId">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="groupStatusId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                    <entity-constraint name="statusTypeId" operator="equals" value="ACCTG_ENREC_STATUS"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="fixedAssetId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="FixedAsset" description="${fixedAssetId}">
+                    <entity-order-by field-name="fixedAssetId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="paymentId">
+            <lookup target-form-name="LookupPayment" size="20" maxlength="20"/>
+        </field>
+        <field name="invoiceId">
+            <lookup target-form-name="LookupInvoice" size="20" maxlength="20"/>
+        </field>
+        <field name="partyId">
+            <lookup target-form-name="LookupPartyName" size="20" maxlength="20"/>
+        </field>
+        <field name="roleTypeId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="RoleType" description="${description}">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="workEffortId">
+            <lookup target-form-name="LookupWorkEffort" size="20" maxlength="20"/>
+        </field>
+        <field name="createButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
 </forms>

Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=599645&r1=599644&r2=599645&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Thu Nov 29 16:02:52 2007
@@ -81,6 +81,7 @@
                 <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <container>
+                            <link text="${uiLabelMap.AccountingCreateAnAccountingTransaction}" style="buttontext" target="newAcctgTrans?organizationPartyId=${organizationPartyId}"/>
                             <link text="${uiLabelMap.AccountingCreateAcctgTransAndEntries}" style="buttontext" target="CreateAcctgTransAndEntries?organizationPartyId=${organizationPartyId}"/>
                             <link text="${uiLabelMap.PageTitleUnpostedTransactions}" style="buttontext" target="ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}"/>
                         </container>
@@ -301,6 +302,22 @@
             </widgets>
         </section>
     </screen>
-
+    <screen name="NewAcctgTrans">
+        <section>
+            <actions>
+                <set field="titleProperty" value="AccountingCreateAnAccountingTransaction"/>
+                <set field="tabButtonItem" value="FindAcctgTrans"/>
+                <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
+                <set field="labelTitleProperty" value="AccountingCreateAnAccountingTransaction"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-form name="CreateAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>