Author: jacopoc
Date: Wed Sep 12 06:08:35 2007
New Revision: 574935
URL:
http://svn.apache.org/viewvc?rev=574935&view=revLog:
Completed the conversion of billing account payment screen to widgets.
Removed:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/billingaccount/
ofbiz/trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountPayments.ftl
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?rev=574935&r1=574934&r2=574935&view=diff==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Wed Sep 12 06:08:35 2007
@@ -209,5 +209,24 @@
<field name="termValue" title="${uiLabelMap.PartyTermValue}"><text size="10"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+ <form name="ListBillingAccountPayments" type="list" list-name="payments" paginate-target="BillingAccountPayments">
+ <actions>
+ <entity-condition entity-name="PaymentAndApplication" list-name="payments">
+ <condition-expr field-name="billingAccountId" env-name="billingAccountId"/>
+ </entity-condition>
+ </actions>
+ <field name="paymentId" widget-style="buttontext">
+ <hyperlink description="${paymentId}" target="paymentOverview?paymentId=${paymentId}"/>
+ </field>
+ <field name="paymentMethodTypeId" title="${uiLabelMap.CommonType}">
+ <display-entity entity-name="PaymentMethodType" description="${description}"/>
+ </field>
+ <field name="invoiceId"><display/></field>
+ <field name="invoiceItemSeqId"><display/></field>
+ <field name="effectiveDate"><display/></field>
+ <field name="amount">
+ <display type="currency" currency="${currencyUomId}"/>
+ </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=574935&r1=574934&r2=574935&view=diff==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Wed Sep 12 06:08:35 2007
@@ -199,15 +199,14 @@
<set field="titleProperty" value="PageTitleEditBillingAccountPayments"/>
<set field="headerItem" value="billingaccount"/>
<set field="tabButtonItem" value="BillingAccountPayments"/>
-
- <script location="component://accounting/webapp/accounting/WEB-INF/actions/billingaccount/BillingAccountPayments.bsh"/>
+
+ <set field="billingAccountId" from-field="parameters.billingAccountId"/>
+ <entity-one entity-name="BillingAccount" value-name="billingAccount"/>
</actions>
<widgets>
<decorator-screen name="CommonBillingAccountDecorator">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://accounting/webapp/accounting/billingaccount/BillingAccountPayments.ftl"/></html>
- </platform-specific>
+ <include-form name="ListBillingAccountPayments" location="component://accounting/widget/BillingAccountForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Locked
