Author: mor
Date: Thu Jul 2 08:53:16 2009
New Revision: 790505
URL: http://svn.apache.org/viewvc?rev=790505&view=rev
Log:
CSV and PDF export of Chart of Accounts. Applied patch from Brajesh Patel, part
of OFBIZ-2681 (https://issues.apache.org/jira/browse/OFBIZ-2681)
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=790505&r1=790504&r2=790505&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Thu Jul
2 08:53:16 2009
@@ -1567,6 +1567,9 @@
<value xml:lang="th">à¸à¸£à¸°à¹à¸ à¸à¸à¸±à¸à¸£</value>
<value xml:lang="zh">å¡ç±»å</value>
</property>
+ <property key="AccountingChartOfAcctsFor">
+ <value xml:lang="en">Chart of accounts for</value>
+ </property>
<property key="AccountingChartOfAcctsMenu">
<value xml:lang="ar">بÙا٠اÙØسابات</value>
<value xml:lang="de">Kontenübersicht</value>
@@ -5281,6 +5284,9 @@
<property key="AccountingNoAcctgTransFound">
<value xml:lang="en">No Accounting Transactions Found.</value>
</property>
+ <property key="AccountingNoRecordFound">
+ <value xml:lang="en">No Record Found.</value>
+ </property>
<property key="AccountingNotModificationRecrationGlAccount">
<value xml:lang="ar">Ùا ÙÙ
Ù٠تعÙÙر Ùذا دÙ٠إعادة
إستØداث Øساب اÙÙ
ØاسبÙ</value>
<value xml:lang="en">This cannot be changed without re-creating the GL
Account.</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=790505&r1=790504&r2=790505&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
Thu Jul 2 08:53:16 2009
@@ -696,6 +696,14 @@
</request-map>
<request-map uri="ListGlAccountOrganization"><security https="true"
auth="true"/><response name="success" type="view"
value="ListGlAccountOrganization"/></request-map>
+ <request-map uri="ListGlAccountOrgPdf.pdf">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ListGlAccountOrgPdf"/>
+ </request-map>
+ <request-map uri="ListGlAccountOrgCsv.csv">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ListGlAccountOrgCsv"/>
+ </request-map>
<!-- TO BE REMOVED
<request-map uri="EditGlobalGlAccountOrganizations"><security https="true"
auth="true"/><response name="success" type="view"
value="EditGlobalGlAccountOrganizations"/></request-map>
@@ -2283,6 +2291,8 @@
<view-map name="EditVarianceReasonGlAccounts" type="screen"
page="component://accounting/widget/GlSetupScreens.xml#EditVarianceReasonGlAccounts"/>
<view-map name="EditCreditCardTypeGlAccounts" type="screen"
page="component://accounting/widget/GlSetupScreens.xml#EditCreditCardTypeGlAccounts"/>
<view-map name="EditOrganizationTaxAuthorityGlAccounts" type="screen"
page="component://accounting/widget/GlSetupScreens.xml#EditOrganizationTaxAuthorityGlAccounts"/>
+ <view-map name="ListGlAccountOrgPdf" type="screenfop"
page="component://accounting/widget/GlSetupScreens.xml#ListGlAccountOrgPdf"
content-type="application/pdf" encoding="none"/>
+ <view-map name="ListGlAccountOrgCsv" type="screentext"
page="component://accounting/widget/GlSetupScreens.xml#ListGlAccountOrgCsv"
content-type="text/csv" encoding="none"/>
<!-- Manual Credit Card Transaction -->
<view-map name="FindGatewayResponses"
page="component://accounting/widget/TransactionScreens.xml#FindGatewayResponses"
type="screen"/>
Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=790505&r1=790504&r2=790505&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Thu Jul 2
08:53:16 2009
@@ -974,4 +974,59 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit
button-type="button"/></field>
</form>
+
+ <form name="ListGlAccountOrgCsv" list-name="listIt" target="" title=""
type="list" view-size="99999"
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar" paginate="false">
+ <actions>
+ <entity-condition entity-name="GlAccountOrganizationAndClass">
+ <condition-expr field-name="organizationPartyId"
from-field="organizationPartyId"/>
+ <order-by field-name="glAccountId"/>
+ </entity-condition>
+ </actions>
+ <field name="quot0" title="""><display
description="""/></field>
+ <field name="glAccountId"><display
description="${glAccountId}"/></field>
+ <field name="quot1" title="""><display
description="""/></field>
+ <field name="separator0" title=","><display description=","/></field>
+
+ <field name="quot2" title="""><display
description="""/></field>
+ <field name="glAccountTypeId"><display-entity
entity-name="GlAccountType"/></field>
+ <field name="quot3" title="""><display
description="""/></field>
+ <field name="separator1" title=","><display description=","/></field>
+
+ <field name="quot4" title="""><display
description="""/></field>
+ <field name="glAccountClassId"><display-entity
entity-name="GlAccountClass" key-field-name="glAccountClassId"/></field>
+ <field name="quot5" title="""><display
description="""/></field>
+ <field name="separator2" title=","><display description=","/></field>
+
+ <field name="glResourceTypeId"><display-entity
entity-name="GlResourceType" key-field-name="glResourceTypeId"/></field>
+ <field name="separator3" title=","><display description=","/></field>
+
+ <field name="glXbrlClassId"><display-entity entity-name="GlXbrlClass"
key-field-name="glXbrlClassId"/></field>
+ <field name="separator4" title=","><display description=","/></field>
+
+ <field name="quot6" title="""><display
description="""/></field>
+ <field name="parentGlAccountId"><display-entity
entity-name="GlAccount" key-field-name="glAccountId"
description="${parentGlAccountId}"/></field>
+ <field name="quot7" title="""><display
description="""/></field>
+ <field name="separator5" title=","><display description=","/></field>
+
+ <field name="quot8" title="""><display
description="""/></field>
+ <field name="accountCode" ><display-entity entity-name="GlAccount"
key-field-name="glAccountId" description="${accountCode}"/></field>
+ <field name="quot9" title="""><display
description="""/></field>
+ <field name="separator6" title=","><display description=","/></field>
+
+ <field name="accountName" ><display-entity entity-name="GlAccount"
key-field-name="glAccountId" description="${accountName}"/></field>
+ <field name="separator7" title=","><display description=","/></field>
+
+ <field name="description"><display
description="${description}"/></field>
+ <field name="separator8" title=","><display description=","/></field>
+
+ <field name="quot10" title="""><display
description="""/></field>
+ <field name="productId"><display description="${productId}"/></field>
+ <field name="quot11" title="""><display
description="""/></field>
+ <field name="separator9" title=","><display description=","/></field>
+
+ <field name="quot12" title="""><display
description="""/></field>
+ <field name="postedBalance"><display
description="${postedBalance}"/></field>
+ <field name="quot13" title="""><display
description="""/></field>
+ </form>
</forms>
Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=790505&r1=790504&r2=790505&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Thu Jul 2
08:53:16 2009
@@ -107,6 +107,12 @@
<screenlet id="GlAccountOrganizationPanel"
title="${uiLabelMap.AccountingChartOfAcctsMenu}" collapsible="true">
<include-form name="AssignGlAccount"
location="component://accounting/widget/GlSetupForms.xml"/>
</screenlet>
+ <link text="${uiLabelMap.AccountingExportAsCsv}"
style="button" target="ListGlAccountOrgCsv.csv">
+ <parameter param-name="organizationPartyId"/>
+ </link>
+ <link text="${uiLabelMap.AccountingExportAsPdf}"
style="button" target="ListGlAccountOrgPdf.pdf">
+ <parameter param-name="organizationPartyId"/>
+ </link>
<include-form name="ListGlAccountOrganization"
location="component://accounting/widget/GlSetupForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -552,4 +558,38 @@
</widgets>
</section>
</screen>
+
+ <screen name="ListGlAccountOrgPdf">
+ <section>
+ <actions>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
+ <property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
+ <set field="organizationPartyId"
from-field="parameters.organizationPartyId"/>
+ <entity-condition entity-name="GlAccountOrganizationAndClass"
list="glAccountOrgAndClassList">
+ <condition-expr field-name="organizationPartyId"
from-field="organizationPartyId"/>
+ <order-by field-name="glAccountId"/>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <platform-specific>
+ <xsl-fo>
+ <html-template
location="component://accounting/webapp/accounting/reports/ChartOfAccount.fo.ftl"/>
+ </xsl-fo>
+ </platform-specific>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="ListGlAccountOrgCsv">
+ <section>
+ <actions>
+ <set field="organizationPartyId"
from-field="parameters.organizationPartyId"/>
+ </actions>
+ <widgets>
+ <container>
+ <include-form name="ListGlAccountOrgCsv"
location="component://accounting/widget/GlSetupForms.xml"/>
+ </container>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file
