diff --git a/Logic/Financial/FinancialValidations.cs b/Logic/Financial/FinancialValidations.cs index 2e439392..b95afba6 100644 --- a/Logic/Financial/FinancialValidations.cs +++ b/Logic/Financial/FinancialValidations.cs @@ -38,6 +38,10 @@ namespace Swarmops.Logic.Financial { return FinancialDependencyType.Salary; } + if (foreignObject is CashAdvance) + { + return FinancialDependencyType.CashAdvance; + } throw new NotImplementedException ("Unknown dependency: " + foreignObject.GetType()); } diff --git a/Logic/Financial/Payout.cs b/Logic/Financial/Payout.cs index 6f3385cf..f9ddb6ce 100644 --- a/Logic/Financial/Payout.cs +++ b/Logic/Financial/Payout.cs @@ -264,6 +264,20 @@ namespace Swarmops.Logic.Financial } + public Person CreatedByPerson + { + get + { + if (base.CreatedByPersonId > 0) + { + return Person.FromIdentity (base.CreatedByPersonId); + } + + return null; + } + } + + public FinancialTransaction FinancialTransaction { get { return FinancialTransaction.FromDependency (this); } diff --git a/Site5/App_GlobalResources/Global.resx b/Site5/App_GlobalResources/Global.resx index 25525235..5e8cff34 100644 --- a/Site5/App_GlobalResources/Global.resx +++ b/Site5/App_GlobalResources/Global.resx @@ -605,4 +605,23 @@ System as in "Created by: System" for roles, transactions etc. + + Salaries {0} for {1:yyyy-MMM} + + + Salary Taxes for {0:yyyy-MMM} + + + Salary #{0:N0} for {1:yyyy-MMM} + + + Salary #{0:N0} for {1:yyyy-MMM} for {2} + 0 is identity, 1 is month, 2 is name + + + Salary #{0:N0} + + + Taxes for Salary #{0:N0} for {1:yyyy-MMM} + \ No newline at end of file diff --git a/Site5/App_GlobalResources/Pages.Ledgers.resx b/Site5/App_GlobalResources/Pages.Ledgers.resx index 7508388d..04bbb687 100644 --- a/Site5/App_GlobalResources/Pages.Ledgers.resx +++ b/Site5/App_GlobalResources/Pages.Ledgers.resx @@ -653,4 +653,12 @@ Document validation by {0} on {1:yyyy-MMM-dd} "Document" refers to receipts, invoices, etc. + + Executed by {0}. + As in "payout executed by": who actually paid the money? + + + Base salary {0} {1:N2}, gross adjustments {2:+N2;-N2;none}, gross salary {3:N2}, deducted tax {4:N2}, net adjustments {5:+N2;-N2;none}, payout {6:N2}. + The "none"s in the format strings need to be translated. + \ No newline at end of file diff --git a/Site5/Pages/v5/Ledgers/InspectLedgers.aspx b/Site5/Pages/v5/Ledgers/InspectLedgers.aspx index 5ef3f4fd..0f5aa798 100644 --- a/Site5/Pages/v5/Ledgers/InspectLedgers.aspx +++ b/Site5/Pages/v5/Ledgers/InspectLedgers.aspx @@ -3,6 +3,11 @@ + + + + +