svn commit: r597099 - in /ofbiz/trunk/applications/accounting: entitydef/entitymodel.xml widget/AccountingScreens.xml widget/JournalEntryForms.xml widget/Menus.xml widget/ReportFinancialSummaryScreens.xml

[jacopoc]

Author: jacopoc
Date: Wed Nov 21 06:16:38 2007
New Revision: 597099

URL: http://svn.apache.org/viewvc?rev=597099&view=rev
Log:
Misc improvements to the Accounting GL screens (especially for the search screen for accounting transactions).

Modified:
    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
    ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
    ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml
    ofbiz/trunk/applications/accounting/widget/Menus.xml
    ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml

Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=597099&r1=597098&r2=597099&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Wed Nov 21 06:16:38 2007
@@ -1482,6 +1482,7 @@
       <alias entity-alias="ATR" name="glFiscalTypeId"/>
       <alias entity-alias="ATR" name="acctgTransTypeId"/>
       <alias entity-alias="ATR" name="transactionDate"/>
+      <alias entity-alias="ATR" name="postedDate"/>
       <alias entity-alias="ATR" name="transDescription" field="description"/>
       <alias entity-alias="ATT" name="transTypeDescription" field="description"/>
       <alias entity-alias="ATR" name="invoiceId"/>

Modified: ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml?rev=597099&r1=597098&r2=597099&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml Wed Nov 21 06:16:38 2007
@@ -135,9 +135,18 @@
             <widgets>
                 <decorator-screen name="CommonPartyAccountsDecorator"  location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-menu name="JournalEntryActionsBar" location="component://accounting/widget/Menus.xml"/>
+                        <container>
+                            <link text="${uiLabelMap.AcctgNewGlJournalEntry}" style="buttontext" target="NewGlJournalEntry?organizationPartyId=${organizationPartyId}"/>
+                        </container>
                         <include-form name="FindGlJournalEntry" location="component://accounting/widget/JournalEntryForms.xml"/>
-                        <include-form name="ListJournalEntries" location="component://accounting/widget/JournalEntryForms.xml"/>
+                        <section>
+                            <condition>
+                                <if-compare field-name="parameters.performSearch" operator="equals" value="Y"/>
+                            </condition>
+                            <widgets>
+                                <include-form name="ListJournalEntries" location="component://accounting/widget/JournalEntryForms.xml"/>
+                            </widgets>
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -155,7 +164,6 @@
             <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="NewGlJournalEntry" location="component://accounting/widget/JournalEntryForms.xml"/>
                     </decorator-section>
                 </decorator-screen>

Modified: ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml?rev=597099&r1=597098&r2=597099&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml Wed Nov 21 06:16:38 2007
@@ -24,40 +24,61 @@
     <form name="FindGlJournalEntry" type="single" target="FindGlJournalEntry" title="" default-map-name="journal">
         <field name="organizationPartyId"><hidden/></field>
         <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}">
-            <drop-down>
+            <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>
+            <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="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 name="partyId" title="${uiLabelMap.PartyPartyId}">
+            <lookup target-form-name="LookupPartyName" size="20" maxlength="20"/>
         </field>
+        <field name="isPosted">
+            <drop-down allow-empty="true">
+                <option description="${uiLabelMap.CommonNo}" key="N"/>
+                <option description="${uiLabelMap.CommonYes}" key="Y"/>
+            </drop-down>
+        </field>
         <field name="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="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+        <field name="workEffortId"><text size="20" maxlength="20"/></field>
+        <field name="performSearch"><hidden value="Y"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
 
-    <form name="ListJournalEntries" type="list" title="List Journal Transactions" list-name="listIt">
+    <form name="ListJournalEntries" type="list" title="List Journal Transactions" list-name="acctgTransList">
         <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="AcctgTransAndEntries"/>
-            </service>
+            <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="isPosted" operator="equals" env-name="parameters.isPosted" ignore-if-empty="true"/>
+                    <condition-expr field-name="partyId" operator="equals" env-name="parameters.partyId" ignore-if-empty="true"/>
+                    <condition-expr field-name="acctgTransTypeId" operator="equals" env-name="parameters.acctgTransTypeId" ignore-if-empty="true"/>
+                    <condition-expr field-name="acctgTransId" operator="equals" env-name="parameters.acctgTransId" ignore-if-empty="true"/>
+                    <condition-expr field-name="glFiscalTypeId" operator="equals" env-name="parameters.glFiscalTypeId" ignore-if-empty="true"/>
+                </condition-list>
+                <select-field field-name="acctgTransId"/>
+                <select-field field-name="transactionDate"/>
+                <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="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>                
@@ -72,8 +93,16 @@
             <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="partyId" title="${uiLabelMap.PartyParty}">
+            <display-entity entity-name="PartyNameView" description="${groupName}${firstName} ${lastName} [${partyId}]"/>
+        </field>
         <field name="isPosted"><display/></field>
-        <field name="partyId"><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">
@@ -121,14 +150,10 @@
                 </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 name="partyId" title="${uiLabelMap.PartyPartyId}">
+            <lookup target-form-name="LookupPartyName" size="20" maxlength="20"/>
         </field>
-        <field name="roleTypeId" parameter-name="roleTypeId">
+        <field name="roleTypeId" parameter-name="roleTypeId" allow-empty="true">
             <drop-down>
                 <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}">
                     <entity-order-by field-name="roleTypeId"/>
@@ -138,6 +163,7 @@
         <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">
             <drop-down>
                 <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}" key-field-name="glAccountId">
@@ -161,7 +187,7 @@
             </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>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
     </form>
 
     <form name="EditAcctgTrans" type="single" target="updateAcctgTrans" default-map-name="acctgTrans" default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=597099&r1=597098&r2=597099&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Wed Nov 21 06:16:38 2007
@@ -417,14 +417,6 @@
         </menu-item>
     </menu>
     
-    <menu name="JournalEntryActionsBar" menu-container-style="button-bar button-style-2" type="simple">  
-        <menu-item name="FindGlJournalEntry" title="${uiLabelMap.AcctgFindGlJournalEntry}">
-            <link target="FindGlJournalEntry?organizationPartyId=${organizationPartyId}"/>
-        </menu-item>
-        <menu-item name="NewJournalEnty" title="${uiLabelMap.AcctgNewGlJournalEntry}">
-            <link target="NewGlJournalEntry?organizationPartyId=${organizationPartyId}"/>
-        </menu-item>
-    </menu>
     <menu name="JournalEntryShortcuts" menu-container-style="${shortCutsMenuStyle}" type="simple">  
         <menu-item name="CreateSalesJournalEntry" title="${uiLabelMap.AccountingCreateSalesJournalEntry}">
             <link target="NewGlJournalEntry?organizationPartyId=${organizationPartyId}&amp;debitGlAccountClassId=CURRENT_ASSET&amp;creditGlAccountClassId=REVENUE&amp;acctgTransTypeId=SALES_ACCTG_TRANS"/>

Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=597099&r1=597098&r2=597099&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml Wed Nov 21 06:16:38 2007
@@ -196,6 +196,7 @@
     <screen name="TrialBalance">
         <section>
             <actions>
+                <set field="tabButtonItem" value="PartyAccountsSummary"/>
                 <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
                 <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" auto-field-map="false">
                     <field-map field-name="partyId" env-name="organizationPartyId"/>
@@ -216,13 +217,13 @@
                 <set field="parameters.creditTotal" value="0" type="Double"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <container>
                             <label style="head2" text="${uiLabelMap.AccountingTrialBalance}"/>
                         </container>
                         <container>
-                            <label style="head3" text="${uiLabelMap.CommonFor} ${organizationPartyId}"/>
+                            <label style="head3" text="${uiLabelMap.CommonFor}: ${organizationPartyId}"/>
                         </container>
                         <include-form name="TrialBalanceList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
                     </decorator-section>