Merge remote-tracking branch 'origin/frank' into kenric

prs.desktop/Panels/Invoices/ProgressClaim/ProgressClaimGrid.cs

@@ -203,10 +203,10 @@ public class ProgressClaimGrid : DynamicItemsListGrid<ProgressClaim>
             newItem.JobScope.CopyFrom(scope);
 
             var prev = Invoice.ID == Guid.Empty
-                ? InvoiceLines
+                ? InvoiceLines.Where(x => x.Scope.ID == scope.ID)
                 : InvoiceLines.Where(x => x.Scope.ID == scope.ID && x.InvoiceLink.Date < Invoice.Date);
                 
-            var current = InvoiceLines.Where(x => x.InvoiceLink.ID == Invoice.ID && x.Scope.ID == scope.ID);
+            var current = InvoiceLines.Where(x => x.Scope.ID == scope.ID && x.InvoiceLink.ID == Invoice.ID);
             
             
             newItem.PreviouslyClaimed = prev.Sum(x=>x.ExTax);

prs.desktop/prsdesktop.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Desktop"
-#define MyAppVersion "8.55.6"
+#define MyAppVersion "8.55.7"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSDesktop.exe"

prs.licensing/PRSLicensing.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Licensing"
-#define MyAppVersion "8.55.6"
+#define MyAppVersion "8.55.7"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSLicensing.exe"

prs.server/PRSServer.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Server"
-#define MyAppVersion "8.55.6"
+#define MyAppVersion "8.55.7"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSServer.exe"