svn commit: r883588 - /ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml

[ashish-18]

Author: ashish
Date: Tue Nov 24 05:32:26 2009
New Revision: 883588

URL: http://svn.apache.org/viewvc?rev=883588&view=rev
Log:
Applied patch from jira issue - OFBIZ-3235 - List Reconciliations under Financial Account must bee associated to the Finanacial Account.

At - https://demo.ofbiz.org/accounting/control/FindFinAccountReconciliations?finAccountId=SC_CHECKING
At above page, currently all Reconciliation are displaying, but it should display only those Reconciliation which are associated to the
selected FinAccount.

Thanks Sumit for the contribution.

Modified:
    ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=883588&r1=883587&r2=883588&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Tue Nov 24 05:32:26 2009
@@ -662,10 +662,18 @@
                 <set field="finAccountId" from-field="parameters.finAccountId"/>
                 <set field="glReconciliationId" from-field="parameters.glReconciliationId" default-value=""/>
                 <entity-one entity-name="FinAccount" value-field="finAccount"/>
+                <entity-condition entity-name="FinAccountTrans" list="finAccountTransList">
+                    <condition-list>
+                        <condition-expr field-name="finAccountId" operator="equals" from-field="finAccountId"/>
+                        <condition-expr field-name="glReconciliationId" operator="not-equals" from-field="nullField" ignore-if-empty="true"/>
+                        <condition-expr field-name="glReconciliationId" operator="equals" from-field="glReconciliationId" ignore-if-empty="true"/>
+                    </condition-list>
+                </entity-condition>
+                <set field="glReconciliationIds" value="${groovy:org.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(finAccountTransList, 'glReconciliationId', true);}" type="List"/>
                 <entity-condition entity-name="GlReconciliation" list="glReconciliations">
                     <condition-list>
-                        <condition-expr field-name="glAccountId" operator="equals" from-field="finAccount.postToGlAccountId"/>
-                        <condition-expr field-name="glReconciliationId" operator="equals" from-field="parameters.glReconciliationId" ignore-if-empty="true"/>
+                        <condition-expr field-name="glReconciliationId" operator="in" from-field="glReconciliationIds"/>
+                        <condition-expr field-name="glAccountId" operator="equals" from-field="finAccount.postToGlAccountId" ignore-if-empty="true"/>
                         <condition-expr field-name="glReconciliationName" operator="equals" from-field="parameters.glReconciliationName" ignore-if-empty="true"/>
                         <condition-expr field-name="description" operator="equals" from-field="parameters.description" ignore-if-empty="true"/>
                         <condition-expr field-name="statusId" operator="equals" from-field="parameters.statusId" ignore-if-empty="true"/>