svn commit: r597840 - in /ofbiz/trunk/applications/accounting: webapp/accounting/WEB-INF/controller.xml widget/JournalEntryForms.xml widget/Menus.xml

[jacopoc]

Author: jacopoc
Date: Sat Nov 24 03:26:16 2007
New Revision: 597840

URL: http://svn.apache.org/viewvc?rev=597840&view=rev
Log:
Misc ui improvements to the acctg transactions screens.

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml
    ofbiz/trunk/applications/accounting/widget/Menus.xml

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=597840&r1=597839&r2=597840&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Sat Nov 24 03:26:16 2007
@@ -1102,7 +1102,7 @@
     </request-map>
     <request-map uri="AdminMain">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="TimePeriods"/>
+        <response name="success" type="view" value="PartyAcctgPreference"/>
     </request-map>
     <request-map uri="TimePeriods">
         <security https="true" auth="true"/>
@@ -1134,7 +1134,7 @@
     
     <request-map uri="GlAccountAssignment">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="GlAccountSalInvoice"/>
+        <response name="success" type="view" value="GlAccountTypeDefaults"/>
     </request-map>
     <request-map uri="GlAccountTypeDefaults">
         <security https="true" auth="true"/>

Modified: ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml?rev=597840&r1=597839&r2=597840&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml Sat Nov 24 03:26:16 2007
@@ -237,7 +237,12 @@
         <field name="amount" position="2"><display type="currency" currency="${currencyUomId}"/></field>
     </form>
 
-    <form name="NewGlJournalEntry" type="single" target="createGlJournalEntry" title="" default-map-name="journal">
+    <form name="NewGlJournalEntry" type="single" target="createGlJournalEntry" 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}">
@@ -252,15 +257,6 @@
                 </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" title="${uiLabelMap.PartyPartyId}">
             <lookup target-form-name="LookupPartyName" size="20" maxlength="20"/>
         </field>
@@ -275,25 +271,37 @@
         <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">
+        <field name="debitGlAccountId" use-when="debitGlAccountClassId!=null">
             <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 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="creditGlAccountId">
+        <field name="debitGlAccountId" use-when="debitGlAccountClassId==null">
             <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 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>
@@ -324,6 +332,7 @@
 
     <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}">
@@ -342,10 +351,17 @@
                 </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="organizationPartyId"><hidden/></field>
         <field name="productId"><text size="20"/></field>
         <field name="debitCreditFlag">
             <drop-down current="selected">

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=597840&r1=597839&r2=597840&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Sat Nov 24 03:26:16 2007
@@ -428,22 +428,22 @@
             <link target="listChecksToPrint?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
     </menu>
-    <menu name="PartyAdminTabBar" default-menu-item-name="ListGlAccountOrganization" default-selected-style="selected"
+    <menu name="PartyAdminTabBar" default-menu-item-name="PartyAcctgPreference" default-selected-style="selected"
         menu-container-style="button-bar tab-bar" type="simple">  
+        <menu-item name="PartyAcctgPreference" title="${uiLabelMap.AccountingPreference}">
+            <link target="PartyAcctgPreference?organizationPartyId=${organizationPartyId}"/>
+        </menu-item>
         <menu-item name="ListGlAccountOrganization" title="${uiLabelMap.AcctgListGlAcctOrg}">
             <link target="ListGlAccountOrganization?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
+        <menu-item name="GlAccountAssignment" title="${uiLabelMap.AccountingGlAccountDefault}">
+            <link target="GlAccountAssignment?organizationPartyId=${organizationPartyId}"/>
+        </menu-item>
         <menu-item name="TimePeriods" title="${uiLabelMap.TimePeriod}">
             <link target="TimePeriods?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
-        <menu-item name="PartyAcctgPreference" title="${uiLabelMap.AccountingPreference}">
-            <link target="PartyAcctgPreference?organizationPartyId=${organizationPartyId}"/>
-        </menu-item>
         <menu-item name="ViewFXConversions" title="${uiLabelMap.AccountingFX}">
             <link target="viewFXConversions?organizationPartyId=${organizationPartyId}"/>
-        </menu-item>
-        <menu-item name="GlAccountAssignment" title="${uiLabelMap.AccountingGlAccountDefault}">
-            <link target="GlAccountAssignment?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
     </menu>
     <menu name="PartyAdminAssignTabBar" selected-menuitem-context-field-name="tabButtonItem2" default-menu-item-name="GlAccountSalInvoice" default-selected-style="selected"