You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/07/19 15:31:35 UTC
svn commit: r795538 - in /ofbiz/trunk/applications/accounting:
webapp/accounting/invoice/InvoiceForms.xml
webapp/accounting/payment/PaymentForms.xml widget/PaymentScreens.xml
Author: hansbak
Date: Sun Jul 19 13:31:34 2009
New Revision: 795538
URL: http://svn.apache.org/viewvc?rev=795538&view=rev
Log:
show transactions also on the payment using the form from invoice
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?rev=795538&r1=795537&r2=795538&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Sun Jul 19 13:31:34 2009
@@ -212,6 +212,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<auto-fields-entity entity-name="AcctgTransAndEntries" default-field-type="display"/>
<field name="invoiceId"><hidden/></field>
+ <field name="paymentId"><hyperlink target="paymentOverview?paymentId=${paymentId}" description="${paymentId}"/></field>
<field name="amount"><display type="currency" currency="${currencyUomId}"/></field>
<field name="origAmount"><display type="currency" currency="${origCurrencyUomId}"/></field>
<field name="acctgTransId"><hyperlink description="${acctgTransId}" target="EditAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}"/></field>
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml?rev=795538&r1=795537&r2=795538&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Sun Jul 19 13:31:34 2009
@@ -456,16 +456,9 @@
<field name="amountApplied"><display type="currency" currency="${payment.currencyUomId}"/></field>
</form>
- <form name="AcctgTransAndEntries" type="list" list-name="AcctgTransAndEntries"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <actions>
- <entity-condition entity-name="AcctgTransAndEntries">
- <condition-expr field-name="paymentId" from-field="paymentId"/>
- <order-by field-name="acctgTransEntrySeqId"/>
- </entity-condition>
- </actions>
- <auto-fields-entity entity-name="AcctgTransAndEntries" default-field-type="display"/>
+ <form name="AcctgTransAndEntries" type="list" list-name="AcctgTransAndEntries" extends="AcctgTransAndEntries" extends-resource="component://accounting/webapp/accounting/invoice/InvoiceForms.xml">
<field name="paymentId"><hidden/></field>
+ <field name="invoiceId"><hyperlink target="invoiceOverview?invoiceId=${invoiceId}" description="${invoiceId}"/></field>
</form>
<form name="ListChecksToPrint" type="multi" list-name="payments" target="printChecks" separate-columns="true"
Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=795538&r1=795537&r2=795538&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Sun Jul 19 13:31:34 2009
@@ -327,6 +327,10 @@
<entity-one entity-name="Payment" value-field="payment"/>
<set field="appliedAmount" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentApplied(payment).toString()}"/>
<set field="notAppliedAmount" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment).toString()}"/>
+ <entity-condition entity-name="AcctgTransAndEntries" list="AcctgTransAndEntries">
+ <condition-expr field-name="paymentId" from-field="paymentId"/>
+ <order-by field-name="acctgTransEntrySeqId"/>
+ </entity-condition>
</actions>
<widgets>
<decorator-screen name="CommonPaymentDecorator" location="${parameters.mainDecoratorLocation}">
@@ -352,11 +356,10 @@
<include-form name="paymentApplications" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
</screenlet>
</container>
- <container style="screenlet clear">
- <screenlet title="${uiLabelMap.AccountingTransactions}" navigation-form-name="AcctgTransAndEntries">
- <include-form name="AcctgTransAndEntries" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
- </screenlet>
- </container>
+ <container style="clear"/>
+ <screenlet title="${uiLabelMap.AccountingTransactions}" navigation-form-name="AcctgTransAndEntries">
+ <include-form name="AcctgTransAndEntries" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+ </screenlet>
</widgets>
<fail-widgets>
<container style="lefthalf">
@@ -369,11 +372,10 @@
<include-form name="paymentApplications" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
</screenlet>
</container>
- <container style="screenlet clear">
- <screenlet title="${uiLabelMap.AccountingTransactions}" navigation-form-name="AcctgTransAndEntries">
- <include-form name="AcctgTransAndEntries" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
- </screenlet>
- </container>
+ <container style="clear"/>
+ <screenlet title="${uiLabelMap.AccountingTransactions}" navigation-form-name="AcctgTransAndEntries">
+ <include-form name="AcctgTransAndEntries" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
+ </screenlet>
</fail-widgets>
</section>
</decorator-section>