diff --git a/Site/App_GlobalResources/Pages.Ledgers.designer.cs b/Site/App_GlobalResources/Pages.Ledgers.designer.cs index 41169126..b601920e 100644 --- a/Site/App_GlobalResources/Pages.Ledgers.designer.cs +++ b/Site/App_GlobalResources/Pages.Ledgers.designer.cs @@ -699,6 +699,15 @@ namespace Resources.Pages { } } + /// + /// Looks up a localized string similar to Direct-debit purchase amount ({0}). + /// + internal static string BalanceTransactions_ModalDialog_DescribePurchaseAmount { + get { + return ResourceManager.GetString("BalanceTransactions_ModalDialog_DescribePurchaseAmount", resourceCulture); + } + } + /// /// Looks up a localized string similar to Charge purchase to this budget. /// diff --git a/Site/App_GlobalResources/Pages.Ledgers.resx b/Site/App_GlobalResources/Pages.Ledgers.resx index b5aeb387..7b410e9b 100644 --- a/Site/App_GlobalResources/Pages.Ledgers.resx +++ b/Site/App_GlobalResources/Pages.Ledgers.resx @@ -932,6 +932,10 @@ Mark as Direct Purchase + + Direct-debit purchase amount ({0}) + {0} is the currency + Charge purchase to this budget diff --git a/Site/Pages/v5/Ledgers/BalanceTransactions.aspx b/Site/Pages/v5/Ledgers/BalanceTransactions.aspx index 93f1ea9e..03d254d6 100644 --- a/Site/Pages/v5/Ledgers/BalanceTransactions.aspx +++ b/Site/Pages/v5/Ledgers/BalanceTransactions.aspx @@ -70,6 +70,7 @@ $('#spanTransactionUnbalancedBy').text(data.DifferingAmount); $('span#spanModalTransactionDate').text(data.TransactionDate); $('input#inputTextPurchaseDescription').val(data.TransactionDescription); + $('input#inputTextPurchaseAmount').val(data.DifferingAmount.substring(1)); // removes the leading minus sign if (data.OpenPayoutData == null) // amount is positive { @@ -348,6 +349,7 @@

+
@@ -355,6 +357,7 @@
+
diff --git a/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.cs b/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.cs index c8fab1df..efd58ddb 100644 --- a/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.cs +++ b/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.cs @@ -59,6 +59,9 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers Resources.Pages.Ledgers.BalanceTransactions_ModalDialog_DescribePurchaseVat; this.LabelDescribePurchaseUploadReceipt.Text = Resources.Pages.Ledgers.BalanceTransactions_ModalDialog_DescribePurchaseDocUpload; + this.LabelDescribePurchaseAmount.Text = + String.Format(Resources.Pages.Ledgers.BalanceTransactions_ModalDialog_DescribePurchaseAmount, + CurrentOrganization.Currency.DisplayCode); this.LabelRadioPayout.Text = Resources.Pages.Ledgers.BalanceTransactions_ModalDialog_RadioPayout; this.LabelRadioPayoutForeign.Text = diff --git a/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.designer.cs b/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.designer.cs index 9f7bd3bd..d2d43520 100644 --- a/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.designer.cs +++ b/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.designer.cs @@ -246,6 +246,15 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers { /// protected global::Swarmops.Controls.Base.FileUpload UploadPurchase; + /// + /// LabelDescribePurchaseAmount control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label LabelDescribePurchaseAmount; + /// /// LabelDescribePurchaseBudget control. ///