diff --git a/Site/Master-v5.master b/Site/Master-v5.master index 6ce93946..39fa5475 100644 --- a/Site/Master-v5.master +++ b/Site/Master-v5.master @@ -227,7 +227,7 @@
-
<%= (CurrentOrganization.GetProfitLossCents() / 100.0 + 0.001).ToString(CultureInfo.InvariantCulture) %>
Profit To Date XYZ
+
<%= (CurrentOrganization.GetProfitLossCents() / 100.0 + 0.001).ToString(CultureInfo.InvariantCulture) %>
Profit To Date XYZ <%=DateTime.UtcNow.Year %>
diff --git a/Site/Master-v5.master.designer.cs b/Site/Master-v5.master.designer.cs index cec64c09..18f82154 100644 --- a/Site/Master-v5.master.designer.cs +++ b/Site/Master-v5.master.designer.cs @@ -183,6 +183,15 @@ namespace Swarmops.Frontend { /// protected global::System.Web.UI.WebControls.Label LabelPageTitle; + /// + /// MasterLabelDashboardProfitLoss control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label MasterLabelDashboardProfitLoss; + /// /// PlaceHolderMain control. /// @@ -596,7 +605,7 @@ namespace Swarmops.Frontend { /// To modify move field declaration from designer file to code-behind file. /// protected global::Swarmops.Frontend.Controls.Base.ModalDialog ModalMasterEnableBitId; - + /// /// MasterLabelBitIdRegisterHeader control. /// @@ -605,6 +614,5 @@ namespace Swarmops.Frontend { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label MasterLabelBitIdRegisterHeader; - protected global::System.Web.UI.WebControls.Label MasterLabelDashboardProfitLoss; } } diff --git a/Site/Pages/v5/Ledgers/Json-BalanceSheetDataSimplified.aspx.cs b/Site/Pages/v5/Ledgers/Json-BalanceSheetDataSimplified.aspx.cs index 68c54be5..5473508b 100644 --- a/Site/Pages/v5/Ledgers/Json-BalanceSheetDataSimplified.aspx.cs +++ b/Site/Pages/v5/Ledgers/Json-BalanceSheetDataSimplified.aspx.cs @@ -74,7 +74,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers line2 += string.Format(CultureInfo.CurrentCulture, ",\"liabilities\":\"{0:N0}\"", (_totals.AssetsCents-_totals.LiabilitiesCents) / 100.0); - return "[{" + line1 + "},{" + line2 + "}]"; + return "{" + line1 + "},{" + line2 + "}"; } else { @@ -83,7 +83,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers line2 += string.Format(CultureInfo.CurrentCulture, ",\"assets\":\"{0:N0}\"", (_totals.LiabilitiesCents - _totals.AssetsCents) / 100.0); - return "[{" + line1 + "},{" + line2 + "}]"; + return "{" + line1 + "},{" + line2 + "}"; } } diff --git a/Site/Security/Login.aspx.cs b/Site/Security/Login.aspx.cs index 2bce1668..df650f73 100644 --- a/Site/Security/Login.aspx.cs +++ b/Site/Security/Login.aspx.cs @@ -95,7 +95,7 @@ namespace Swarmops.Pages.Security { DashboardMessage.Set (String.Format(Resources.Pages.Security.Login_AsOpenLedgers, organizationOpenLedgers.Name)); FormsAuthentication.SetAuthCookie(Authority.FromLogin (Person.FromIdentity (Person.OpenLedgersIdentity), organizationOpenLedgers).ToEncryptedXml(), true); - Response.Redirect (@"/Ledgers/BalanceSheet"); + Response.Redirect (@"/Ledgers/Balance"); } // Check for SSL and force it