svn commit: r883597 - in /ofbiz/trunk/applications/accounting: webapp/accounting/WEB-INF/controller.xml widget/FinAccountForms.xml

[ashish-18]

Author: ashish
Date: Tue Nov 24 06:00:34 2009
New Revision: 883597

URL: http://svn.apache.org/viewvc?rev=883597&view=rev
Log:
Applied patch from jira issue OFBIZ-3238 - FinAccount Reconciliation Search Result Table - Add new column for Cancel Reconciliation.

At https://localhost:8443/accounting/control/FindFinAccountReconciliations?finAccountId=SC_CHECKING
In search results, add a column to "Cancel Reconciliation" In this column show "Cancel" button to cancel reconciliations which are in CREATED status.

Thanks Sumit for the contribution.

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/widget/FinAccountForms.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=883597&r1=883596&r2=883597&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Tue Nov 24 06:00:34 2009
@@ -1784,6 +1784,12 @@
         <response name="success" type="view" value="FindGlAccountReconciliations"/>
         <response type="view" name="error"  value="FindGlAccountReconciliations"/>
     </request-map>
+    <request-map uri="cancelReconciliation">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="cancelBankReconciliation"/>
+        <response name="success" type="view" value="FindFinAccountReconciliations"/>
+        <response name="error" type="view" value="FindFinAccountReconciliations"/>
+    </request-map>
 
     <!-- ================ check requests ================= -->
     <request-map uri="listChecksToPrint">

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=883597&r1=883596&r2=883597&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Tue Nov 24 06:00:34 2009
@@ -430,6 +430,12 @@
                 <parameter param-name="partyId" from-field="partyName.partyId"/>
             </hyperlink>
         </field>
+        <field name="cancelButton" title="${uiLabelMap.AccountingCancelBankReconciliation}" use-when="${glReconciliation.statusId == 'GLREC_CREATED'}" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonCancel}" target="cancelReconciliation">
+                <parameter param-name="glReconciliationId" from-field="glReconciliation.glReconciliationId"/>
+                <parameter param-name="finAccountId"/>
+            </hyperlink>
+        </field>
         <field name="reconciledBalance"><display type="currency" currency="${currencyUomId}"></display></field>
         <field name="openingBalance"><display type="currency" currency="${currencyUomId}"></display></field>
     </form>