Author: apatel
Date: Tue Jul 28 10:54:45 2009
New Revision: 798483
URL: http://svn.apache.org/viewvc?rev=798483&view=rev
Log:
Adding smaller/cleaner find form to financial account. Advanced Search brings
up classic big search form.
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/Menus.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=798483&r1=798482&r2=798483&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Jul
28 10:54:45 2009
@@ -6816,6 +6816,9 @@
<value xml:lang="nl">Aantal</value>
<value xml:lang="th">à¸à¸³à¸à¸§à¸</value>
</property>
+ <property key="AccountingQuickSearch">
+ <value xml:lang="en">Quick Search</value>
+ </property>
<property key="AccountingRateAmounts">
<value xml:lang="en">Rate Amounts</value>
<value xml:lang="fr">Valeurs de taux</value>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=798483&r1=798482&r2=798483&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Tue Jul 28
10:54:45 2009
@@ -36,6 +36,7 @@
<field name="fromDate"><date-time/></field>
<field name="thruDate"><date-time/></field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
+ <field name="displayAdvancedSearch"><hidden
value="true"></hidden></field>
<field name="searchButton" widget-style="smallSubmit"><submit
button-type="button"/></field>
</form>
<form name="ListFinAccounts" type="list" separate-columns="true"
default-entity-name="FinAccount" list-name="listIt"
paginate-target="FindFinAccount" paginate="true"
@@ -279,4 +280,18 @@
</field>
<field name="finAccountId"><hidden value="${finAccountId}"/></field>
</form>
+ <form name="QuickFindFinAccounts" type="single" target="FindFinAccount"
+ header-row-style="header-row" default-table-style="basic-table">
+ <field name="finAccountId"><text-find default-option="contains"
ignore-case="true"/></field>
+ <field name="finAccountTypeId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}"
entity-name="FinAccountType">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="finAccountName"><text-find default-option="contains"
ignore-case="true"/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
+ <field name="searchButton" widget-style="smallSubmit"><submit
button-type="button"/></field>
+ </form>
</forms>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=798483&r1=798482&r2=798483&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Tue Jul 28
10:54:45 2009
@@ -65,6 +65,7 @@
<set field="tabButtonItem" value="FindFinAccount"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX"
type="Integer" default-value="0"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE"
type="Integer" default-value="20"/>
+ <set field="displayAdvancedSearch"
from-field="parameters.displayAdvancedSearch"/>
</actions>
<widgets>
<decorator-screen name="CommonFinAccountDecorator"
location="${parameters.finAccountDecoratorLocation}">
@@ -74,11 +75,21 @@
<decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
<container style="button-bar">
- <link target="EditFinAccount"
text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingFinAccount}"
style="buttontext"/>
+ <include-menu
name="FinAccountSubTabBar" location="component://accounting/widget/Menus.xml"/>
</container>
</decorator-section>
<decorator-section name="search-options">
- <include-form name="FindFinAccounts"
location="component://accounting/widget/FinAccountForms.xml"/>
+ <section>
+ <condition>
+ <if-compare
field="displayAdvancedSearch" operator="equals" value="true"/>
+ </condition>
+ <widgets>
+ <include-form
name="FindFinAccounts"
location="component://accounting/widget/FinAccountForms.xml"/>
+ </widgets>
+ <fail-widgets>
+ <include-form
name="QuickFindFinAccounts"
location="component://accounting/widget/FinAccountForms.xml"/>
+ </fail-widgets>
+ </section>
</decorator-section>
<decorator-section name="search-results">
<include-form name="ListFinAccounts"
location="component://accounting/widget/FinAccountForms.xml"/>
@@ -330,4 +341,4 @@
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+</screens>
Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=798483&r1=798482&r2=798483&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Tue Jul 28 10:54:45
2009
@@ -1095,4 +1095,23 @@
</link>
</menu-item>
</menu>
+ <menu name="FinAccountSubTabBar" menu-container-style="button-bar
button-style-2" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}
${uiLabelMap.AccountingFinAccount}">
+ <link target="EditFinAccount"/>
+ </menu-item>
+ <menu-item name="advancedFinAccountSearch"
title="${uiLabelMap.CommonAdvancedSearch}">
+ <condition>
+ <if-compare field="displayAdvancedSearch"
operator="not-equals" value="true"/>
+ </condition>
+ <link target="FindFinAccount">
+ <parameter param-name="displayAdvancedSearch" value="true"/>
+ </link>
+ </menu-item>
+ <menu-item name="quickFinAccountSearch"
title="${uiLabelMap.AccountingQuickSearch}">
+ <condition>
+ <if-compare field="displayAdvancedSearch" operator="equals"
value="true"/>
+ </condition>
+ <link target="FindFinAccount"/>
+ </menu-item>
+ </menu>
</menus>
