Author: jacopoc
Date: Thu Dec 6 11:51:00 2007
New Revision: 601832
URL: http://svn.apache.org/viewvc?rev=601832&view=rev
Log:
Added accounting reports menu; implemented placeholder for the report that will
be implemented as described in OFBIZ-1496
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/Menus.xml
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.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=601832&r1=601831&r2=601832&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
Thu Dec 6 11:51:00 2007
@@ -1596,6 +1596,7 @@
<request-map uri="FinancialSummaryReportOptions"><security https="true"
auth="true"/><response name="success" type="view"
value="FinancialSummaryReportOptions"/></request-map>
<request-map uri="SalesInvoiceByProductCategorySummary"><security
https="true" auth="true"/><response name="success" type="view"
value="SalesInvoiceByProductCategorySummary"/></request-map>
<request-map uri="TrialBalance"><security https="true"
auth="true"/><response name="success" type="view"
value="TrialBalance"/></request-map>
+ <request-map uri="TransactionTotals"><security https="true"
auth="true"/><response name="success" type="view"
value="TransactionTotals"/></request-map>
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -1777,6 +1778,7 @@
<view-map name="FinancialSummaryReportOptions" type="screen"
page="component://accounting/widget/ReportFinancialSummaryScreens.xml#FinancialSummaryReportOptions"/>
<view-map name="SalesInvoiceByProductCategorySummary" type="screen"
page="component://accounting/widget/ReportFinancialSummaryScreens.xml#SalesInvoiceByProductCategorySummary"/>
<view-map name="TrialBalance" type="screen"
page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TrialBalance"/>
+ <view-map name="TransactionTotals" type="screen"
page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TransactionTotals"/>
<!-- Assignment Mappings -->
<view-map name="EditPartyFixedAssetAssignments" type="screen"
page="component://accounting/widget/FixedAssetScreens.xml#EditPartyFixedAssetAssignments"/>
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=601832&r1=601831&r2=601832&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Thu Dec 6
11:51:00 2007
@@ -227,7 +227,30 @@
</widgets>
</section>
</screen>
-
+
+ <screen name="CommonOrganizationAccountingReportsDecorator">
+ <section>
+ <actions>
+ <set field="tabButtonItemTop" value="PartyAccounts"/>
+ <entity-one entity-name="PartyNameView"
value-name="currentOrganization" auto-field-map="false">
+ <field-map field-name="partyId"
env-name="organizationPartyId"/>
+ </entity-one>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-menu name="OrganizationAccountingTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu
name="OrganizationAccountingReportsTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <container>
+ <label style="head1">${uiLabelMap.CommonFor}:
${currentOrganization.groupName} [${organizationPartyId}]</label>
+ </container>
+ <decorator-section-include name="body"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="CommonAdminChecksDecorator">
<section>
<actions>
Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=601832&r1=601831&r2=601832&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Thu Dec 6 11:51:00
2007
@@ -430,8 +430,20 @@
<menu-item name="FindAcctgTransEntries"
title="${uiLabelMap.AccountingAcctgTransEntries}">
<link
target="FindAcctgTransEntries?organizationPartyId=${organizationPartyId}"/>
</menu-item>
+ <menu-item name="OrganizationAccountingReports"
title="${uiLabelMap.AccountingReports}">
+ <link
target="TrialBalance?organizationPartyId=${organizationPartyId}"/>
+ </menu-item>
<menu-item name="ChecksTabButton"
title="${uiLabelMap.AccountingChecks}">
<link
target="listChecksToPrint?organizationPartyId=${organizationPartyId}"/>
+ </menu-item>
+ </menu>
+ <menu name="OrganizationAccountingReportsTabBar"
selected-menuitem-context-field-name="tabButtonItem2"
default-menu-item-name="TrialBalance" default-selected-style="selected"
+ menu-container-style="button-bar tab-bar" type="simple">
+ <menu-item name="TrialBalance"
title="${uiLabelMap.AccountingTrialBalance}">
+ <link
target="TrialBalance?organizationPartyId=${organizationPartyId}"/>
+ </menu-item>
+ <menu-item name="TransactionTotals"
title="${uiLabelMap.AccountingTransactionTotals}">
+ <link
target="TransactionTotals?organizationPartyId=${organizationPartyId}"/>
</menu-item>
</menu>
<menu name="PartyAdminTabBar"
default-menu-item-name="PartyAcctgPreference" default-selected-style="selected"
Modified:
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=601832&r1=601831&r2=601832&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
(original)
+++
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
Thu Dec 6 11:51:00 2007
@@ -196,7 +196,8 @@
<screen name="TrialBalance">
<section>
<actions>
- <set field="tabButtonItem" value="PartyAccountsSummary"/>
+ <set field="tabButtonItem"
value="OrganizationAccountingReports"/>
+ <set field="tabButtonItem2" value="TrialBalance"/>
<set field="organizationPartyId"
from-field="parameters.organizationPartyId"/>
<entity-one entity-name="PartyAcctgPreference"
value-name="partyAcctgPreference" auto-field-map="false">
<field-map field-name="partyId"
env-name="organizationPartyId"/>
@@ -217,15 +218,32 @@
<set field="parameters.creditTotal" value="0" type="Double"/>
</actions>
<widgets>
- <decorator-screen name="CommonPartyAccountsDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen
name="CommonOrganizationAccountingReportsDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
<label style="head2"
text="${uiLabelMap.AccountingTrialBalance}"/>
</container>
+ <include-form name="TrialBalanceList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <!-- TODO: this is just a placeholder: the report is not still implemented
-->
+ <screen name="TransactionTotals">
+ <section>
+ <actions>
+ <set field="tabButtonItem"
value="OrganizationAccountingReports"/>
+ <set field="tabButtonItem2" value="TransactionTotals"/>
+ <set field="organizationPartyId"
from-field="parameters.organizationPartyId"/>
+ </actions>
+ <widgets>
+ <decorator-screen
name="CommonOrganizationAccountingReportsDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
<container>
- <label style="head3"
text="${uiLabelMap.CommonFor}: ${organizationPartyId}"/>
+ <label style="head2"
text="${uiLabelMap.AccountingTransactionTotals}"/>
</container>
- <include-form name="TrialBalanceList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
