svn commit: r523122 - in /ofbiz/trunk/applications/accounting: script/org/ofbiz/accounting/finaccount/FinAccountServices.xml widget/FinAccountForms.xml

[jonesde]

Author: jonesde
Date: Tue Mar 27 17:12:18 2007
New Revision: 523122

URL: http://svn.apache.org/viewvc?view=rev&rev=523122
Log:
Some cleanups of the FinAccount forms to avoid explicit display field definitions; fixed issues with calculating availableBalance based on auths

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
    ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?view=diff&rev=523122&r1=523121&r2=523122
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Tue Mar 27 17:12:18 2007
@@ -168,7 +168,7 @@
 
         <!-- start with the actual balance, and subtract off FinAccountAuth.amount -->
         <set field="availableBalanceSum" from-field="actualBalanceSum"/>
-        <entity-condition entity-name="FinAccountAuth" list-name="finAccountAuthList">
+        <entity-condition entity-name="FinAccountAuth" list-name="finAccountAuthList" filter-by-date="true">
             <condition-expr field-name="finAccountId" env-name="finAccountId"/>
         </entity-condition>
         <iterate entry-name="finAccountAuth" list-name="finAccountAuthList">

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?view=diff&rev=523122&r1=523121&r2=523122
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Tue Mar 27 17:12:18 2007
@@ -132,15 +132,10 @@
                 <condition-expr field-name="finAccountId" env-name="finAccountId"/>
             </entity-condition>
         </actions>
+        <auto-fields-entity entity-name="FinAccountTrans" default-field-type="display"/>
         <field name="finAccountId"><hidden/></field>
-        <field name="finAccountTrasnsId"><hidden/></field>
+        <field name="finAccountTransId"><hidden/></field>
         <field name="finAccountTransTypeId"><display-entity entity-name="FinAccountTransType" description="${description}"/></field>
-        <field name="partyId"><display/></field>
-        <field name="transactionDate"><display/></field>  
-        <field name="entryDate"><display/></field>
-        <field name="paymentId"><display/></field>      
-        <field name="amount"><display/></field>      
-        <field name="orderId"><display/></field>      
     </form>
     <form name="AddFinAccountTrans" type="single" target="createFinAccountTrans">
         <auto-fields-service service-name="createFinAccountTrans"/>
@@ -168,13 +163,9 @@
                 <order-by field-name="finAccountAuthId"/>
             </entity-condition>
         </actions>
-        <auto-fields-entity entity-name="FinAccountAuth"/>
+        <auto-fields-entity entity-name="FinAccountAuth" default-field-type="display"/>
         <field name="finAccountAuthId"><hidden/></field>
         <field name="finAccountId"><hidden/></field>
-        <field name="amount"><display/></field>
-        <field name="authorizationDate"><display/></field>  
-        <field name="fromDate"><display/></field>
-        <field name="thruDate"><display/></field>
         <field name="expireLink" title="" widget-style="buttontext">
             <hyperlink target="expireFinAccountAuth?finAccountId=${finAccountId}&amp;finAccountAuthId=${finAccountAuthId}"
                 description="${uiLabelMap.CommonExpire}" also-hidden="false"/>