diff --git a/packages/loot-core/src/server/budget/goaltemplates.ts b/packages/loot-core/src/server/budget/goaltemplates.ts index fef46900f785e0e0149bdc4be647967c8a7b2760..e6d900a12995f49c00c0cb2d008c161830807b40 100644 --- a/packages/loot-core/src/server/budget/goaltemplates.ts +++ b/packages/loot-core/src/server/budget/goaltemplates.ts @@ -90,13 +90,14 @@ async function processTemplate(month, force) { // so the remainders don't get skiped if (remainder_found) lowestPriority = remainder_priority; + let sheetName = monthUtils.sheetForMonth(month); + let available_start = await getSheetValue(sheetName, `to-budget`); for (let priority = 0; priority <= lowestPriority; priority++) { // setup scaling for remainder let remainder_scale = 1; if (priority === lowestPriority) { - let sheetName = monthUtils.sheetForMonth(month); - let budgetAvailable = await getSheetValue(sheetName, `to-budget`); - remainder_scale = Math.round(budgetAvailable / remainder_weight_total); + let available_now = await getSheetValue(sheetName, `to-budget`); + remainder_scale = Math.round(available_now / remainder_weight_total); } for (let c = 0; c < categories.length; c++) { @@ -150,6 +151,7 @@ async function processTemplate(month, force) { month, priority, remainder_scale, + available_start, force, ); if (to_budget != null) { @@ -252,6 +254,7 @@ async function applyCategoryTemplate( month, priority, remainder_scale, + available_start, force, ) { let current_month = `${month}-01`; @@ -493,6 +496,8 @@ async function applyCategoryTemplate( let monthlyIncome = 0; if (template.category.toLowerCase() === 'all income') { monthlyIncome = await getSheetValue(sheetName, `total-income`); + } else if (template.category.toLowerCase() === 'available funds') { + monthlyIncome = available_start; } else { let income_category = (await db.getCategories()).find( c => diff --git a/upcoming-release-notes/1254.md b/upcoming-release-notes/1254.md new file mode 100644 index 0000000000000000000000000000000000000000..084e6827e5ccd313b3faccd70fe7725fdb135ee4 --- /dev/null +++ b/upcoming-release-notes/1254.md @@ -0,0 +1,6 @@ +--- +category: Enhancements +authors: [youngcw] +--- + +Goals: Add 'available funds' option to the percentage goal