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/16 13:00:23 UTC
svn commit: r794626 - in /ofbiz/trunk/applications/accounting:
webapp/accounting/payment/PaymentForms.xml widget/PaymentScreens.xml
Author: hansbak
Date: Thu Jul 16 11:00:22 2009
New Revision: 794626
URL: http://svn.apache.org/viewvc?rev=794626&view=rev
Log:
other adjustments on the currency setting of a payment
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
ofbiz/trunk/applications/accounting/widget/PaymentScreens.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=794626&r1=794625&r2=794626&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Thu Jul 16 11:00:22 2009
@@ -177,7 +177,7 @@
<entity-one entity-name="Party" value-field="partyFrom">
<field-map field-name="partyId" from-field="payment.partyIdFrom"/>
</entity-one>
- <set field="uomId" from-field="partyFrom.preferredCurrencyUomId" default-value="${defaultCurrencyUomId}"/>
+ <set field="payment.actualCurrencyUomId" from-field="partyFrom.preferredCurrencyUomId" default-value="${defaultCurrencyUomId}"/>
<entity-one entity-name="StatusItem" value-field="currentStatus">
<field-map field-name="statusId" from-field="payment.statusId"/>
</entity-one>
@@ -225,16 +225,16 @@
</field>
<field name="amount" position="1"><text/></field>
<field position="2" name="currencyUomId">
- <drop-down allow-empty="true" no-current-selected-key="${defaultCurrencyUomId}">
- <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
+ <drop-down allow-empty="false" no-current-selected-key="${defaultCurrencyUomId}">
+ <entity-options key-field-name="uomId" description="${description} - ${abbreviation}" entity-name="Uom">
<entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
- <entity-order-by field-name="abbreviation"/>
+ <entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
<field name="actualAmount" position="1" title="${uiLabelMap.AccountingActualCurrencyAmount}"><text/></field>
<field name="actualCurrencyUomId" position="2" title="${uiLabelMap.AccountingActualCurrencyUomId}">
- <drop-down allow-empty="true" no-current-selected-key="${defaultCurrencyUomId}">
+ <drop-down allow-empty="true">
<entity-options key-field-name="uomId" description="${description} - ${abbreviation}" entity-name="Uom">
<entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
<entity-order-by field-name="description"/>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=794626&r1=794625&r2=794626&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Thu Jul 16 11:00:22 2009
@@ -111,7 +111,6 @@
<entity-one entity-name="Payment" value-field="payment">
<field-map field-name="paymentId" from-field="parameters.paymentId"/>
</entity-one>
- <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
</actions>
<widgets>
<decorator-screen name="CommonPaymentDecorator" location="${parameters.mainDecoratorLocation}">