diff --git a/Site/App_GlobalResources/Pages.Ledgers.designer.cs b/Site/App_GlobalResources/Pages.Ledgers.designer.cs index 06e184aa..46e5027a 100644 --- a/Site/App_GlobalResources/Pages.Ledgers.designer.cs +++ b/Site/App_GlobalResources/Pages.Ledgers.designer.cs @@ -745,7 +745,7 @@ namespace Resources.Pages { } /// - /// Looks up a localized string similar to Outbound Invoice #{0:N0} for {1}, due {2}: {3}. + /// Looks up a localized string similar to Outbound Invoice #{0:N0} for {1}, due {2:yyyy-MMM-dd}: {3}. /// internal static string BalanceTransactions_OutboundInvoiceMatch { get { diff --git a/Site/App_GlobalResources/Pages.Ledgers.resx b/Site/App_GlobalResources/Pages.Ledgers.resx index c7145f07..90f6523e 100644 --- a/Site/App_GlobalResources/Pages.Ledgers.resx +++ b/Site/App_GlobalResources/Pages.Ledgers.resx @@ -853,7 +853,7 @@ This is the header of a match where the transaction description somehow matches the invoice reference. - Outbound Invoice #{0:N0} for {1}, due {2}: {3} + Outbound Invoice #{0:N0} for {1}, due {2:yyyy-MMM-dd}: {3} Argument {0} is the invoice identity, {1} the customer name, {2} the due date and {3} the invoice-currencied amount (which can be different from the org's presentation currency) diff --git a/Site/Pages/v5/Financial/ListInvoicesInbound.aspx b/Site/Pages/v5/Financial/ListInvoicesInbound.aspx index 472d6ec7..7b40b5d1 100644 --- a/Site/Pages/v5/Financial/ListInvoicesInbound.aspx +++ b/Site/Pages/v5/Financial/ListInvoicesInbound.aspx @@ -32,6 +32,7 @@ '/Images/Icons/iconshock-balloon-undo-128x96px-hot.png' ]); + /* -- commented out -- do we need attestation logic for this page? loadUninitializedBudgets(); // no need to wait for doc.ready to load operating params SwarmopsJS.ajaxCall("/Pages/v5/Financial/AttestCosts.aspx/GetRemainingBudgets", {}, function(data) { @@ -44,50 +45,11 @@ } budgetRemainingLookup.budgetsLoaded = true; - }); + });*/ // Doc.ready: - $(document).ready(function () { - $('#TableAttestableCosts').datagrid( - { - rowStyler: function (index, rowData) { - if (rowData.previous != null) { - return { class: "rowPrevious row" + rowData.itemId }; - } - - if (rowData.itemId != null) { - return { class: "row" + rowData.itemId.replace(/\|/g, '') }; - } - - return ''; - }, - - onLoadSuccess: function () { - budgetRemainingLookup.attestabilityInitialized = false; - - $(".LocalViewDox").click(function () { - $("a.FancyBox_Gallery[rel='" + $(this).attr("baseid") + "']").first().click(); - }); - - $("a.FancyBox_Gallery").fancybox({ - 'overlayShow': true, - 'transitionIn': 'fade', - 'transitionOut': 'fade', - 'type': 'image', - 'opacity': true - }); - - // Check if budgets have been fetched, and if so, initialize attestability - - if (budgetRemainingLookup.budgetsLoaded == true) { - setAttestability(); - } - - budgetRemainingLookup.rowsLoaded = true; - } - } - ); + $(document).ready(function() { // we're still in document.ready