Author: jacopoc
Date: Wed Jun 27 22:58:28 2007
New Revision: 551460
URL: http://svn.apache.org/viewvc?view=rev&rev=551460
Log:
Applied patch from Jeremy Wickersheimer OFBIZ-1097 to complete the migration
of the faind billing account screen to widgets.
Removed:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/billingaccount/FindBillingAccount.bsh
Modified:
ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?view=diff&rev=551460&r1=551459&r2=551460
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Wed Jun
27 22:58:28 2007
@@ -21,7 +21,19 @@
<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">
+ <form name="ListBillingAccounts" type="list" list-name="billingAccounts"
paginate-target="FindBillingAccount" default-entity-name="BillingAccount">
+ <field name="billingAccountId" widget-style="buttontext">
+ <hyperlink description="${billingAccountId}"
target="EditBillingAccount?billingAccountId=${billingAccountId}"/>
+ </field>
+ <field name="accountLimit">
+ <display type="currency"
currency="${billingAccount.accountCurrencyUomId}" />
+ </field>
+ <field name="description"><display/></field>
+ <field name="fromDate"><display/></field>
+ <field name="thruDate"><display/></field>
+ </form>
+
+ <form name="ListBillingAccountsByParty" type="list"
list-name="billingAccounts" paginate-target="FindBillingAccount"
default-entity-name="BillingAccountAndRole">
<field name="billingAccountId" widget-style="buttontext">
<hyperlink description="${billingAccountId}"
target="EditBillingAccount?billingAccountId=${billingAccountId}"/>
</field>
Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?view=diff&rev=551460&r1=551459&r2=551460
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Wed
Jun 27 22:58:28 2007
@@ -47,15 +47,13 @@
</widgets>
</section>
</screen>
-
+
<screen name="FindBillingAccount">
<section>
<actions>
<set field="title" value="Find Billing Account(s)"/>
<set field="titleProperty"
value="PageTitleFindBillingAccount"/>
<set field="headerItem" value="billingaccount"/>
-
- <script
location="component://accounting/webapp/accounting/WEB-INF/actions/billingaccount/FindBillingAccount.bsh"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -66,13 +64,30 @@
<if-empty field-name="parameters.partyId"/>
</condition>
<widgets>
- <container><link target="EditBillingAccount"
text="${uiLabelMap.CommonNew}" style="buttontext"/></container>
+ <section>
+ <actions>
+ <entity-condition
entity-name="BillingAccount" list-name="billingAccounts"/>
+ </actions>
+ <widgets>
+ <container><link
target="EditBillingAccount" text="${uiLabelMap.CommonNew}"
style="buttontext"/></container>
+ <include-form
name="ListBillingAccounts"
location="component://accounting/widget/BillingAccountForms.xml"/>
+ </widgets>
+ </section>
</widgets>
<fail-widgets>
- <container><link
target="EditBillingAccount?partyId=${parameters.partyId}&roleTypeId=BILL_TO_CUSTOMER"
text="${uiLabelMap.CommonNew} " style="buttontext"/></container>
+ <section>
+ <actions>
+ <entity-condition
entity-name="BillingAccountAndRole" list-name="billingAccounts">
+ <condition-expr
field-name="partyId" env-name="parameters.partyId"/>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <container><link
target="EditBillingAccount?partyId=${parameters.partyId}&roleTypeId=BILL_TO_CUSTOMER"
text="${uiLabelMap.CommonNew} " style="buttontext"/></container>
+ <include-form
name="ListBillingAccountsByParty"
location="component://accounting/widget/BillingAccountForms.xml"/>
+ </widgets>
+ </section>
</fail-widgets>
</section>
- <include-form name="ListBillingAccounts"
location="component://accounting/widget/BillingAccountForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
