From 00a14954ebd67d348260133faa91a6a57dd6db40 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Mon, 5 Mar 2018 18:16:58 +0100 Subject: [PATCH] transaction.Identity => transaction.OrganizationSequenceId --- .../ha-HG/Controls.Swarm.ha-HG.resx | 144 ------- .../ha-HG/Global.ha-HG.resx | 369 ----------------- .../ha-HG/Menu5.ha-HG.resx | 229 ----------- .../ha-HG/Pages.Admin.ha-HG.resx | 198 ---------- .../ha-HG/Pages.Comms.ha-HG.resx | 136 ------- .../ha-HG/Pages.Financial.ha-HG.resx | 298 -------------- .../ha-HG/Pages.Governance.ha-HG.resx | 197 ---------- .../ha-HG/Pages.Ledgers.ha-HG.resx | 370 ------------------ .../ha-HG/Pages.Public.ha-HG.resx | 166 -------- .../ha-HG/Pages.Security.ha-HG.resx | 173 -------- .../ha-HG/Pages.Swarm.ha-HG.resx | 144 ------- .../v5/Ledgers/Json-GeneralLedgerData.aspx.cs | 2 +- .../v5/Ledgers/Json-VatReportData.aspx.cs | 2 +- 13 files changed, 2 insertions(+), 2426 deletions(-) delete mode 100644 Site/App_GlobalResources/ha-HG/Controls.Swarm.ha-HG.resx delete mode 100644 Site/App_GlobalResources/ha-HG/Global.ha-HG.resx delete mode 100644 Site/App_GlobalResources/ha-HG/Menu5.ha-HG.resx delete mode 100644 Site/App_GlobalResources/ha-HG/Pages.Admin.ha-HG.resx delete mode 100644 Site/App_GlobalResources/ha-HG/Pages.Comms.ha-HG.resx delete mode 100644 Site/App_GlobalResources/ha-HG/Pages.Financial.ha-HG.resx delete mode 100644 Site/App_GlobalResources/ha-HG/Pages.Governance.ha-HG.resx delete mode 100644 Site/App_GlobalResources/ha-HG/Pages.Ledgers.ha-HG.resx delete mode 100644 Site/App_GlobalResources/ha-HG/Pages.Public.ha-HG.resx delete mode 100644 Site/App_GlobalResources/ha-HG/Pages.Security.ha-HG.resx delete mode 100644 Site/App_GlobalResources/ha-HG/Pages.Swarm.ha-HG.resx diff --git a/Site/App_GlobalResources/ha-HG/Controls.Swarm.ha-HG.resx b/Site/App_GlobalResources/ha-HG/Controls.Swarm.ha-HG.resx deleted file mode 100644 index 630ecac4..00000000 --- a/Site/App_GlobalResources/ha-HG/Controls.Swarm.ha-HG.resx +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Site/App_GlobalResources/ha-HG/Global.ha-HG.resx b/Site/App_GlobalResources/ha-HG/Global.ha-HG.resx deleted file mode 100644 index 13c02a4c..00000000 --- a/Site/App_GlobalResources/ha-HG/Global.ha-HG.resx +++ /dev/null @@ -1,369 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Site/App_GlobalResources/ha-HG/Menu5.ha-HG.resx b/Site/App_GlobalResources/ha-HG/Menu5.ha-HG.resx deleted file mode 100644 index 32c43397..00000000 --- a/Site/App_GlobalResources/ha-HG/Menu5.ha-HG.resx +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Site/App_GlobalResources/ha-HG/Pages.Admin.ha-HG.resx b/Site/App_GlobalResources/ha-HG/Pages.Admin.ha-HG.resx deleted file mode 100644 index 0429d551..00000000 --- a/Site/App_GlobalResources/ha-HG/Pages.Admin.ha-HG.resx +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Site/App_GlobalResources/ha-HG/Pages.Comms.ha-HG.resx b/Site/App_GlobalResources/ha-HG/Pages.Comms.ha-HG.resx deleted file mode 100644 index d7b3bb68..00000000 --- a/Site/App_GlobalResources/ha-HG/Pages.Comms.ha-HG.resx +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - - - - - - - - - - - diff --git a/Site/App_GlobalResources/ha-HG/Pages.Financial.ha-HG.resx b/Site/App_GlobalResources/ha-HG/Pages.Financial.ha-HG.resx deleted file mode 100644 index e9f4c26f..00000000 --- a/Site/App_GlobalResources/ha-HG/Pages.Financial.ha-HG.resx +++ /dev/null @@ -1,298 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Site/App_GlobalResources/ha-HG/Pages.Governance.ha-HG.resx b/Site/App_GlobalResources/ha-HG/Pages.Governance.ha-HG.resx deleted file mode 100644 index 2ca21191..00000000 --- a/Site/App_GlobalResources/ha-HG/Pages.Governance.ha-HG.resx +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Site/App_GlobalResources/ha-HG/Pages.Ledgers.ha-HG.resx b/Site/App_GlobalResources/ha-HG/Pages.Ledgers.ha-HG.resx deleted file mode 100644 index 63e365df..00000000 --- a/Site/App_GlobalResources/ha-HG/Pages.Ledgers.ha-HG.resx +++ /dev/null @@ -1,370 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Site/App_GlobalResources/ha-HG/Pages.Public.ha-HG.resx b/Site/App_GlobalResources/ha-HG/Pages.Public.ha-HG.resx deleted file mode 100644 index 71d741ae..00000000 --- a/Site/App_GlobalResources/ha-HG/Pages.Public.ha-HG.resx +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Site/App_GlobalResources/ha-HG/Pages.Security.ha-HG.resx b/Site/App_GlobalResources/ha-HG/Pages.Security.ha-HG.resx deleted file mode 100644 index eb104a2e..00000000 --- a/Site/App_GlobalResources/ha-HG/Pages.Security.ha-HG.resx +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Site/App_GlobalResources/ha-HG/Pages.Swarm.ha-HG.resx b/Site/App_GlobalResources/ha-HG/Pages.Swarm.ha-HG.resx deleted file mode 100644 index 630ecac4..00000000 --- a/Site/App_GlobalResources/ha-HG/Pages.Swarm.ha-HG.resx +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Site/Pages/v5/Ledgers/Json-GeneralLedgerData.aspx.cs b/Site/Pages/v5/Ledgers/Json-GeneralLedgerData.aspx.cs index 52e0ebac..e7cb049e 100644 --- a/Site/Pages/v5/Ledgers/Json-GeneralLedgerData.aspx.cs +++ b/Site/Pages/v5/Ledgers/Json-GeneralLedgerData.aspx.cs @@ -131,7 +131,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers doc.Identity, doc.ClientFileName.Replace("\"", "'"), transaction.Identity); } - actionHtml = String.Format(hasDoxString, row.FinancialTransactionId.ToString(CultureInfo.InvariantCulture), documents[0].Identity, CurrentOrganization.Name + " - " + Resources.Global.Financial_GeneralLedger + " " + transaction.DateTime.ToShortDateString() + " - " + Resources.Global.Financial_TransactionIdShort + transaction.Identity.ToString("N0")) + "" + actionHtml + ""; + actionHtml = String.Format(hasDoxString, row.FinancialTransactionId.ToString(CultureInfo.InvariantCulture), documents[0].Identity, CurrentOrganization.Name + " - " + Resources.Global.Financial_GeneralLedger + " " + transaction.DateTime.ToShortDateString() + " - " + Resources.Global.Financial_TransactionIdShort + transaction.OrganizationSequenceId.ToString("N0")) + "" + actionHtml + ""; } result.Append("{" + String.Format( diff --git a/Site/Pages/v5/Ledgers/Json-VatReportData.aspx.cs b/Site/Pages/v5/Ledgers/Json-VatReportData.aspx.cs index c95f749f..b1a147e1 100644 --- a/Site/Pages/v5/Ledgers/Json-VatReportData.aspx.cs +++ b/Site/Pages/v5/Ledgers/Json-VatReportData.aspx.cs @@ -94,7 +94,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers if (documents.Count > 0) { - element += String.Format(",\"dox\":\"" + hasDoxString + "\"", transaction.Identity, documents[0].Identity, CurrentOrganization.Name + " - " + report.Description + " - " + Resources.Global.Financial_TransactionIdShort + " " + transaction.Identity.ToString("N0")); + element += String.Format(",\"dox\":\"" + hasDoxString + "\"", transaction.Identity, documents[0].Identity, CurrentOrganization.Name + " - " + report.Description + " - " + Resources.Global.Financial_TransactionIdShort + " " + transaction.OrganizationSequenceId.ToString("N0")); } if (include)