Author: jacopoc
Date: Tue Dec 1 10:16:18 2009
New Revision: 885716
URL: http://svn.apache.org/viewvc?rev=885716&view=rev
Log:
Removed old screen and sorted menu items for financial reports.
Modified:
ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=885716&r1=885715&r2=885716&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Tue Dec 1
10:16:18 2009
@@ -787,13 +787,13 @@
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
- <menu-item name="IncomeStatement"
title="${uiLabelMap.AccountingIncomeStatement}">
- <link target="IncomeStatement">
+ <menu-item name="TransactionTotals"
title="${uiLabelMap.AccountingTransactionTotals}">
+ <link target="TransactionTotals">
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
- <menu-item name="ComparativeIncomeStatement"
title="${uiLabelMap.AccountingComparativeIncomeStatement}">
- <link target="ComparativeIncomeStatement">
+ <menu-item name="IncomeStatement"
title="${uiLabelMap.AccountingIncomeStatement}">
+ <link target="IncomeStatement">
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
@@ -802,13 +802,13 @@
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
- <menu-item name="ComparativeBalanceSheet"
title="${uiLabelMap.AccountingComparativeBalanceSheet}">
- <link target="ComparativeBalanceSheet">
+ <menu-item name="ComparativeIncomeStatement"
title="${uiLabelMap.AccountingComparativeIncomeStatement}">
+ <link target="ComparativeIncomeStatement">
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
- <menu-item name="TransactionTotals"
title="${uiLabelMap.AccountingTransactionTotals}">
- <link target="TransactionTotals">
+ <menu-item name="ComparativeBalanceSheet"
title="${uiLabelMap.AccountingComparativeBalanceSheet}">
+ <link target="ComparativeBalanceSheet">
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
@@ -822,13 +822,13 @@
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
- <menu-item name="CostCenterReport"
title="${uiLabelMap.FormFieldTitle_costCenters}">
- <link target="CostCenterReport">
+ <menu-item name="InventoryValuation"
title="${uiLabelMap.AccountingInventoryValuation}">
+ <link target="InventoryValuation">
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
- <menu-item name="InventoryValuation"
title="${uiLabelMap.AccountingInventoryValuation}">
- <link target="InventoryValuation">
+ <menu-item name="CostCenterReport"
title="${uiLabelMap.FormFieldTitle_costCenters}">
+ <link target="CostCenterReport">
<parameter param-name="organizationPartyId"/>
</link>
</menu-item>
Modified:
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=885716&r1=885715&r2=885716&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
(original)
+++
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
Tue Dec 1 10:16:18 2009
@@ -501,64 +501,6 @@
</widgets>
</section>
</screen>
- <screen name="TransactionTotalsOrig">
- <section>
- <actions>
- <set field="titleProperty"
value="AccountingTransactionTotals"/>
- <set field="labelTitleProperty"
value="AccountingTransactionTotals"/>
- <set field="tabButtonItem"
value="OrganizationAccountingReports"/>
- <set field="tabButtonItem2" value="TransactionTotals"/>
- <set field="organizationPartyId"
from-field="parameters.organizationPartyId"/>
- <set field="partyIds"
value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator,
organizationPartyId, 'GROUP_ROLLUP')}" type="List"/>
- <set field="partyIds[]" from-field="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" default-value="${nowTimestamp}"/>
- <set field="thruDate" from-field="parameters.thruDate"
type="Timestamp" default-value="${nowTimestamp}"/>
- <script
location="component://accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy"/>
- </actions>
- <widgets>
- <decorator-screen
name="CommonOrganizationAccountingReportsDecorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <screenlet
title="${uiLabelMap.AccountingTransactionTotals}">
- <include-form name="FindTransactionTotals"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </screenlet>
- <section>
- <condition>
- <or>
- <not><if-empty
field="postedTransactionTotals"/></not>
- <not><if-empty
field="unpostedTransactionTotals"/></not>
- <not><if-empty
field="allTransactionTotals"/></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>
- <screenlet
title="${uiLabelMap.AccountingPostedTransactionTotals}">
- <include-form name="PostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </screenlet>
- <screenlet
title="${uiLabelMap.AccountingUnPostedTransactionTotals}">
- <include-form name="UnpostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </screenlet>
- <screenlet
title="${uiLabelMap.AccountingPostedAndUnpostedTransactionTotals}">
- <include-form
name="PostedAndUnpostedTransactionTotalList"
location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="TransactionTotalsPdf">
<section>
