diff --git a/Logic/Support/Document.cs b/Logic/Support/Document.cs index 2079499c..bb2f4d0d 100644 --- a/Logic/Support/Document.cs +++ b/Logic/Support/Document.cs @@ -147,7 +147,6 @@ namespace Swarmops.Logic.Support .SetDocumentForeignObject (Identity, GetDocumentTypeForObject (foreignObject), foreignObject.Identity); } - public void Delete() { // Unlink, actually @@ -166,5 +165,18 @@ namespace Swarmops.Logic.Support { return GetReader (Encoding.GetEncoding (encodingCodePage)); } + + public Person UploadedByPerson + { + get + { + if (base.UploadedByPersonId > 0) + { + return Person.FromIdentity (base.UploadedByPersonId); + } + + return null; + } + } } } \ No newline at end of file diff --git a/Site5/App_GlobalResources/Global.resx b/Site5/App_GlobalResources/Global.resx index 3ec892d5..25525235 100644 --- a/Site5/App_GlobalResources/Global.resx +++ b/Site5/App_GlobalResources/Global.resx @@ -172,7 +172,7 @@ Expense - Expense #{0} + Expense #{0:N0} Expenses {0} @@ -337,10 +337,10 @@ List of shortcuts to related actions to current one - Expense #{0} (minus advance #{1}) + Expense #{0:N0} (minus advance #{1:N0}) - Expense #{0} (minus advances) + Expense #{0:N0} (minus advances) Expenses {0} (minus advance #{1}) @@ -349,10 +349,10 @@ Expenses {0} (minus advances) - Expense Claim #{0} by {1} + Expense Claim #{0:N0} by {1} - Inbound Invoice #{0} from {1} + Inbound Invoice #{0:N0} from {1} Receipt Image {0} of {1} @@ -580,4 +580,29 @@ define to enable shown as watermark on some edit boxes + + Cash Advance #{0:N0} for {1} + + + Cash Advance #{0:N0} Payback + + + Cash Advances {0} Payback + + + Cash Advances {0} for {1} + + + Expense Claim #{0:N0} + + + Expense Claims {0} by {1} + + + Inbound Invoice #{0:N0} + + + System + as in "Created by: System" for roles, transactions etc. + \ No newline at end of file diff --git a/Site5/App_GlobalResources/Pages.Ledgers.resx b/Site5/App_GlobalResources/Pages.Ledgers.resx index 8d2bf339..7508388d 100644 --- a/Site5/App_GlobalResources/Pages.Ledgers.resx +++ b/Site5/App_GlobalResources/Pages.Ledgers.resx @@ -625,6 +625,32 @@ Logged - Transaction is <span class="spanAnnoyingBlink">UNBALANCED</span>: + Transaction is <span class="spanAnnoyingBlink">UNBALANCED:</span> missing amount + + + Add rows to transaction + (you can't really edit a transaction, just add more rows to it) + + + Autotransaction tracking details + (this means the transaction is locked from editing) + + + Attested by {0} on {1:yyyy-MMM-dd} + + + combined with + Inserted between transaction causes. + + + <strong>Inbound Invoice #{0:N0}</strong> from {1}: + the {1} is the supplier name + + + This is <strong>Payout #{0:N0}.</strong> It's a payout for + + + Document validation by {0} on {1:yyyy-MMM-dd} + "Document" refers to receipts, invoices, etc. \ No newline at end of file diff --git a/Site5/Pages/v5/Ledgers/InspectLedgers.aspx b/Site5/Pages/v5/Ledgers/InspectLedgers.aspx index 6bde59ab..5ef3f4fd 100644 --- a/Site5/Pages/v5/Ledgers/InspectLedgers.aspx +++ b/Site5/Pages/v5/Ledgers/InspectLedgers.aspx @@ -46,7 +46,10 @@ }); $('#gridTransaction').datagrid({ - onLoadSuccess: function() {} + onLoadSuccess: function() { + $('#gridTransaction').datagrid('resize'); + + } }); $('#<%=DropYears.ClientID %>').change(function () { @@ -66,8 +69,6 @@ } }); - - $('div.datagrid').css('opacity', 0.4); }); @@ -99,13 +100,46 @@ $('#divModalCover').fadeIn(); $('#gridTransaction').datagrid({ url: 'Json-InspectLedgerTxData.aspx?TxId=' + transactionId }); + + var jsonData = {}; + jsonData.txId = transactionId; + + $.ajax({ + type: "POST", + url: "/Pages/v5/Ledgers/InspectLedgers.aspx/GetTransactionTracking", + data: $.toJSON(jsonData), + contentType: "application/json; charset=utf-8", + dataType: "json", + success: function (msg) { + if (msg.d.length > 1) { + $('#divTransactionTrackingDetails').html(msg.d); + $('#divTransactionTrackingDetails').show(); + $('#divEditTransaction').hide(); + } else { + $('#divTransactionTrackingDetails').hide(); + $('#divEditTransaction').show(); + } + }, + error: function (msg) { + alertify.error("<%= Resources.Global.Error_AjaxCallException %>"); + } + }); + } + + function onTransactionTrackingLoaded(data) { + console.log(data); } function onFlagTransaction(transactionId) { alertify.log(''); - } + // the variables below only handle the cosmetics and not actual access + var canSeeDetail = ; + var canWriteRows = ; + var canAuditTx = ; + + @@ -167,25 +201,34 @@