svn commit: r789784 - in /ofbiz/trunk/applications/accounting/widget: ReportFinancialSummaryForms.xml ReportFinancialSummaryScreens.xml

[ashish-18]

Author: ashish
Date: Tue Jun 30 15:05:54 2009
New Revision: 789784

URL: http://svn.apache.org/viewvc?rev=789784&view=rev
Log:
Applied patch from jira issue OFBIZ-2678 (Currency not shown on the Transaction Totals search result.)
Thanks Brajesh for your contribution on this.

Modified:
    ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
    ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml

Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=789784&r1=789783&r2=789784&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Tue Jun 30 15:05:54 2009
@@ -232,22 +232,22 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="glAccountId"><display/></field>
         <field name="accountName" entry-name="glAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountName}"/></field>
-        <field name="debit"><display/></field>
-        <field name="credit"><display/></field>
+        <field name="debit"><display type="currency" currency="${currencyUomId}"/></field>
+        <field name="credit"><display type="currency" currency="${currencyUomId}"/></field>
     </form>
 
     <form name="UnpostedTransactionTotalList" type="list" list-name="unpostedTransTotalList"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="glAccountId"><display/></field>
         <field name="accountName" entry-name="glAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountName}"/></field>
-        <field name="debit"><display/></field>
-        <field name="credit"><display/></field>
+        <field name="debit"><display type="currency" currency="${currencyUomId}"/></field>
+        <field name="credit"><display type="currency" currency="${currencyUomId}"/></field>
     </form>
     <form name="PostedAndUnpostedTransactionTotalList" type="list" list-name="postedAndUnpostedTransTotalList"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="glAccountId"><display/></field>
         <field name="accountName" entry-name="glAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountName}"/></field>
-        <field name="debit"><display/></field>
-        <field name="credit"><display/></field>
+        <field name="debit"><display type="currency" currency="${currencyUomId}"/></field>
+        <field name="credit"><display type="currency" currency="${currencyUomId}"/></field>
     </form>
 </forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=789784&r1=789783&r2=789784&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml Tue Jun 30 15:05:54 2009
@@ -531,6 +531,9 @@
                 <set field="tabButtonItem" value="OrganizationAccountingReports"/>
                 <set field="tabButtonItem2" value="TransactionTotals"/>
                 <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
+                <service service-name="getPartyAccountingPreferences" result-map="result" auto-field-map="true"/>
+                <set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
+                <set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
                 <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
                 <set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/>
                 <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy"/>