diff --git a/Logic/Financial/Salaries.cs b/Logic/Financial/Salaries.cs
index 87c9bc8d..a9103dc9 100644
--- a/Logic/Financial/Salaries.cs
+++ b/Logic/Financial/Salaries.cs
@@ -120,6 +120,7 @@ namespace Swarmops.Logic.Financial
{
string monthName = new DateTime (year, monthNumber, 1).ToString ("MMM",
new CultureInfo (person.PreferredCulture));
+ monthName = monthName.Substring (0, 3); // believe it or not some .Net localizations don't respect the three letter limit
string lineItem = " " + monthName;
if (personSalaryLookup[personId].ContainsKey (monthNumber) && personSalaryLookup[personId][monthNumber].GrossSalaryCents > 0)
@@ -152,10 +153,13 @@ namespace Swarmops.Logic.Financial
customStrings["NetSalaryTotal"] = String.Format("{0:10,N2}", netTotal / 100.0);
customStrings["TaxAdditiveTotalUnpadded"] = String.Format("{0:N2}", addTaxTotal / 100.0);
- // Send notification
+ // Send notification if gross is nonzero
- OutboundComm.CreateNotification (organization, NotificationResource.Salary_LastYearSummary,
- notificationStrings, customStrings, People.FromSingle (Person.FromIdentity (1)));
+ if (grossTotal > 0)
+ {
+ OutboundComm.CreateNotification (organization, NotificationResource.Salary_LastYearSummary,
+ notificationStrings, customStrings, People.FromSingle (Person.FromIdentity (1)));
+ }
}
}
}
diff --git a/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.resx b/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.resx
index 2cbb840f..eb643cf0 100644
--- a/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.resx
+++ b/Logic/Resources/Logic.Communications.Transmission.NotificationPayload.resx
@@ -397,7 +397,7 @@ Month Gross Deducted Net Paid using
TOTAL [GrossSalaryTotal] [TaxDeductedTotal] [NetSalaryTotal]
-In addition, [CurrencyCode] [TaxAdditiveTotalUnpadded] have been paid in taxes by the organization for your employment. This is also a tax on your salary, even if its nature as such has been bureaucratically concealed.
+In addition, [CurrencyCode] [TaxAdditiveTotalUnpadded] have been paid in taxes by the organization for your employment, in addition to the amount deducted above. This is also a tax on your salary, even if its nature as such has been bureaucratically concealed.
Note the hard spacing - maintain character count to align columns and elements in a monospace font rendering.