svn commit: r790120 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: mor
Date: Wed Jul 1 11:16:11 2009 New Revision: 790120 URL: http://svn.apache.org/viewvc?rev=790120&view=rev Log: Transaction Totals report can now be exported to PDF and CSV format. Applied patch from Brajesh Patel, OFBIZ-2677 (https://issues.apache.org/jira/browse/OFBIZ-2677) Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=790120&r1=790119&r2=790120&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Wed Jul 1 11:16:11 2009 @@ -7241,6 +7241,9 @@ <value xml:lang="nl">Totalen transactie</value> <value xml:lang="th">à¸à¸¥à¸£à¸§à¸¡à¸£à¸²à¸¢à¸à¸²à¸£</value> </property> + <property key="AccountingTransactionTotalsReport"> + <value xml:lang="en">Transaction Totals Report</value> + </property> <property key="AccountingTransactionType"> <value xml:lang="ar">ÙÙع اÙع٠ÙÙØ©</value> <value xml:lang="de">Transaktions-Art</value> 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=790120&r1=790119&r2=790120&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Wed Jul 1 11:16:11 2009 @@ -2071,6 +2071,16 @@ <response name="success" type="view" value="AcctgTransSearchResultPdf"/> </request-map> + <request-map uri="TransactionTotalsPdf.pdf"> + <security https="true" auth="true"/> + <response name="success" type="view" value="TransactionTotalsPdf"/> + </request-map> + + <request-map uri="TransactionTotalsCsv.csv"> + <security https="true" auth="true"/> + <response name="success" type="view" value="TransactionTotalsCsv"/> + </request-map> + <!-- end of request mappings --> <!-- View Mappings --> @@ -2324,6 +2334,9 @@ <view-map name="AcctgTransEntriesSearchResultsPdf" type="screenfop" page="component://accounting/widget/GlScreens.xml#AcctgTransEntriesSearchResultsPdf" content-type="application/pdf" encoding="none"/> <view-map name="AcctgTransSearchResultsCsv" type="screentext" page="component://accounting/widget/GlScreens.xml#AcctgTransSearchResultsCsv" content-type="text/csv" encoding="none"/> <view-map name="AcctgTransSearchResultPdf" type="screenfop" page="component://accounting/widget/GlScreens.xml#AcctgTransSearchResultPdf" content-type="application/pdf" encoding="none"/> - + + <view-map name="TransactionTotalsPdf" type="screenfop" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TransactionTotalsPdf" content-type="application/pdf" encoding="none"/> + <view-map name="TransactionTotalsCsv" type="screentext" page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TransactionTotalsCsv" content-type="text/csv" encoding="none"/> + <!-- end of view mappings --> </site-conf> Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=790120&r1=790119&r2=790120&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Wed Jul 1 11:16:11 2009 @@ -250,4 +250,61 @@ <field name="debit"><display type="currency" currency="${currencyUomId}"/></field> <field name="credit"><display type="currency" currency="${currencyUomId}"/></field> </form> + + <form name="PostedTransactionTotalListCsv" type="list" list-name="postedTransTotalList" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <field name="quot0" title="""><display description="""/></field> + <field name="glAccountId"><display/></field> + <field name="quot1" title="""><display description="""/></field> + <field name="seprator0" title=","><display description=","/></field> + + <field name="accountName" entry-name="glAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountName}"/></field> + <field name="seprator1" title=","><display description=","/></field> + + <field name="quot2" title="""><display description="""/></field> + <field name="debit"><display type="currency" currency="${currencyUomId}"/></field> + <field name="quot3" title="""><display description="""/></field> + <field name="seprator2" title=","><display description=","/></field> + + <field name="quot4" title="""><display description="""/></field> + <field name="credit"><display type="currency" currency="${currencyUomId}"/></field> + <field name="quot5" title="""><display description="""/></field> + </form> + + <form name="UnpostedTransactionTotalListCsv" type="list" list-name="unpostedTransTotalList" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <field name="quot0" title="""><display description="""/></field> + <field name="glAccountId"><display/></field> + <field name="quot1" title="""><display description="""/></field> + <field name="seprator0" title=","><display description=","/></field> + + <field name="accountName" entry-name="glAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountName}"/></field> + <field name="seprator1" title=","><display description=","/></field> + + <field name="quot2" title="""><display description="""/></field> + <field name="debit"><display type="currency" currency="${currencyUomId}"/></field> + <field name="quot3" title="""><display description="""/></field> + <field name="seprator2" title=","><display description=","/></field> + + <field name="quot4" title="""><display description="""/></field> + <field name="credit"><display type="currency" currency="${currencyUomId}"/></field> + <field name="quot5" title="""><display description="""/></field> + </form> + + <form name="PostedAndUnpostedTransactionTotalListCsv" type="list" list-name="postedAndUnpostedTransTotalList" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <field name="quot0" title="""><display description="""/></field> + <field name="glAccountId"><display/></field> + <field name="quot1" title="""><display description="""/></field> + <field name="seprator0" title=","><display description=","/></field> + + <field name="accountName" entry-name="glAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountName}"/></field> + <field name="seprator1" title=","><display description=","/></field> + + <field name="quot2" title="""><display description="""/></field> + <field name="debit"><display type="currency" currency="${currencyUomId}"/></field> + <field name="quot3" title="""><display description="""/></field> + <field name="seprator2" title=","><display description=","/></field> + + <field name="quot4" title="""><display description="""/></field> + <field name="credit"><display type="currency" currency="${currencyUomId}"/></field> + <field name="quot5" title="""><display description="""/></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=790120&r1=790119&r2=790120&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml Wed Jul 1 11:16:11 2009 @@ -550,40 +550,116 @@ <include-form name="FindTransactionTotals" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> </container> </container> - </container> - <container style="screenlet"> + </container> + <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.AccountingPostedTransactionTotals}"/> + <label text="${uiLabelMap.AccountingTransactionTotalsReport}"/> </container> <container style="screenlet-body"> - <include-form name="PostedTransactionTotalList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> + <section> + <condition> + <or> + <not><if-empty field="postedTransTotalList"/></not> + <not><if-empty field="unpostedTransTotalList"/></not> + <not><if-empty field="postedAndUnpostedTransTotalList"/></not> + </or> + </condition> + <widgets> + <link text="${uiLabelMap.AccountingExportAsCsv}" style="button" target="TransactionTotalsCsv.csv"> + <parameter param-name="fromDate"/> + <parameter param-name="thruDate"/> + <parameter param-name="organizationPartyId"/> + </link> + <link text="${uiLabelMap.AccountingExportAsPdf}" style="button" target="TransactionTotalsPdf.pdf"> + <parameter param-name="fromDate"/> + <parameter param-name="thruDate"/> + <parameter param-name="organizationPartyId"/> + </link> + </widgets> + </section> </container> </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingUnPostedTransactionTotals}"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.AccountingPostedTransactionTotals}"/> + </container> + <container style="screenlet-body"> + <include-form name="PostedTransactionTotalList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> + </container> </container> - <container style="screenlet-body"> - <include-form name="UnpostedTransactionTotalList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.AccountingUnPostedTransactionTotals}"/> + </container> + <container style="screenlet-body"> + <include-form name="UnpostedTransactionTotalList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> + </container> </container> </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.AccountingPostedAndUnpostedTransactionTotals}"/> + </container> + <container style="screenlet-body"> + <include-form name="PostedAndUnpostedTransactionTotalList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> + </container> + </container> + </container> </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingPostedAndUnpostedTransactionTotals}"/> - </container> - <container style="screenlet-body"> - <include-form name="PostedAndUnpostedTransactionTotalList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> - </container> - </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="TransactionTotalsPdf"> + <section> + <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> + <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"/> + </actions> + <widgets> + <decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="body"> + <container> + <label text="${uiLabelMap.AccountingPostedTransactionTotals}"/> + <include-form name="PostedTransactionTotalList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> + <label text="${uiLabelMap.AccountingUnPostedTransactionTotals}"/> + <include-form name="UnpostedTransactionTotalList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> + <label text="${uiLabelMap.AccountingPostedAndUnpostedTransactionTotals}"/> + <include-form name="PostedAndUnpostedTransactionTotalList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> </container> </decorator-section> </decorator-screen> </widgets> </section> </screen> + + <screen name="TransactionTotalsCsv"> + <section> + <actions> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> + <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"/> + </actions> + <widgets> + <label text="${uiLabelMap.AccountingPostedTransactionTotals}"/> + <include-form name="PostedTransactionTotalListCsv" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> + <label text="${uiLabelMap.AccountingPostedTransactionTotals}"/> + <include-form name="UnpostedTransactionTotalListCsv" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> + <label text="${uiLabelMap.AccountingPostedTransactionTotals}"/> + <include-form name="PostedAndUnpostedTransactionTotalListCsv" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/> + </widgets> + </section> + </screen> </screens> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |