You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2021/12/09 06:05:14 UTC
[ofbiz-framework] branch trunk updated: Fixed: Weird behaviour with currency symbols (OFBIZ-12443) (#400)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 25dc024 Fixed: Weird behaviour with currency symbols (OFBIZ-12443) (#400)
25dc024 is described below
commit 25dc02412dc4398d88d9c6041b3aa32195556526
Author: Pierre Smits <pi...@orrtiz.com>
AuthorDate: Thu Dec 9 07:05:05 2021 +0100
Fixed: Weird behaviour with currency symbols (OFBIZ-12443) (#400)
* Fixed: Weird behaviour with currency symbols (OFBIZ-12443)
In some screens the $ currency symbol is not showing well.
Modified:
FinAccountTrans.ftl - fixed a typo
FinAccountForms.xml: ensured that for the monetary amount fields (actualBalance and availableBalance) the correct currencyUomId value is taken
---
applications/accounting/template/finaccount/FinAccountTrans.ftl | 2 +-
applications/accounting/widget/FinAccountForms.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/applications/accounting/template/finaccount/FinAccountTrans.ftl b/applications/accounting/template/finaccount/FinAccountTrans.ftl
index f04fbb4..bdeeb52 100644
--- a/applications/accounting/template/finaccount/FinAccountTrans.ftl
+++ b/applications/accounting/template/finaccount/FinAccountTrans.ftl
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
-<assign accountCurrencyUomId = finAccount.currencyUomId/>
+<#assign accountCurrencyUomId = finAccount.currencyUomId/>
<#if finAccountTransList?has_content && parameters.noConditionFind?? && parameters.noConditionFind == 'Y'>
<#if !grandTotal??>
<div>
diff --git a/applications/accounting/widget/FinAccountForms.xml b/applications/accounting/widget/FinAccountForms.xml
index 11b32fd..9251434 100644
--- a/applications/accounting/widget/FinAccountForms.xml
+++ b/applications/accounting/widget/FinAccountForms.xml
@@ -116,8 +116,8 @@ under the License.
<field name="fromDate" title="${uiLabelMap.CommonFrom}"><display type="date-time"/></field>
<field name="thruDate" title="${uiLabelMap.CommonThru}"><display type="date-time"/></field>
<field name="replenishPaymentId"><display/></field>
- <field name="actualBalance"><display type="currency" currency="${currencyUomId}"/></field>
- <field name="availableBalance"><display type="currency" currency="${currencyUomId}"/></field>
+ <field name="actualBalance"><display type="currency" currency="${finAccount.currencyUomId}"/></field>
+ <field name="availableBalance"><display type="currency" currency="${finAccount.currencyUomId}"/></field>
</form>
<form name="EditFinAccount" type="single" target="updateFinAccount" default-map-name="finAccount"
header-row-style="header-row" default-table-style="basic-table">