Goals: Improve remainder calculation when combined with other keywords (#1288)

packages/loot-core/src/server/budget/goaltemplates.ts

@@ -603,9 +603,16 @@ async function applyCategoryTemplate(
         break;
       }
       case 'remainder': {
-        to_budget = Math.round(remainder_scale * template.weight);
-        // can over budget with the rounding, so checking that
-        if (to_budget > budgetAvailable) to_budget = budgetAvailable;
+        if (remainder_scale >= 0) {
+          to_budget +=
+            remainder_scale === 0
+              ? Math.round(template.weight)
+              : Math.round(remainder_scale * template.weight);
+          // can over budget with the rounding, so checking that
+          if (to_budget >= budgetAvailable + budgeted) {
+            to_budget = budgetAvailable + budgeted;
+          }
+        }
         break;
       }
       case 'error':

upcoming-release-notes/1288.md

+---
+category: Bugfix
+authors: [shall0pass]
+---
+
+Goals: Improved calculation when 'remainder' keyword is used with other keywords in the same category.
\ No newline at end of file