You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2009/12/15 14:29:13 UTC
svn commit: r890792 - in /ofbiz/trunk/applications/accounting/widget:
AccountingMenus.xml BillingAccountForms.xml BillingAccountScreens.xml
Author: ashish
Date: Tue Dec 15 13:29:13 2009
New Revision: 890792
URL: http://svn.apache.org/viewvc?rev=890792&view=rev
Log:
Applied patch from jira issue OFBIZ-3339 - Enhance Find Billing Account Screen to follow standard Find/List screen pattern.
Thanks Surya & Ratnesh for the contribution.
Modified:
ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=890792&r1=890791&r2=890792&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Tue Dec 15 13:29:13 2009
@@ -1064,6 +1064,9 @@
</menu>
<menu name="BillingAccountTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="FindBillingAccount" title="${uiLabelMap.CommonFind}">
+ <link target="FindBillingAccount"/>
+ </menu-item>
<menu-item name="EditBillingAccount" title="${uiLabelMap.AccountingAccount}">
<link target="EditBillingAccount">
<parameter param-name="billingAccountId" from-field="billingAccount.billingAccountId"/>
Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=890792&r1=890791&r2=890792&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Tue Dec 15 13:29:13 2009
@@ -21,8 +21,17 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="ListBillingAccounts" type="list" list-name="billingAccounts" paginate-target="FindBillingAccount" default-entity-name="BillingAccount"
+ <form name="ListBillingAccounts" type="list" list-name="listIt" paginate-target="FindBillingAccount" default-entity-name="BillingAccount"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <service service-name="performFind" result-map="result" result-map-list="listIt">
+ <field-map field-name="inputFields" from-field="parameters"/>
+ <field-map field-name="entityName" value="BillingAccount"/>
+ <field-map field-name="orderBy" value="billingAccountId"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
+ </service>
+ </actions>
<field name="billingAccountId" widget-style="buttontext">
<hyperlink description="${billingAccountId}" target="EditBillingAccount">
<parameter param-name="billingAccountId"/>
@@ -333,4 +342,13 @@
<display type="currency" currency="${currencyUomId}"/>
</field>
</form>
+ <form name="FindBillingAccounts" type="single" target="FindBillingAccount" header-row-style="header-row" default-table-style="basic-table">
+ <field name="billingAccountId"><text-find ignore-case="true"/></field>
+ <field name="description"><text-find ignore-case="true"/></field>
+ <field name="accountLimit"><text/></field>
+ <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="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
</forms>
Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=890792&r1=890791&r2=890792&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Tue Dec 15 13:29:13 2009
@@ -77,14 +77,20 @@
</condition>
<widgets>
<section>
- <actions>
- <entity-condition entity-name="BillingAccount" list="billingAccounts"/>
- </actions>
<widgets>
- <screenlet title="${uiLabelMap.PageTitleFindBillingAccount}">
- <link target="EditBillingAccount" text="${uiLabelMap.CommonNew}" style="buttontext"/>
- <include-form name="ListBillingAccounts" location="component://accounting/widget/BillingAccountForms.xml"/>
- </screenlet>
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <container style="button-bar">
+ <link target="EditBillingAccount" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/>
+ </container>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindBillingAccounts" location="component://accounting/widget/BillingAccountForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListBillingAccounts" location="component://accounting/widget/BillingAccountForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
</widgets>
</section>
</widgets>