Author: hansbak
Date: Mon Sep 15 06:26:01 2008
New Revision: 695467
URL: http://svn.apache.org/viewvc?rev=695467&view=rev
Log:
include more links in the accounting paymentscreens, set currency defaylt to
partyId currency preferences texual enhancements
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
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=695467&r1=695466&r2=695467&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
Mon Sep 15 06:26:01 2008
@@ -53,7 +53,7 @@
<service service-name="performFind" result-map-name="result"
result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
<field-map field-name="entityName" value="Payment"/>
- <field-map field-name="orderBy" value="effectiveDate"/>
+ <field-map field-name="orderBy" value="effectiveDate DESC"/>
</service>
</actions>
<row-actions>
@@ -67,8 +67,16 @@
<field name="paymentTypeId"><display-entity entity-name="PaymentType"
description="${description}"/></field>
<field name="statusId"><display-entity
entity-name="StatusItem"/></field>
<field name="comments"><display/></field>
- <field name="partyIdFrom"><display-entity entity-name="PartyNameView"
key-field-name="partyId"
description="${groupName}${lastName},${firstName}[${partyId}]"/></field>
- <field name="partyIdTo"><display-entity entity-name="PartyNameView"
key-field-name="partyId"
description="${groupName}${lastName},${firstName}[${partyId}]"/></field>
+ <field name="partyIdFrom">
+ <display-entity entity-name="PartyNameView"
key-field-name="partyId" description="${groupName}${lastName},${firstName}">
+ <sub-hyperlink
target="/partymgr/control/viewprofile?partyId=${partyIdFrom}"
target-type="inter-app" description="[${partyIdFrom}]" />
+ </display-entity>
+ </field>
+ <field name="partyIdTo">
+ <display-entity entity-name="PartyNameView"
key-field-name="partyId" description="${groupName}${lastName},${firstName}">
+ <sub-hyperlink
target="/partymgr/control/viewprofile?partyId=${partyIdTo}"
target-type="inter-app" description="[${partyIdTo}]" />
+ </display-entity>
+ </field>
<field name="effectiveDate"><display/></field>
<field name="currencyUomId"><hidden/></field>
<field name="amount"><display also-hidden="false" type="currency"
currency="${currencyUomId}"/></field>
@@ -154,9 +162,12 @@
</field>
</form>
- <form name="EditPayment" type="single" target="updatePayment"
default-map-name="payment"
- header-row-style="header-row" default-table-style="basic-table">
+ <form name="EditPayment" type="single" target="updatePayment"
default-map-name="payment">
<actions>
+ <entity-one entity-name="Party" value-name="partyFrom">
+ <field-map field-name="partyId"
env-name="payment.partyIdFrom"/>
+ </entity-one>
+ <set field="uomId"
from-field="partyFrom.preferredCurrencyUomId"
default-value="${defaultCurrencyUomId}"/>
<entity-one entity-name="StatusItem" value-name="currentStatus">
<field-map field-name="statusId" env-name="payment.statusId"/>
</entity-one>
@@ -193,6 +204,8 @@
</entity-options>
</drop-down>
</field>
+ <field name="partyIdFrom" position="1"><lookup
target-form-name="LookupPartyName"/></field>
+ <field name="partyIdTo" position="1"><lookup
target-form-name="LookupPartyName"/></field>
<field name="roleTypeIdTo" position="2">
<drop-down allow-empty="true">
<entity-options key-field-name="roleTypeId"
description="${description}" entity-name="RoleType">
@@ -200,8 +213,6 @@
</entity-options>
</drop-down>
</field>
- <field name="partyIdFrom" position="1"><lookup
target-form-name="LookupPartyName"/></field>
- <field name="partyIdTo" position="2"><lookup
target-form-name="LookupPartyName"/></field>
<field name="amount" position="1"><text/></field>
<field position="2" name="currencyUomId">
<drop-down allow-empty="true"
no-current-selected-key="${defaultCurrencyUomId}">
@@ -213,7 +224,7 @@
</field>
<field name="actualAmount" position="1"
title="${uiLabelMap.AccountingActualCurrencyAmount}"><text/></field>
<field position="2" name="actualCurrencyUomId"
title="${uiLabelMap.AccountingActualCurrencyUomId}">
- <drop-down allow-empty="true"
no-current-selected-key="${defaultCurrencyUomId}">
+ <drop-down allow-empty="true" no-current-selected-key="${uomId}">
<entity-options key-field-name="uomId"
description="${abbreviation} - ${description}" entity-name="Uom">
<entity-constraint name="uomTypeId" operator="equals"
value="CURRENCY_MEASURE"/>
<entity-order-by field-name="abbreviation"/>
@@ -236,15 +247,12 @@
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="paymentApplicationId"><hidden/></field>
<field name="paymentId"><hidden/></field>
- <field name="invoiceId"><lookup
target-form-name="LookupInvoice"></lookup></field>
- <field name="invoiceItemSeqId">
- <drop-down allow-empty="true">
- <entity-options entity-name="InvoiceItem"
description="${invoiceItemSeqId}">
- <entity-constraint name="invoiceId" operator="equals"
value="${invoiceId}"/>
- <entity-order-by field-name="invoiceItemSeqId"/>
- </entity-options>
- </drop-down>
+ <field name="invoiceId">
+ <display-entity entity-name="Invoice"
description="${description}">
+ <sub-hyperlink
target="invoiceOverview?invoiceId=${invoiceId}" description="[${invoiceId}]"/>
+ </display-entity>
</field>
+ <field name="invoiceItemSeqId"><display/></field>
<field name="amountApplied"><text size="15"/></field>
<field name="updateButton" widget-style="buttontext"><submit
button-type="text-link"/></field>
<field name="removeButton" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
@@ -373,9 +381,8 @@
<field name="paymentRefNum" position="1"><display/></field>
<field name="paymentPreferenceId" position="2"><display/></field>
<field name="amount" position="1"><display type="currency"
currency="${payment.currencyUomId}"/></field>
- <field name="roleTypeIdTo" position="2"><display/></field>
- <field name="currencyUomId"><hidden/></field>
- <field name="effectiveDate" position="1"><display
description="${bsh:payment.getString("effectiveDate").substring(0,10)}"/></field>
+ <field name="actualCurrencyAmount" position="2"><display
type="currency" currency="${payment.actualCurrencyUomId}"/></field>
+ <field name="effectiveDate" position="1"><display type="date"/></field>
<field name="comments" position="2"><display/></field>
<!--field name="paymentGatewayResponseId" title="Paym Gatw Resp."
position="2"><display/></field-->
<field name="finAccountTransId" position="1"><display/></field>
