Author: apatel
Date: Tue Oct 20 05:17:45 2009
New Revision: 826954
URL: http://svn.apache.org/viewvc?rev=826954&view=rev
Log:
Moved CommonTaxAuthorityDecorator to TaxAuthorityScreens.xml file. Defined
location parameter taxAuthDecoratorLocation.
Modified:
ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml?rev=826954&r1=826953&r2=826954&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml Tue Oct
20 05:17:45 2009
@@ -21,6 +21,54 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+
+ <screen name="CommonTaxAuthorityDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="TaxAuthorities"/>
+
+ <set field="taxAuthPartyId"
from-field="parameters.taxAuthPartyId"/>
+ <set field="taxAuthGeoId"
from-field="parameters.taxAuthGeoId"/>
+ <entity-one entity-name="TaxAuthority"
value-field="taxAuthority"/>
+ <entity-one entity-name="PartyNameView"
value-field="taxAuthPartyName" auto-field-map="false">
+ <field-map field-name="partyId"
from-field="taxAuthority.taxAuthPartyId"/>
+ </entity-one>
+ <get-related-one value-field="taxAuthority"
relation-name="TaxAuthGeo" to-value-field="taxAuthGeo" use-cache="true"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <!-- do check for ACCOUNTING, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="ACCOUNTING"
action="_VIEW"/>
+ </condition>
+ <widgets>
+ <section>
+ <condition>
+ <and>
+ <not><if-empty
field="taxAuthPartyId"/></not>
+ <not><if-empty
field="taxAuthGeoId"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu
name="TaxAuthorityTabBar"
location="component://accounting/widget/TaxAuthorityMenus.xml"/>
+ <container><link
target="EditTaxAuthority" text="${uiLabelMap.AccountingNewTaxAuthority}"
style="buttontext"/></container>
+ <label style="h1"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${uiLabelMap.AccountingTaxAuthorityParty} "${taxAuthPartyName.firstName}
${taxAuthPartyName.lastName} ${taxAuthPartyName.groupName}"
[${uiLabelMap.CommonId}:${taxAuthPartyId}], ${uiLabelMap.CommonGeo}
"${taxAuthGeo.geoName}" [${uiLabelMap.CommonId}:${taxAuthGeoId}]
${${extraFunctionName}}"/>
+ </widgets>
+ </section>
+ </widgets>
+ <fail-widgets>
+ <label
style="h3">${uiLabelMap.AccountingViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ <decorator-section-include name="body"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="FindTaxAuthority">
<section>
<actions>
@@ -28,7 +76,7 @@
<set field="tabButtonItem" value="FindTaxAuthority"/>
</actions>
<widgets>
- <decorator-screen name="CommonTaxAuthorityDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonTaxAuthorityDecorator"
location="${parameters.taxAuthDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleFindTaxAuthority}">
<container><link target="EditTaxAuthority"
text="${uiLabelMap.AccountingNewTaxAuthority}" style="buttontext"/></container>
@@ -52,7 +100,7 @@
<entity-one entity-name="TaxAuthority"
value-field="taxAuthority"/>
</actions>
<widgets>
- <decorator-screen name="CommonTaxAuthorityDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonTaxAuthorityDecorator"
location="${parameters.taxAuthDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditTaxAuthority}">
<include-form name="EditTaxAuthority"
location="component://accounting/widget/TaxAuthorityForms.xml"/>
@@ -74,7 +122,7 @@
<set field="taxAuthGeoId"
from-field="parameters.taxAuthGeoId"/>
</actions>
<widgets>
- <decorator-screen name="CommonTaxAuthorityDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonTaxAuthorityDecorator"
location="${parameters.taxAuthDecoratorLocation}">
<decorator-section name="body">
<screenlet id="TaxAuthorityCategoriesPanel"
title="${uiLabelMap.PageTitleAddTaxAuthorityCategory}" collapsible="true">
<include-form name="AddTaxAuthorityCategory"
location="component://accounting/widget/TaxAuthorityForms.xml"/>
@@ -96,7 +144,7 @@
<set field="taxAuthGeoId"
from-field="parameters.taxAuthGeoId"/>
</actions>
<widgets>
- <decorator-screen name="CommonTaxAuthorityDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonTaxAuthorityDecorator"
location="${parameters.taxAuthDecoratorLocation}">
<decorator-section name="body">
<screenlet id="TaxAuthorityAssocsPanel"
title="${uiLabelMap.PageTitleAddTaxAuthorityAssoc}" collapsible="true">
<include-form name="AddTaxAuthorityAssoc"
location="component://accounting/widget/TaxAuthorityForms.xml"/>
@@ -118,7 +166,7 @@
<set field="taxAuthGeoId"
from-field="parameters.taxAuthGeoId"/>
</actions>
<widgets>
- <decorator-screen name="CommonTaxAuthorityDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonTaxAuthorityDecorator"
location="${parameters.taxAuthDecoratorLocation}">
<decorator-section name="body">
<screenlet id="TaxAuthorityGlAccountPanel"
title="${uiLabelMap.PageTitleAddTaxAuthorityGlAccount}" collapsible="true">
<include-form name="AddTaxAuthorityGlAccount"
location="component://accounting/widget/TaxAuthorityForms.xml"/>
@@ -140,7 +188,7 @@
<set field="taxAuthGeoId"
from-field="parameters.taxAuthGeoId"/>
</actions>
<widgets>
- <decorator-screen name="CommonTaxAuthorityDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonTaxAuthorityDecorator"
location="${parameters.taxAuthDecoratorLocation}">
<decorator-section name="body">
<screenlet id="TaxAuthorityCategoryPanel"
title="${uiLabelMap.PageTitleAddTaxAuthorityCategory}" collapsible="true">
<include-form name="AddTaxAuthorityRateProduct"
location="component://accounting/widget/TaxAuthorityForms.xml"/>
@@ -163,7 +211,7 @@
<set field="taxAuthGeoId"
from-field="parameters.taxAuthGeoId"/>
</actions>
<widgets>
- <decorator-screen name="CommonTaxAuthorityDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonTaxAuthorityDecorator"
location="${parameters.taxAuthDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleListTaxAuthorityParties}">
<container>
@@ -196,7 +244,7 @@
<entity-one entity-name="PartyTaxAuthInfo"
value-field="partyTaxAuthInfo"/>
</actions>
<widgets>
- <decorator-screen name="CommonTaxAuthorityDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonTaxAuthorityDecorator"
location="${parameters.taxAuthDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.PageTitleEditTaxAuthorityPartyInfo}">
<container>