diff --git a/Site/Controls/v5/Base/DocumentDownloader.ascx b/Site/Controls/v5/Base/DocumentDownloader.ascx new file mode 100644 index 00000000..7fe9f24b --- /dev/null +++ b/Site/Controls/v5/Base/DocumentDownloader.ascx @@ -0,0 +1,11 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="DocumentDownloader.ascx.cs" CodeBehind="DocumentDownloader.ascx.cs" Inherits="Swarmops.Frontend.Controls.Base.DocumentDownloader" %> + + + + diff --git a/Site/Controls/v5/Base/DocumentDownloader.ascx.cs b/Site/Controls/v5/Base/DocumentDownloader.ascx.cs new file mode 100644 index 00000000..e8c93ad2 --- /dev/null +++ b/Site/Controls/v5/Base/DocumentDownloader.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace Swarmops.Frontend.Controls.Base +{ + public partial class DocumentDownloader : DataV5Base + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/Site/Controls/v5/Base/DocumentDownloader.ascx.designer.cs b/Site/Controls/v5/Base/DocumentDownloader.ascx.designer.cs new file mode 100644 index 00000000..18acbe63 --- /dev/null +++ b/Site/Controls/v5/Base/DocumentDownloader.ascx.designer.cs @@ -0,0 +1,15 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Swarmops.Frontend.Controls.Base { + + + public partial class DocumentDownloader { + } +} diff --git a/Site/Images/Icons/iconshock-download-240px.png b/Site/Images/Icons/iconshock-download-240px.png new file mode 100644 index 00000000..0d76fb65 Binary files /dev/null and b/Site/Images/Icons/iconshock-download-240px.png differ diff --git a/Site/Images/Icons/iconshock-download-96px.png b/Site/Images/Icons/iconshock-download-96px.png new file mode 100644 index 00000000..e1da1303 Binary files /dev/null and b/Site/Images/Icons/iconshock-download-96px.png differ diff --git a/Site/Images/Icons/iconshock-download-hot-240px.png b/Site/Images/Icons/iconshock-download-hot-240px.png new file mode 100644 index 00000000..eafa526d Binary files /dev/null and b/Site/Images/Icons/iconshock-download-hot-240px.png differ diff --git a/Site/Pages/v5/Ledgers/Json-VatReportData.aspx.cs b/Site/Pages/v5/Ledgers/Json-VatReportData.aspx.cs index 7112e349..8387f781 100644 --- a/Site/Pages/v5/Ledgers/Json-VatReportData.aspx.cs +++ b/Site/Pages/v5/Ledgers/Json-VatReportData.aspx.cs @@ -55,7 +55,8 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers List lines = new List(); string hasDoxString = - ""; + "" + + ""; foreach (VatReportItem item in items) { @@ -92,7 +93,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers if (transaction.Dependency != null || Documents.ForObject(transaction).Count > 0) { - element += String.Format(",\"dox\":\"" + hasDoxString + "\"", transaction.Identity); + element += String.Format(",\"dox\":\"" + hasDoxString + "\"", transaction.Identity, CurrentOrganization.Name + " - " + report.DescriptionShort + " - " + Resources.Global.Financial_TransactionIdShort + " " + transaction.Identity.ToString("N2")); } if (include) diff --git a/Site/Pages/v5/Ledgers/ViewVatReports.aspx b/Site/Pages/v5/Ledgers/ViewVatReports.aspx index 70d45e8e..81f13f62 100644 --- a/Site/Pages/v5/Ledgers/ViewVatReports.aspx +++ b/Site/Pages/v5/Ledgers/ViewVatReports.aspx @@ -3,6 +3,7 @@ +