svn commit: r576250 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.properties widget/AccountingScreens.xml widget/JournalEntryForms.xml widget/Menus.xml

[apatel-2]

Author: apatel
Date: Sun Sep 16 21:27:03 2007
New Revision: 576250

URL: http://svn.apache.org/viewvc?rev=576250&view=rev
Log:
Starting to build shortcuts menu for frequently used actions.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
    ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
    ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml
    ofbiz/trunk/applications/accounting/widget/Menus.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?rev=576250&r1=576249&r2=576250&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Sun Sep 16 21:27:03 2007
@@ -38,6 +38,8 @@
 AcctgGlJrnlDescLabel=Description :
 AcctgGlJrnlIdLabel=GL Journal ID :
 AcctgGlJrnlIdToolTip=Non-editable System ID
+AccountingCreateSalesJournalEntry=Create Sales Journal Entry
+AccountingCreatePaymentJournalEntry=Create Payment Journal Entry
 
 ListAccounts=List Gl Accounts
 

Modified: ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml?rev=576250&r1=576249&r2=576250&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml Sun Sep 16 21:27:03 2007
@@ -109,6 +109,15 @@
                 <decorator-screen name="CommonPartyAccountsDecorator"  location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <label style="head1">${uiLabelMap.PartyAccountsSummary}</label>
+                            <section>
+                                <widgets>                                                  
+                                    <container style="lefthalf">
+                                        <include-screen name="JournalEntryShortcuts"/>
+                                    </container>
+                                    <container style="righthalf">
+                                    </container>
+                                </widgets>
+                            </section>                        
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -447,5 +456,17 @@
             </widgets>
         </section>
     </screen>
+
+    <screen name="JournalEntryShortcuts">
+        <section>
+            <actions>
+                <set field="shortCutsMenuStyle" value=""/>
+            </actions>
+            <widgets>
+                <include-menu name="JournalEntryShortcuts" location="component://accounting/widget/Menus.xml"/>
+            </widgets>
+        </section>
+    </screen>
+    
 </screens>
 

Modified: ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml?rev=576250&r1=576249&r2=576250&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml Sun Sep 16 21:27:03 2007
@@ -141,12 +141,20 @@
         <field name="debitGlAccountId">
             <drop-down>
                 <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}" key-field-name="glAccountId">
+                    <entity-constraint name="glAccountClassId" operator="equals" value="${parameters.debitGlAccountClassId}"/>
+                    <entity-order-by field-name="glAccountId"/>
+                </entity-options>
+                <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-constraint name="glAccountClassId" operator="equals" value="${parameters.creditGlAccountClassId}"/>
+                    <entity-order-by field-name="glAccountId"/>
+                </entity-options>
                 <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}" key-field-name="glAccountId">
                     <entity-order-by field-name="glAccountId"/>
                 </entity-options>

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=576250&r1=576249&r2=576250&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Sun Sep 16 21:27:03 2007
@@ -411,6 +411,14 @@
             <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"/>
+        </menu-item>
+        <menu-item name="CreatePaymentJournalEntry" title="${uiLabelMap.AccountingCreatePaymentJournalEntry}">
+            <link target="NewGlJournalEntry?organizationPartyId=${organizationPartyId}&amp;debitGlAccountClassId=CASH_EQUIVALENT&amp;creditGlAccountClassId=CURRENT_LIABILITY&amp;acctgTransTypeId=PAYMENT_ACCTG_TRANS"/>
+        </menu-item>
+    </menu>
     
 </menus>