Author: lektran
Date: Mon Jul 9 00:28:23 2007
New Revision: 554545
URL: http://svn.apache.org/viewvc?view=rev&rev=554545
Log:
Applied fix from trunk for revision: 552486
Modified:
ofbiz/branches/release4.0/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl
ofbiz/branches/release4.0/applications/accounting/widget/AdminScreens.xml
Modified:
ofbiz/branches/release4.0/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl?view=diff&rev=554545&r1=554544&r2=554545
==============================================================================
---
ofbiz/branches/release4.0/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl
(original)
+++
ofbiz/branches/release4.0/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl
Mon Jul 9 00:28:23 2007
@@ -18,6 +18,7 @@
-->
<#if (parameters.organizationPartyId)?exists><#assign organizationPartyId =
parameters.organizationPartyId></#if>
<#assign selected = page.tabButtonItem?default("void")>
+<#assign selected2 = page.tabButtonItem2?default("void")>
<h1>${title?if_exists} ${labelTitleProperty?if_exists} ${uiLabelMap.CommonFor}
${uiLabelMap.Organization}: ${organizationPartyId}</h1>
<div class="button-bar button-style-1">
<ul>
@@ -34,10 +35,10 @@
<#if selected == "GlAccountAssignment">
<div class="button-bar button-style-2">
<ul>
- <li><a
href="<@ofbizUrl>GlAccountSalInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingInvoiceSales}</a></li>
- <li><a
href="<@ofbizUrl>GlAccountPurInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingInvoicePurchase}</a></li>
- <li><a
href="<@ofbizUrl>GlAccountTypePaymentType?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingPaymentType}/${uiLabelMap.FormFieldTitle_glAccountTypeId}</a></li>
- <li><a
href="<@ofbizUrl>GlAccountNrPaymentMethod?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingPaymentMethodId}/${uiLabelMap.AccountingGlAccountId}</a></li>
+ <li<#if selected2 == "GlAccountSalInvoice"> class="selected"</#if>><a
href="<@ofbizUrl>GlAccountSalInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingInvoiceSales}</a></li>
+ <li<#if selected2 == "GlAccountPurInvoice"> class="selected"</#if>><a
href="<@ofbizUrl>GlAccountPurInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingInvoicePurchase}</a></li>
+ <li<#if selected2 == "GlAccountTypePaymentType">
class="selected"</#if>><a
href="<@ofbizUrl>GlAccountTypePaymentType?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingPaymentType}/${uiLabelMap.FormFieldTitle_glAccountTypeId}</a></li>
+ <li<#if selected2 == "GlAccountNrPaymentMethod">
class="selected"</#if>><a
href="<@ofbizUrl>GlAccountNrPaymentMethod?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingPaymentMethodId}/${uiLabelMap.AccountingGlAccountId}</a></li>
</ul>
<br class="clear"/>
</div>
Modified:
ofbiz/branches/release4.0/applications/accounting/widget/AdminScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/accounting/widget/AdminScreens.xml?view=diff&rev=554545&r1=554544&r2=554545
==============================================================================
--- ofbiz/branches/release4.0/applications/accounting/widget/AdminScreens.xml
(original)
+++ ofbiz/branches/release4.0/applications/accounting/widget/AdminScreens.xml
Mon Jul 9 00:28:23 2007
@@ -158,6 +158,7 @@
<set field="titleProperty"
value="AccountingGlAccountAssignments"/>
<set field="labelTitleProperty"
value="${uiLabelMap.AccountingGlAccountAssignments}"/>
<set field="tabButtonItem" value="GlAccountAssignment"/>
+ <set field="tabButtonItem2" value="GlAccountSalInvoice"/>
<set field="organizationPartyId"
from-field="parameters.organizationPartyId" />
</actions>
<widgets>
@@ -180,6 +181,7 @@
<actions>
<property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
<set field="tabButtonItem" value="GlAccountAssignment"/>
+ <set field="tabButtonItem2" value="GlAccountPurInvoice"/>
<set field="organizationPartyId"
from-field="parameters.organizationPartyId" />
</actions>
<widgets>
@@ -203,6 +205,7 @@
<actions>
<property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
<set field="tabButtonItem" value="GlAccountAssignment"/>
+ <set field="tabButtonItem2" value="GlAccountTypePaymentType"/>
<set field="organizationPartyId"
from-field="parameters.organizationPartyId" />
</actions>
<widgets>
@@ -224,6 +227,7 @@
<actions>
<property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
<set field="tabButtonItem" value="GlAccountAssignment"/>
+ <set field="tabButtonItem2" value="GlAccountNrPaymentMethod"/>
<set field="organizationPartyId"
from-field="parameters.organizationPartyId" />
</actions>
<widgets>
