You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bu...@apache.org on 2009/10/18 16:37:46 UTC
svn commit: r826449 [2/2] - /ofbiz/trunk/applications/accounting/widget/
Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=826449&r1=826448&r2=826449&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml Sun Oct 18 14:37:45 2009
@@ -34,61 +34,21 @@
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container><label style="h1" text="${uiLabelMap.PageTitleFinancialSummaryReportOptions}"/></container>
-
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleSalesInvoiceByProductCategorySummary}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="SalesInvoiceByProductCategorySummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </container>
-
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleSalesInvoiceByProductGlAccountSummary}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="SalesInvoiceByProductGlAccountSummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </container>
-
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitlePaymentByMethodSummary}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="PaymentByMethodSummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </container>
-
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleInventoryIssueSummary}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="InventoryIssueSummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </container>
-
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleFinancialAccountSummary}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="FinancialAccountSummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleSalesInvoiceByProductCategorySummary}">
+ <include-form name="SalesInvoiceByProductCategorySummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PageTitleSalesInvoiceByProductGlAccountSummary}">
+ <include-form name="SalesInvoiceByProductGlAccountSummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PageTitlePaymentByMethodSummary}">
+ <include-form name="PaymentByMethodSummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PageTitleInventoryIssueSummary}">
+ <include-form name="InventoryIssueSummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PageTitleFinancialAccountSummary}">
+ <include-form name="FinancialAccountSummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -134,16 +94,11 @@
<widgets>
<decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleSalesInvoiceByProductCategorySummary}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <platform-specific><html><html-template location="component://accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl"/></html></platform-specific>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleSalesInvoiceByProductCategorySummary}">
+ <platform-specific>
+ <html><html-template location="component://accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -164,16 +119,11 @@
<widgets>
<decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleSalesInvoiceByProductGlAccountSummary}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <platform-specific><html><html-template location="component://accounting/webapp/accounting/reports/SalesInvoiceByProductGlAccountSummary.ftl"/></html></platform-specific>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleSalesInvoiceByProductGlAccountSummary}">
+ <platform-specific>
+ <html><html-template location="component://accounting/webapp/accounting/reports/SalesInvoiceByProductGlAccountSummary.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -195,16 +145,11 @@
<widgets>
<decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitlePaymentByMethodSummary}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <platform-specific><html><html-template location="component://accounting/webapp/accounting/reports/PaymentByMethodSummary.ftl"/></html></platform-specific>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitlePaymentByMethodSummary}">
+ <platform-specific>
+ <html><html-template location="component://accounting/webapp/accounting/reports/PaymentByMethodSummary.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -225,16 +170,11 @@
<widgets>
<decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleInventoryIssueSummary}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <platform-specific><html><html-template location="component://accounting/webapp/accounting/reports/InventoryIssueSummary.ftl"/></html></platform-specific>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleInventoryIssueSummary}">
+ <platform-specific>
+ <html><html-template location="component://accounting/webapp/accounting/reports/InventoryIssueSummary.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -255,16 +195,11 @@
<widgets>
<decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleFinancialAccountSummary}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <platform-specific><html><html-template location="component://accounting/webapp/accounting/reports/FinancialAccountSummary.ftl"/></html></platform-specific>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleFinancialAccountSummary}">
+ <platform-specific>
+ <html><html-template location="component://accounting/webapp/accounting/reports/FinancialAccountSummary.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -335,50 +270,36 @@
<widgets>
<decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.AccountingIncomeStatement}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="IncomeStatementParameters" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.AccountingIncomeStatement}">
+ <include-form name="IncomeStatementParameters" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
<section>
<condition>
<not><if-empty field="totalNetIncome"/></not>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.AccountingIncomeStatement}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <link text="${uiLabelMap.AccountingExportAsCsv}" style="button" target="IncomeStatementListCsv.csv">
- <parameter param-name="fromDate" from-field="parameters.fromDate"/>
- <parameter param-name="thruDate" from-field="parameters.thruDate"/>
- <parameter param-name="isIncomeStatement" value="true"/>
- <parameter param-name="selectedMonth" from-field="parameters.selectedMonth"/>
- <parameter param-name="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/>
- </link>
- <link text="${uiLabelMap.AccountingExportAsPdf}" style="button" target="IncomeStatementListPdf.pdf">
- <parameter param-name="fromDate" from-field="parameters.fromDate"/>
- <parameter param-name="thruDate" from-field="parameters.thruDate"/>
- <parameter param-name="isIncomeStatement" value="true"/>
- <parameter param-name="selectedMonth" from-field="parameters.selectedMonth"/>
- <parameter param-name="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/>
- </link>
- <container style="h3"><label text="${uiLabelMap.AccountingIncome}"/></container>
- <include-form name="IncomeStatementList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- <container style="h3"><label text="${uiLabelMap.AccountingExpenses}"/></container>
- <include-form name="ExpenseStatementList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.AccountingIncomeStatement}">
+ <link text="${uiLabelMap.AccountingExportAsCsv}" style="button" target="IncomeStatementListCsv.csv">
+ <parameter param-name="fromDate" from-field="parameters.fromDate"/>
+ <parameter param-name="thruDate" from-field="parameters.thruDate"/>
+ <parameter param-name="isIncomeStatement" value="true"/>
+ <parameter param-name="selectedMonth" from-field="parameters.selectedMonth"/>
+ <parameter param-name="organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/>
+ </link>
+ <link text="${uiLabelMap.AccountingExportAsPdf}" style="button" target="IncomeStatementListPdf.pdf">
+ <parameter param-name="fromDate" from-field="parameters.fromDate"/>
+ <parameter param-name="thruDate" from-field="parameters.thruDate"/>
+ <parameter param-name="isIncomeStatement" value="true"/>
+ <parameter param-name="selectedMonth" from-field="parameters.selectedMonth"/>
+ <parameter param-name="organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/>
+ </link>
+ <container style="h3"><label text="${uiLabelMap.AccountingIncome}"/></container>
+ <include-form name="IncomeStatementList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ <container style="h3"><label text="${uiLabelMap.AccountingExpenses}"/></container>
+ <include-form name="ExpenseStatementList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
<container>
<label style="h3" text="${uiLabelMap.AccountingNetIncome}: ${totalNetIncome}"/>
</container>
@@ -409,16 +330,9 @@
<widgets>
<decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.AccountingBalanceSheet}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="BalanceSheetParameters" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.AccountingBalanceSheet}">
+ <include-form name="BalanceSheetParameters" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
<section>
<condition>
<or>
@@ -438,36 +352,15 @@
<parameter param-name="thruDate" from-field="parameters.thruDate"/>
<parameter param-name="glFiscalTypeId" from-field="parameters.glFiscalTypeId"/>
</link>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.AccountingAssets}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="BalanceSheetAssetList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.AccountingLiabilities}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="BalanceSheetLiabilityList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.AccountingEquities}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="BalanceSheetEquityList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.AccountingAssets}">
+ <include-form name="BalanceSheetAssetList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.AccountingLiabilities}">
+ <include-form name="BalanceSheetLiabilityList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.AccountingEquities}">
+ <include-form name="BalanceSheetEquityList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
</widgets>
</section>
</decorator-section>
@@ -495,16 +388,9 @@
<widgets>
<decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.AccountingComparativeBalanceSheet}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="ComparativeBalanceSheetParameters" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.AccountingComparativeBalanceSheet}">
+ <include-form name="ComparativeBalanceSheetParameters" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
<section>
<condition>
<or>
@@ -514,36 +400,15 @@
</or>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.AccountingAssets}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="BalanceSheetAssetList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.AccountingLiabilities}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="BalanceSheetLiabilityList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.AccountingEquities}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="BalanceSheetEquityList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.AccountingAssets}">
+ <include-form name="BalanceSheetAssetList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.AccountingLiabilities}">
+ <include-form name="BalanceSheetLiabilityList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.AccountingEquities}">
+ <include-form name="BalanceSheetEquityList" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
</widgets>
</section>
</decorator-section>
@@ -573,67 +438,42 @@
<widgets>
<decorator-screen name="CommonOrganizationAccountingReportsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.AccountingTransactionTotals}"/>
- </container>
- <container style="screenlet-body">
- <include-form name="FindTransactionTotals" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
- </container>
- </container>
- </container>
- <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 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>
- <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>
+ <screenlet title="${uiLabelMap.AccountingTransactionTotals}">
+ <include-form name="FindTransactionTotals" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
+ </screenlet>
+ <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>
+ <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.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>
Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml?rev=826449&r1=826448&r2=826449&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml Sun Oct 18 14:37:45 2009
@@ -30,21 +30,10 @@
<widgets>
<decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleFindTaxAuthority}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container><link target="EditTaxAuthority" text="${uiLabelMap.AccountingNewTaxAuthority}" style="buttontext"/></container>
- <include-form name="FindTaxAuthority" location="component://accounting/widget/TaxAuthorityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleFindTaxAuthority}">
+ <container><link target="EditTaxAuthority" text="${uiLabelMap.AccountingNewTaxAuthority}" style="buttontext"/></container>
+ <include-form name="FindTaxAuthority" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -65,20 +54,9 @@
<widgets>
<decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditTaxAuthority}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditTaxAuthority" location="component://accounting/widget/TaxAuthorityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditTaxAuthority}">
+ <include-form name="EditTaxAuthority" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -187,40 +165,18 @@
<widgets>
<decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleListTaxAuthorityParties}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditTaxAuthorityPartyInfo" text="${uiLabelMap.AccountingNewTaxAuthorityPartyInfo}" style="buttontext">
- <parameter param-name="taxAuthPartyId"/>
- <parameter param-name="taxAuthGeoId"/>
- </link>
- </container>
- <include-form name="FindTaxAuthorityParties" location="component://accounting/widget/TaxAuthorityForms.xml"/>
- </widgets>
- </section>
+ <screenlet title="${uiLabelMap.PageTitleListTaxAuthorityParties}">
+ <container>
+ <link target="EditTaxAuthorityPartyInfo" text="${uiLabelMap.AccountingNewTaxAuthorityPartyInfo}" style="buttontext">
+ <parameter param-name="taxAuthPartyId"/>
+ <parameter param-name="taxAuthGeoId"/>
+ </link>
</container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleListTaxAuthorityParties}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListTaxAuthorityParties" location="component://accounting/widget/TaxAuthorityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <include-form name="FindTaxAuthorityParties" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PageTitleListTaxAuthorityParties}">
+ <include-form name="ListTaxAuthorityParties" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -242,26 +198,15 @@
<widgets>
<decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditTaxAuthorityPartyInfo}"/>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditTaxAuthorityPartyInfo}">
+ <container>
+ <link target="EditTaxAuthorityPartyInfo" text="${uiLabelMap.AccountingNewTaxAuthorityPartyInfo}" style="buttontext">
+ <parameter param-name="taxAuthPartyId"/>
+ <parameter param-name="taxAuthGeoId"/>
+ </link>
</container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditTaxAuthorityPartyInfo" text="${uiLabelMap.AccountingNewTaxAuthorityPartyInfo}" style="buttontext">
- <parameter param-name="taxAuthPartyId"/>
- <parameter param-name="taxAuthGeoId"/>
- </link>
- </container>
- <include-form name="EditTaxAuthorityPartyInfo" location="component://accounting/widget/TaxAuthorityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <include-form name="EditTaxAuthorityPartyInfo" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml?rev=826449&r1=826448&r2=826449&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Sun Oct 18 14:37:45 2009
@@ -97,48 +97,15 @@
<widgets>
<decorator-screen name="GenericTransactionDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleViewGatewayResponse}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ViewGatewayResponseRelations" location="component://accounting/widget/TransactionForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.AccountingPaymentsMenu}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ViewGatewayResponsePayments" location="component://accounting/widget/TransactionForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleViewGatewayResponse}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ViewGatewayResponse" location="component://accounting/widget/TransactionForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleViewGatewayResponse}">
+ <include-form name="ViewGatewayResponseRelations" location="component://accounting/widget/TransactionForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.AccountingPaymentsMenu}">
+ <include-form name="ViewGatewayResponsePayments" location="component://accounting/widget/TransactionForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PageTitleViewGatewayResponse}">
+ <include-form name="ViewGatewayResponse" location="component://accounting/widget/TransactionForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -165,20 +132,9 @@
<widgets>
<decorator-screen name="GenericTransactionDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.AccountingAuthorize}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AuthorizeTransaction" location="component://accounting/widget/TransactionForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.AccountingAuthorize}">
+ <include-form name="AuthorizeTransaction" location="component://accounting/widget/TransactionForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -205,20 +161,9 @@
<widgets>
<decorator-screen name="GenericTransactionDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.AccountingCapture}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="CaptureTransaction" location="component://accounting/widget/TransactionForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.AccountingCapture}">
+ <include-form name="CaptureTransaction" location="component://accounting/widget/TransactionForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>