From f4f50fc25879d05b046f319a0a594013dd7b0936 Mon Sep 17 00:00:00 2001 From: Andy Howard Date: Mon, 3 Mar 2025 18:21:12 +0000 Subject: [PATCH] BusinessMgr 3.0.1.5 --- SacsStandardBase/Base/ReferenceData/SaCurrency.cs | 10 +++++----- .../ReferenceData/SbmReferenceDataMgr_Dbas-Currency.cs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SacsStandardBase/Base/ReferenceData/SaCurrency.cs b/SacsStandardBase/Base/ReferenceData/SaCurrency.cs index 2e5aa80..d35a1d5 100644 --- a/SacsStandardBase/Base/ReferenceData/SaCurrency.cs +++ b/SacsStandardBase/Base/ReferenceData/SaCurrency.cs @@ -48,7 +48,7 @@ namespace Sarand.Net.Standard.Base.ReferenceData public String Symbol { get; set; } = ""; public bool SuffixSymbol { get; set; } = false; public bool IncludeSpace { get; set; } = false; - public short Decimals { get; set; } = 0; + public ushort Decimals { get; set; } = 0; } //------------------------------------------------------------------- @@ -103,7 +103,7 @@ namespace Sarand.Net.Standard.Base.ReferenceData get { return data.IncludeSpace; } set { CheckChanged(data.IncludeSpace, value); data.IncludeSpace = value; } } - public short Decimals + public ushort Decimals { get { return data.Decimals; } set { CheckChanged(data.Decimals, value); data.Decimals = value; } @@ -172,9 +172,9 @@ namespace Sarand.Net.Standard.Base.ReferenceData { return FormatAmount(Symbol, SuffixSymbol, IncludeSpace, amount, Decimals); } - public static String FormatAmount (String symbol, bool suffix, bool includeSpace, decimal amount, short decimals) + public static String FormatAmount (String symbol, bool suffix, bool includeSpace, decimal amount, ushort decimals) { - String format = "N" + Math.Max(0, Math.Min(10, (int)decimals)); + String format = "N" + Math.Max(0, Math.Min(4, (int)decimals)); String amountFmt = amount.ToString(format); if (suffix) amountFmt += (includeSpace ? " " : "") + symbol; else amountFmt = symbol + (includeSpace ? " " : "") + amountFmt; @@ -235,7 +235,7 @@ namespace Sarand.Net.Standard.Base.ReferenceData get { return data.IncludeSpace; } set { data.IncludeSpace = value; } } - public short Decimals + public ushort Decimals { get { return data.Decimals; } set { data.Decimals = value; } diff --git a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Currency.cs b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Currency.cs index c691e3b..6aeff76 100644 --- a/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Currency.cs +++ b/SacsStandardDbas/Dbas/ReferenceData/SbmReferenceDataMgr_Dbas-Currency.cs @@ -214,7 +214,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData dbCurrency._Symbol = currency.Symbol; dbCurrency._Suffix = currency.SuffixSymbol; dbCurrency._IncSpace = currency.IncludeSpace; - dbCurrency._Decimals = currency.Decimals; + dbCurrency._Decimals = (short)currency.Decimals; // Common properties. /* dbCurrency._Notes = currency.Notes; @@ -242,7 +242,7 @@ namespace Sarand.Net.Standard.Dbas.ReferenceData currency.Symbol = dbCurrency._Symbol; currency.SuffixSymbol = dbCurrency._Suffix; currency.IncludeSpace = dbCurrency._IncSpace; - currency.Decimals = dbCurrency._Decimals; + currency.Decimals = (ushort)dbCurrency._Decimals; // Common properties. /* currency.Notes = dbCurrency._Notes;