@actual-app/api 25.1.0 → 25.2.0

package/dist/app/bundle.api.js

@@ -31418,9 +31418,13 @@
                 });
             }
             function importTransactions(accountId, transactions) {
+                var opts = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {
+                    defaultCleared: true
+                };
                 return send('api/transactions-import', {
                     accountId: accountId,
-                    transactions: transactions
+                    transactions: transactions,
+                    opts: opts
                 });
             }
             function getTransactions(accountId, startDate, endDate) {
@@ -33870,7 +33874,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
             // @ts-strict-ignore
-            /* eslint-disable import/no-unused-modules */ async function createPayee(description) {
+            async function createPayee(description) {
                 // Check to make sure no payee already exists with exactly the same
                 // name
                 const row = await _db__WEBPACK_IMPORTED_MODULE_0__.first(`SELECT id FROM payees WHERE UNICODE_LOWER(name) = ? AND tombstone = 0`, [
@@ -34014,10 +34018,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ rankRules: () => ( /* binding */rankRules)
                 /* harmony export */ 
             });
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isValid/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/parseISO/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subDays/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addDays/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isValid/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/parseISO/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subDays/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addDays/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addMonths/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subMonths/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addWeeks/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subWeeks/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addYears/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subYears/index.js");
             /* harmony import */ var handlebars__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! handlebars */ "./node_modules/handlebars/lib/index.js");
             /* harmony import */ var handlebars__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(handlebars__WEBPACK_IMPORTED_MODULE_0__);
             /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../shared/months */ "./packages/loot-core/src/shared/months.ts");
@@ -34037,8 +34047,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         return b.map(Number).reduce(fn, Number(a));
                     };
                 }
-                const helpers = {
-                    regex: (value, regex, replace) => {
+                function regexHelper(mapRegex, mapNonRegex, apply) {
+                    return (value, regex, replace) => {
                         if (value == null) {
                             return null;
                         }
@@ -34049,13 +34059,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         const match = regexTest.exec(regex);
                         // Regex is in format /regex/flags
                         if (match) {
-                            regexp = new RegExp(match[1], match[2]);
+                            regexp = mapRegex(match[1], match[2]);
                         }
                         else {
-                            regexp = new RegExp(regex);
+                            regexp = mapNonRegex(regex);
                         }
-                        return String(value).replace(regexp, replace);
-                    },
+                        return apply(String(value), regexp, replace);
+                    };
+                }
+                const helpers = {
+                    regex: regexHelper((regex, flags) => new RegExp(regex, flags), (value) => new RegExp(value), (value, regex, replace) => value.replace(regex, replace)),
+                    replace: regexHelper((regex, flags) => new RegExp(regex, flags), (value) => value, (value, regex, replace) => value.replace(regex, replace)),
+                    replaceAll: regexHelper((regex, flags) => new RegExp(regex, flags), (value) => value, (value, regex, replace) => value.replaceAll(regex, replace)),
                     add: mathHelper((a, b) => a + b),
                     sub: mathHelper((a, b) => a - b),
                     div: mathHelper((a, b) => a / b),
@@ -34072,9 +34087,56 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     month: (date) => date && (0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.format)(date, 'M'),
                     year: (date) => date && (0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.format)(date, 'yyyy'),
                     format: (date, f) => date && f && (0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.format)(date, f),
+                    addDays: (date, days) => {
+                        if (!days || !days)
+                            return date;
+                        return (0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.format)((0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.addDays)(date, days), 'yyyy-MM-dd');
+                    },
+                    subDays: (date, days) => {
+                        if (!days || !days)
+                            return date;
+                        return (0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.format)((0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.subDays)(date, days), 'yyyy-MM-dd');
+                    },
+                    addMonths: (date, months) => {
+                        if (!months || !months)
+                            return date;
+                        return (0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.format)((0, date_fns__WEBPACK_IMPORTED_MODULE_8__["default"])((0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.parseDate)(date), months), 'yyyy-MM-dd');
+                    },
+                    subMonths: (date, months) => {
+                        if (!months || !months)
+                            return date;
+                        return (0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.format)((0, date_fns__WEBPACK_IMPORTED_MODULE_9__["default"])((0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.parseDate)(date), months), 'yyyy-MM-dd');
+                    },
+                    addWeeks: (date, weeks) => {
+                        if (!weeks || !weeks)
+                            return date;
+                        return (0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.format)((0, date_fns__WEBPACK_IMPORTED_MODULE_10__["default"])((0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.parseDate)(date), weeks), 'yyyy-MM-dd');
+                    },
+                    subWeeks: (date, weeks) => {
+                        if (!weeks || !weeks)
+                            return date;
+                        return (0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.format)((0, date_fns__WEBPACK_IMPORTED_MODULE_11__["default"])((0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.parseDate)(date), weeks), 'yyyy-MM-dd');
+                    },
+                    addYears: (date, years) => {
+                        if (!years || !years)
+                            return date;
+                        return (0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.format)((0, date_fns__WEBPACK_IMPORTED_MODULE_12__["default"])((0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.parseDate)(date), years), 'yyyy-MM-dd');
+                    },
+                    subYears: (date, years) => {
+                        if (!years || !years)
+                            return date;
+                        return (0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.format)((0, date_fns__WEBPACK_IMPORTED_MODULE_13__["default"])((0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.parseDate)(date), years), 'yyyy-MM-dd');
+                    },
+                    setDay: (date, day) => {
+                        if (!date)
+                            return date;
+                        const actualDay = Number((0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.format)(date, 'd'));
+                        return (0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.format)((0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.addDays)(date, day - actualDay), 'yyyy-MM-dd');
+                    },
                     debug: (value) => {
                         console.log(value);
-                    }
+                    },
+                    concat: (...args) => args.slice(0, -1).join('')
                 };
                 for (const [name, fn] of Object.entries(helpers)) {
                     handlebars__WEBPACK_IMPORTED_MODULE_0__.registerHelper(name, fn);
@@ -34110,7 +34172,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 else if (str.length === 10) {
                     // YYYY-MM-DD
-                    if (!date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](str))) {
+                    if (!date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](str))) {
                         return null;
                     }
                     return {
@@ -34120,7 +34182,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 else if (str.length === 7) {
                     // YYYY-MM
-                    if (!date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](str + '-01'))) {
+                    if (!date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](str + '-01'))) {
                         return null;
                     }
                     return {
@@ -34130,7 +34192,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 else if (str.length === 4) {
                     // YYYY
-                    if (!date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](str + '-01-01'))) {
+                    if (!date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](str + '-01-01'))) {
                         return null;
                     }
                     return {
@@ -34284,13 +34346,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 eval(object) {
                     let fieldValue = object[this.field];
+                    const type = this.type;
+                    if (type === 'string') {
+                        fieldValue ??= '';
+                    }
                     if (fieldValue === undefined) {
                         return false;
                     }
                     if (typeof fieldValue === 'string') {
                         fieldValue = fieldValue.toLowerCase();
                     }
-                    const type = this.type;
                     if (type === 'number' && this.options) {
                         if (this.options.outflow) {
                             if (fieldValue > 0) {
@@ -34316,7 +34381,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                     const { schedule } = this.value;
                                     if (this.op === 'isapprox') {
                                         const fieldDate = (0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.parseDate)(fieldValue);
-                                        return schedule.occursBetween(date_fns__WEBPACK_IMPORTED_MODULE_10__["default"](fieldDate, 2), date_fns__WEBPACK_IMPORTED_MODULE_11__["default"](fieldDate, 2));
+                                        return schedule.occursBetween(date_fns__WEBPACK_IMPORTED_MODULE_16__["default"](fieldDate, 2), date_fns__WEBPACK_IMPORTED_MODULE_17__["default"](fieldDate, 2));
                                     }
                                     else {
                                         return schedule.occursOn({
@@ -34612,7 +34677,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         lastNonFixedTransactionIndex = Math.max(lastNonFixedTransactionIndex, splitTransactionIndex);
                     });
                     // The last remainder split will be adjusted for any leftovers from rounding.
-                    newTransactions[lastNonFixedTransactionIndex].amount -= getSplitRemainder(newTransactions);
+                    newTransactions[lastNonFixedTransactionIndex].amount += getSplitRemainder(newTransactions);
                 }
                 // The split index 0 (transaction index 1) is reserved for "Apply to all" actions.
                 // Remove that entry from the transaction list.
@@ -35252,7 +35317,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 });
             }
-            async function reconcileTransactions(acctId, transactions, isBankSyncAccount = false, strictIdChecking = true, isPreview = false) {
+            async function reconcileTransactions(acctId, transactions, isBankSyncAccount = false, strictIdChecking = true, isPreview = false, defaultCleared = true) {
                 console.log('Performing transaction reconciliation');
                 const updated = [];
                 const added = [];
@@ -35283,7 +35348,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             category: existing.category || trans.category || null,
                             imported_payee: trans.imported_payee || null,
                             notes: existing.notes || trans.notes || null,
-                            cleared: trans.cleared != null ? trans.cleared : true
+                            cleared: trans.cleared ?? existing.cleared
                         };
                         if ((0, _shared_util__WEBPACK_IMPORTED_MODULE_4__.hasFieldsChanged)(existing, updates, Object.keys(updates))) {
                             updated.push({
@@ -35326,7 +35391,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             ...newTrans,
                             id: (0, uuid__WEBPACK_IMPORTED_MODULE_16__["default"])(),
                             category: trans.category || null,
-                            cleared: trans.cleared != null ? trans.cleared : true
+                            cleared: trans.cleared ?? defaultCleared
                         };
                         if (subtransactions && subtransactions.length > 0) {
                             added.push(...makeSplitTransaction(finalTransaction, subtransactions));
@@ -36633,7 +36698,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 // (this might change when we think about scheduled transactions)
                 const register = await _db__WEBPACK_IMPORTED_MODULE_5__.all(`SELECT t.* FROM v_transactions t
      LEFT JOIN accounts a ON a.id = t.account
-     WHERE date >= ? AND date <= ? AND is_parent = 0 AND a.closed = 0
+     LEFT JOIN payees p ON p.id = t.payee
+     WHERE date >= ? AND date <= ? AND is_parent = 0 AND a.closed = 0 AND p.learn_categories = 1
      ORDER BY date DESC`, [
                     (0, _models__WEBPACK_IMPORTED_MODULE_8__.toDateRepr)(oldestDate),
                     (0, _models__WEBPACK_IMPORTED_MODULE_8__.toDateRepr)((0, _shared_months__WEBPACK_IMPORTED_MODULE_0__.addDays)((0, _shared_months__WEBPACK_IMPORTED_MODULE_0__.currentDay)(), 180))
@@ -36961,32 +37027,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const { id: fromPayee } = await _db__WEBPACK_IMPORTED_MODULE_0__.first('SELECT id FROM payees WHERE transfer_acct = ?', [
                     transaction.account
                 ]);
-                // We need to enforce certain constraints with child transaction transfers
-                if (transaction.parent_id) {
-                    const row = await _db__WEBPACK_IMPORTED_MODULE_0__.first(`
-        SELECT p.id, p.transfer_acct FROM v_transactions t
-        LEFT JOIN payees p ON p.id = t.payee
-        WHERE t.id = ?
-      `, [
-                        transaction.parent_id
-                    ]);
-                    if (row.transfer_acct) {
-                        if (row.id !== transaction.payee) {
-                            // This child transaction is trying to use a transfer payee,
-                            // but the parent is already using a different transfer payee.
-                            // This is not allowed, so not only do we do nothing, we clear
-                            // the payee of the child transaction to make it clear
-                            await _db__WEBPACK_IMPORTED_MODULE_0__.updateTransaction({
-                                id: transaction.id,
-                                payee: null
-                            });
-                            return {
-                                id: transaction.id,
-                                payee: null
-                            };
-                        }
-                    }
-                }
                 const id = await _db__WEBPACK_IMPORTED_MODULE_0__.insertTransaction({
                     account: transferredAccount,
                     amount: -transaction.amount,
@@ -38189,10 +38229,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var mitt__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! mitt */ "./node_modules/mitt/dist/mitt.mjs");
             /* harmony import */ var _platform_exceptions__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../platform/exceptions */ "./packages/loot-core/src/platform/exceptions/index.electron.ts");
             // @ts-strict-ignore
-            // This is a simple helper abstraction for defining methods exposed to
-            // the client. It doesn't do much, but checks for naming conflicts and
-            // makes it cleaner to combine methods. We call a group of related
-            // methods an "app".
             class App {
                 constructor() {
                     this.handlers = {};
@@ -39050,7 +39086,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             return compileAnd(state, cond);
                         }
                         else if (field === '$or') {
-                            if (!cond) {
+                            if (!cond || Array.isArray(cond) && cond.length === 0) {
                                 return null;
                             }
                             return compileOr(state, cond);
@@ -40060,6 +40096,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     group_by: f('string', {
                         default: 'Category'
                     }),
+                    sort_by: f('string', {
+                        default: 'desc'
+                    }),
                     balance_type: f('string', {
                         default: 'Expense'
                     }),
@@ -40102,7 +40141,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 zero_budgets: {
                     id: f('id'),
                     month: f('integer'),
-                    category: f('string'),
+                    category: f('string', {
+                        ref: 'categories'
+                    }),
                     amount: f('integer'),
                     carryover: f('integer'),
                     goal: f('integer'),
@@ -40644,7 +40685,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ holdForNextMonth: () => ( /* binding */holdForNextMonth),
                 /* harmony export */ isReflectBudget: () => ( /* binding */isReflectBudget),
                 /* harmony export */ resetHold: () => ( /* binding */resetHold),
+                /* harmony export */ set12MonthAvg: () => ( /* binding */set12MonthAvg),
                 /* harmony export */ set3MonthAvg: () => ( /* binding */set3MonthAvg),
+                /* harmony export */ set6MonthAvg: () => ( /* binding */set6MonthAvg),
                 /* harmony export */ setBudget: () => ( /* binding */setBudget),
                 /* harmony export */ setBuffer: () => ( /* binding */setBuffer),
                 /* harmony export */ setCategoryCarryover: () => ( /* binding */setCategoryCarryover),
@@ -40861,6 +40904,36 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 });
             }
+            async function set12MonthAvg({ month }) {
+                const categories = await _db__WEBPACK_IMPORTED_MODULE_2__.all('SELECT * FROM v_categories WHERE tombstone = 0');
+                await (0, _sync__WEBPACK_IMPORTED_MODULE_4__.batchMessages)(async () => {
+                    for (const cat of categories) {
+                        if (cat.is_income === 1 && !isReflectBudget()) {
+                            continue;
+                        }
+                        setNMonthAvg({
+                            month,
+                            N: 12,
+                            category: cat.id
+                        });
+                    }
+                });
+            }
+            async function set6MonthAvg({ month }) {
+                const categories = await _db__WEBPACK_IMPORTED_MODULE_2__.all('SELECT * FROM v_categories WHERE tombstone = 0');
+                await (0, _sync__WEBPACK_IMPORTED_MODULE_4__.batchMessages)(async () => {
+                    for (const cat of categories) {
+                        if (cat.is_income === 1 && !isReflectBudget()) {
+                            continue;
+                        }
+                        setNMonthAvg({
+                            month,
+                            N: 6,
+                            category: cat.id
+                        });
+                    }
+                });
+            }
             async function setNMonthAvg({ month, N, category }) {
                 const categoryFromDb = await _db__WEBPACK_IMPORTED_MODULE_2__.first('SELECT is_income FROM v_categories WHERE id = ?', [
                     category
@@ -41043,6 +41116,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             app.method('budget/copy-single-month', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.copySinglePreviousMonth)));
             app.method('budget/set-zero', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.setZero)));
             app.method('budget/set-3month-avg', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.set3MonthAvg)));
+            app.method('budget/set-6month-avg', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.set6MonthAvg)));
+            app.method('budget/set-12month-avg', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.set12MonthAvg)));
             app.method('budget/set-n-month-avg', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.setNMonthAvg)));
             app.method('budget/check-templates', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_goaltemplates__WEBPACK_IMPORTED_MODULE_5__.runCheckTemplates)));
             app.method('budget/apply-goal-template', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_goaltemplates__WEBPACK_IMPORTED_MODULE_5__.applyTemplate)));
@@ -41542,57 +41617,61 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     let scheduleFlag = false;
                     // switch on template type and calculate the amount for the line
                     for (let i = 0; i < t.length; i++) {
+                        let newBudget = 0;
                         switch (t[i].type) {
                             case 'simple':
                                 {
-                                    toBudget += this.runSimple(t[i], this.limitAmount);
+                                    newBudget = this.runSimple(t[i], this.limitAmount);
                                     break;
                                 }
                             case 'copy':
                                 {
-                                    toBudget += await this.runCopy(t[i]);
+                                    newBudget = await this.runCopy(t[i]);
                                     break;
                                 }
                             case 'week':
                                 {
-                                    toBudget += this.runWeek(t[i]);
+                                    newBudget = this.runWeek(t[i]);
                                     break;
                                 }
                             case 'spend':
                                 {
-                                    toBudget += await this.runSpend(t[i]);
+                                    newBudget = await this.runSpend(t[i]);
                                     break;
                                 }
                             case 'percentage':
                                 {
-                                    toBudget += await this.runPercentage(t[i], availStart);
+                                    newBudget = await this.runPercentage(t[i], availStart);
                                     break;
                                 }
                             case 'by':
                                 {
                                     //TODO add the logic to run all of these at once or whatever is needed
                                     const ret = this.runBy(t[i], first, remainder);
-                                    toBudget += ret.ret;
+                                    newBudget = ret.ret;
                                     remainder = ret.remainder;
                                     first = false;
                                     break;
                                 }
                             case 'schedule':
                                 {
-                                    const budgeted = await (0, _actions__WEBPACK_IMPORTED_MODULE_3__.getSheetValue)(_shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(this.month), `leftover-${this.category.id}`);
+                                    const budgeted = this.fromLastMonth + toBudget;
                                     const ret = await (0, _goalsSchedule__WEBPACK_IMPORTED_MODULE_4__.goalsSchedule)(scheduleFlag, t, this.month, budgeted, remainder, this.fromLastMonth, toBudget, [], this.category);
-                                    toBudget = ret.to_budget;
+                                    // Schedules assume that its to budget value is the whole thing so this
+                                    // needs to remove the previous funds so they aren't double counted
+                                    newBudget = ret.to_budget - toBudget;
                                     remainder = ret.remainder;
                                     scheduleFlag = ret.scheduleFlag;
                                     break;
                                 }
                             case 'average':
                                 {
-                                    toBudget += await this.runAverage(t[i]);
+                                    newBudget = await this.runAverage(t[i]);
                                     break;
                                 }
                         }
-                        available = available - toBudget;
+                        available = available - newBudget;
+                        toBudget += newBudget;
                     }
                     //check limit
                     if (this.limitCheck) {
@@ -42464,7 +42543,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     // Unless the current category is relevant to the schedule, target the post-rule amount.
                     const sign = category.is_income ? 1 : -1;
                     const target = sign * (categorySubtransactions?.length ? categorySubtransactions.reduce((acc, t) => acc + t.amount, 0) : postRuleAmount ?? scheduleAmount);
-                    const next_date_string = (0, _schedules_app__WEBPACK_IMPORTED_MODULE_3__.getNextDate)(dateConditions, _shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(current_month));
+                    const next_date_string = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_1__.getNextDate)(dateConditions, _shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(current_month));
                     const target_interval = dateConditions.value.interval ? dateConditions.value.interval : 1;
                     const target_frequency = dateConditions.value.frequency;
                     const isRepeating = Object(dateConditions.value) === dateConditions.value && 'frequency' in dateConditions.value;
@@ -42490,14 +42569,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             if (isRepeating) {
                                 let monthlyTarget = 0;
                                 const nextMonth = _shared_months__WEBPACK_IMPORTED_MODULE_0__.addMonths(current_month, t[t.length - 1].num_months + 1);
-                                let nextBaseDate = (0, _schedules_app__WEBPACK_IMPORTED_MODULE_3__.getNextDate)(dateConditions, _shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(current_month), true);
-                                let nextDate = dateConditions.value.skipWeekend ? _shared_months__WEBPACK_IMPORTED_MODULE_0__.dayFromDate((0, _schedules_app__WEBPACK_IMPORTED_MODULE_3__.getDateWithSkippedWeekend)(_shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(nextBaseDate), dateConditions.value.weekendSolveMode)) : nextBaseDate;
+                                let nextBaseDate = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_1__.getNextDate)(dateConditions, _shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(current_month), true);
+                                let nextDate = dateConditions.value.skipWeekend ? _shared_months__WEBPACK_IMPORTED_MODULE_0__.dayFromDate((0, _shared_schedules__WEBPACK_IMPORTED_MODULE_1__.getDateWithSkippedWeekend)(_shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(nextBaseDate), dateConditions.value.weekendSolveMode)) : nextBaseDate;
                                 while (nextDate < nextMonth) {
                                     monthlyTarget += -target;
                                     const currentDate = nextBaseDate;
                                     const oneDayLater = _shared_months__WEBPACK_IMPORTED_MODULE_0__.addDays(nextBaseDate, 1);
-                                    nextBaseDate = (0, _schedules_app__WEBPACK_IMPORTED_MODULE_3__.getNextDate)(dateConditions, _shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(oneDayLater), true);
-                                    nextDate = dateConditions.value.skipWeekend ? _shared_months__WEBPACK_IMPORTED_MODULE_0__.dayFromDate((0, _schedules_app__WEBPACK_IMPORTED_MODULE_3__.getDateWithSkippedWeekend)(_shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(nextBaseDate), dateConditions.value.weekendSolveMode)) : nextBaseDate;
+                                    nextBaseDate = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_1__.getNextDate)(dateConditions, _shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(oneDayLater), true);
+                                    nextDate = dateConditions.value.skipWeekend ? _shared_months__WEBPACK_IMPORTED_MODULE_0__.dayFromDate((0, _shared_schedules__WEBPACK_IMPORTED_MODULE_1__.getDateWithSkippedWeekend)(_shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(nextBaseDate), dateConditions.value.weekendSolveMode)) : nextBaseDate;
                                     const diffDays = _shared_months__WEBPACK_IMPORTED_MODULE_0__.differenceInCalendarDays(nextBaseDate, currentDate);
                                     if (!diffDays) {
                                         break;
@@ -43026,13 +43105,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const schedules = await (0, _statements__WEBPACK_IMPORTED_MODULE_2__.getActiveSchedules)();
                 const scheduleNames = schedules.map(({ name }) => name);
                 const errors = [];
-                categoryWithTemplates.forEach(({ id, name, templates }) => {
+                categoryWithTemplates.forEach(({ name, templates }) => {
                     templates.forEach((template) => {
                         if (template.type === 'error') {
                             errors.push(`${name}: ${template.line}`);
                         }
                         else if (template.type === 'schedule' && !scheduleNames.includes(template.name)) {
-                            errors.push(`${id}: Schedule “${template.name}” does not exist`);
+                            errors.push(`${name}: Schedule “${template.name}” does not exist`);
                         }
                     });
                 });
@@ -43057,7 +43136,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                     const parsedTemplates = [];
                     note.split('\n').forEach((line) => {
-                        const trimmedLine = line.trim();
+                        const trimmedLine = line.substring(line.indexOf('#')).trim();
                         if (!trimmedLine.startsWith(TEMPLATE_PREFIX) && !trimmedLine.startsWith(GOAL_PREFIX)) {
                             return;
                         }
@@ -45862,8 +45941,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _app__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./app */ "./packages/loot-core/src/server/app.ts");
             // Main app
             const app = (0, _app__WEBPACK_IMPORTED_MODULE_1__.createApp)();
-            app.events.on('sync', (info) => {
-                _platform_server_connection__WEBPACK_IMPORTED_MODULE_0__.send('sync-event', info);
+            app.events.on('sync', (event) => {
+                _platform_server_connection__WEBPACK_IMPORTED_MODULE_0__.send('sync-event', event);
             });
             /***/ 
         }),
@@ -46916,13 +46995,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 console.groupEnd();
                 return retVal;
             };
-            handlers['transactions-import'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(function ({ accountId, transactions, isPreview }) {
+            handlers['transactions-import'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_36__.mutator)(function ({ accountId, transactions, isPreview, opts }) {
                 return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
                     if (typeof accountId !== 'string') {
                         throw (0, _errors__WEBPACK_IMPORTED_MODULE_32__.APIError)('transactions-import: accountId must be an id');
                     }
                     try {
-                        return await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.reconcileTransactions(accountId, transactions, false, true, isPreview);
+                        return await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.reconcileTransactions(accountId, transactions, false, true, isPreview, opts?.defaultCleared);
                     }
                     catch (err) {
                         if (err instanceof _errors__WEBPACK_IMPORTED_MODULE_32__.TransactionError) {
@@ -47004,6 +47083,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if ('floatingSidebar' in prefs) {
                     await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('floating-sidebar', '' + prefs.floatingSidebar);
                 }
+                if ('language' in prefs) {
+                    await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('language', prefs.language);
+                }
                 if ('theme' in prefs) {
                     await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('theme', prefs.theme);
                 }
@@ -47016,11 +47098,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return 'ok';
             };
             handlers['load-global-prefs'] = async function () {
-                const [[, floatingSidebar], [, maxMonths], [, documentDir], [, encryptKey], [, theme], [, preferredDarkTheme], [, serverSelfSignedCert]] = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.multiGet([
+                const [[, floatingSidebar], [, maxMonths], [, documentDir], [, encryptKey], [, language], [, theme], [, preferredDarkTheme], [, serverSelfSignedCert]] = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.multiGet([
                     'floating-sidebar',
                     'max-months',
                     'document-dir',
                     'encrypt-key',
+                    'language',
                     'theme',
                     'preferred-dark-theme',
                     'server-self-signed-cert'
@@ -47030,6 +47113,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     maxMonths: (0, _shared_util__WEBPACK_IMPORTED_MODULE_13__.stringToInteger)(maxMonths || ''),
                     documentDir: documentDir || getDefaultDocumentDir(),
                     keyId: encryptKey && JSON.parse(encryptKey).id,
+                    language,
                     theme: theme === 'light' || theme === 'dark' || theme === 'auto' || theme === 'development' || theme === 'midnight' ? theme : 'auto',
                     preferredDarkTheme: preferredDarkTheme === 'dark' || preferredDarkTheme === 'midnight' ? preferredDarkTheme : 'dark',
                     serverSelfSignedCert: serverSelfSignedCert || undefined
@@ -47646,7 +47730,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                     }
                     catch { } // Ignore cleanup errors
-                    throw new Error(`Failed to duplicate budget: ${error.message}`);
+                    throw new Error(`Failed to duplicate budget file: ${error.message}`);
                 }
                 // load in and validate
                 const { error } = await loadBudget(newId);
@@ -48063,7 +48147,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 await ensureExists(documentDir);
                 _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__._setDocumentDir(documentDir);
             }
-            // eslint-disable-next-line import/no-unused-modules
             async function initApp(isDev, socketName) {
                 await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_9__.init();
                 await Promise.all([
@@ -48100,7 +48183,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     global.$setSyncingMode = _sync__WEBPACK_IMPORTED_MODULE_48__.setSyncingMode;
                 }
             }
-            // eslint-disable-next-line import/no-unused-modules
             async function init(config) {
                 // Get from build
                 let dataDir, serverURL;
@@ -48139,7 +48221,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return lib;
             }
             // Export a few things required for the platform
-            // eslint-disable-next-line import/no-unused-modules
             const lib = {
                 getDataDir: _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.getDataDir,
                 sendMessage: (msg, args) => _platform_server_connection__WEBPACK_IMPORTED_MODULE_6__.send(msg, args),
@@ -48936,6 +49017,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         dateRange: row.date_range,
                         mode: row.mode,
                         groupBy: row.group_by,
+                        sortBy: row.sort_by,
                         interval: row.interval,
                         balanceType: row.balance_type,
                         showEmpty: row.show_empty === 1,
@@ -48958,6 +49040,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         date_range: report.dateRange,
                         mode: report.mode,
                         group_by: report.groupBy,
+                        sort_by: report.sortBy,
                         interval: report.interval,
                         balance_type: report.balanceType,
                         show_empty: report.showEmpty ? 1 : 0,
@@ -49156,22 +49239,17 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ app: () => ( /* binding */app),
                 /* harmony export */ createSchedule: () => ( /* binding */createSchedule),
                 /* harmony export */ deleteSchedule: () => ( /* binding */deleteSchedule),
-                /* harmony export */ getDateWithSkippedWeekend: () => ( /* binding */getDateWithSkippedWeekend),
-                /* harmony export */ getNextDate: () => ( /* binding */getNextDate),
                 /* harmony export */ getRuleForSchedule: () => ( /* binding */getRuleForSchedule),
                 /* harmony export */ setNextDate: () => ( /* binding */setNextDate),
                 /* harmony export */ updateConditions: () => ( /* binding */updateConditions),
                 /* harmony export */ updateSchedule: () => ( /* binding */updateSchedule)
                 /* harmony export */ 
             });
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/startOfDay/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addDays/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isWeekend/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/nextMonday/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/previousFriday/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addDays/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/startOfDay/index.js");
             /* harmony import */ var deep_equal__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! deep-equal */ "./node_modules/deep-equal/index.js");
             /* harmony import */ var deep_equal__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(deep_equal__WEBPACK_IMPORTED_MODULE_0__);
-            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
+            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
             /* harmony import */ var _platform_exceptions__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../platform/exceptions */ "./packages/loot-core/src/platform/exceptions/index.electron.ts");
             /* harmony import */ var _platform_server_connection__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../platform/server/connection */ "./packages/loot-core/src/platform/server/connection/index.api.ts");
             /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../shared/months */ "./packages/loot-core/src/shared/months.ts");
@@ -49213,36 +49291,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const added = replacements.filter((x) => x[0] == null && x[1] != null).map((x) => x[1]);
                 return updated.concat(added);
             }
-            function getNextDate(dateCond, start = new Date((0, _shared_months__WEBPACK_IMPORTED_MODULE_3__.currentDay)()), noSkipWeekend = false) {
-                start = date_fns__WEBPACK_IMPORTED_MODULE_19__["default"](start);
-                const cond = new _accounts_rules__WEBPACK_IMPORTED_MODULE_6__.Condition(dateCond.op, 'date', dateCond.value, null);
-                const value = cond.getValue();
-                if (value.type === 'date') {
-                    return value.date;
-                }
-                else if (value.type === 'recur') {
-                    let dates = value.schedule.occurrences({
-                        start,
-                        take: 1
-                    }).toArray();
-                    if (dates.length === 0) {
-                        // Could be a schedule with limited occurrences, so we try to
-                        // find the last occurrence
-                        dates = value.schedule.occurrences({
-                            reverse: true,
-                            take: 1
-                        }).toArray();
-                    }
-                    if (dates.length > 0) {
-                        let date = dates[0].date;
-                        if (value.schedule.data.skipWeekend && !noSkipWeekend) {
-                            date = getDateWithSkippedWeekend(date, value.schedule.data.weekendSolve);
-                        }
-                        return (0, _shared_months__WEBPACK_IMPORTED_MODULE_3__.dayFromDate)(date);
-                    }
-                }
-                return null;
-            }
             async function getRuleForSchedule(id) {
                 if (id == null) {
                     throw new Error('Schedule not attached to a rule');
@@ -49303,7 +49351,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }).calculate('next_date'));
                 // Only do this if a date condition exists
                 if (dateCond) {
-                    const newNextDate = getNextDate(dateCond, start ? start(nextDate) : new Date());
+                    const newNextDate = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_5__.getNextDate)(dateCond, start ? start(nextDate) : new Date());
                     if (newNextDate !== nextDate) {
                         // Our `update` functon requires the id of the item and we don't
                         // have it, so we need to query it
@@ -49336,7 +49384,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return true;
             }
             async function createSchedule({ schedule = null, conditions = [] } = {}) {
-                const scheduleId = schedule?.id || (0, uuid__WEBPACK_IMPORTED_MODULE_20__["default"])();
+                const scheduleId = schedule?.id || (0, uuid__WEBPACK_IMPORTED_MODULE_19__["default"])();
                 const { date: dateCond } = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_5__.extractScheduleConds)(conditions);
                 if (dateCond == null) {
                     throw new Error('A date condition is required to create a schedule');
@@ -49344,7 +49392,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (dateCond.value == null) {
                     throw new Error('Date is required');
                 }
-                const nextDate = getNextDate(dateCond);
+                const nextDate = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_5__.getNextDate)(dateCond);
                 const nextDateRepr = nextDate ? (0, _models__WEBPACK_IMPORTED_MODULE_12__.toDateRepr)(nextDate) : null;
                 if (schedule) {
                     if (schedule.name) {
@@ -49437,6 +49485,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                     await _db__WEBPACK_IMPORTED_MODULE_11__.updateWithSchema('schedules', schedule);
                 });
+                return schedule.id;
             }
             async function deleteSchedule({ id }) {
                 const { data: ruleId } = await (0, _aql__WEBPACK_IMPORTED_MODULE_10__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__.q)('schedules').filter({
@@ -49451,7 +49500,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return setNextDate({
                     id,
                     start: (nextDate) => {
-                        return date_fns__WEBPACK_IMPORTED_MODULE_21__["default"]((0, _shared_months__WEBPACK_IMPORTED_MODULE_3__.parseDate)(nextDate), 1);
+                        return date_fns__WEBPACK_IMPORTED_MODULE_20__["default"]((0, _shared_months__WEBPACK_IMPORTED_MODULE_3__.parseDate)(nextDate), 1);
                     }
                 });
             }
@@ -49465,9 +49514,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         rrules: rules
                     });
                     return schedule.occurrences({
-                        start: date_fns__WEBPACK_IMPORTED_MODULE_19__["default"](new Date()),
+                        start: date_fns__WEBPACK_IMPORTED_MODULE_21__["default"](new Date()),
                         take: count
-                    }).toArray().map((date) => config.skipWeekend ? getDateWithSkippedWeekend(date.date, config.weekendSolveMode) : date.date).map((date) => (0, _shared_months__WEBPACK_IMPORTED_MODULE_3__.dayFromDate)(date));
+                    }).toArray().map((date) => config.skipWeekend ? (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_5__.getDateWithSkippedWeekend)(date.date, config.weekendSolveMode) : date.date).map((date) => (0, _shared_months__WEBPACK_IMPORTED_MODULE_3__.dayFromDate)(date));
                 }
                 catch (err) {
                     (0, _platform_exceptions__WEBPACK_IMPORTED_MODULE_1__.captureBreadcrumb)(config);
@@ -49551,9 +49600,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const { data: upcomingLength } = await (0, _aql__WEBPACK_IMPORTED_MODULE_10__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__.q)('preferences').filter({
                     id: 'upcomingScheduledTransactionLength'
                 }).select('value'));
-                const upcomingLengthValue = upcomingLength[0]?.value ?? '7'; // Default to 7 days if not set
                 for (const schedule of schedules) {
-                    const status = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_5__.getStatus)(schedule.next_date, schedule.completed, hasTrans.has(schedule.id), upcomingLengthValue);
+                    const status = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_5__.getStatus)(schedule.next_date, schedule.completed, hasTrans.has(schedule.id), upcomingLength[0]?.value ?? '7');
                     if (status === 'paid') {
                         if (schedule._date) {
                             // Move forward recurring schedules
@@ -49595,9 +49643,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 }
                 if (failedToPost.length > 0) {
-                    _platform_server_connection__WEBPACK_IMPORTED_MODULE_2__.send('schedules-offline', {
-                        payees: failedToPost
-                    });
+                    _platform_server_connection__WEBPACK_IMPORTED_MODULE_2__.send('schedules-offline');
                 }
                 else if (didPost) {
                     // This forces a full refresh of transactions because it
@@ -49609,7 +49655,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         tables: [
                             'transactions'
                         ],
-                        syncDisabled: 'false'
+                        syncDisabled: false
                     });
                 }
             }
@@ -49636,20 +49682,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 }
             });
-            function getDateWithSkippedWeekend(date, solveMode) {
-                if (date_fns__WEBPACK_IMPORTED_MODULE_22__["default"](date)) {
-                    if (solveMode === 'after') {
-                        return date_fns__WEBPACK_IMPORTED_MODULE_23__["default"](date);
-                    }
-                    else if (solveMode === 'before') {
-                        return date_fns__WEBPACK_IMPORTED_MODULE_24__["default"](date);
-                    }
-                    else {
-                        throw new Error('Unknown weekend solve mode, this should not happen!');
-                    }
-                }
-                return date;
-            }
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/schedules/find-schedules.ts": 
@@ -52021,10 +52053,30 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     const subValue = t.subtransactions.reduce((acc, st) => acc + st.amount, 0);
                     return subValue !== t.amount;
                 });
+                // 5. Fix transfers that should not have categories
+                const brokenTransfers = await _db__WEBPACK_IMPORTED_MODULE_4__.all(`
+    SELECT t1.id
+    FROM v_transactions_internal t1
+           JOIN accounts a1 ON t1.account = a1.id
+           JOIN v_transactions_internal t2 ON t1.transfer_id = t2.id
+           JOIN accounts a2 ON t2.account = a2.id
+    WHERE a1.offbudget = a2.offbudget
+      AND t1.category IS NOT NULL
+  `);
+                await (0, _mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(async () => {
+                    const updated = brokenTransfers.map((row) => ({
+                        id: row.id,
+                        category: null
+                    }));
+                    await (0, _accounts_transactions__WEBPACK_IMPORTED_MODULE_1__.batchUpdateTransactions)({
+                        updated
+                    });
+                });
                 return {
                     numBlankPayees: blankPayeeRows.length,
                     numCleared: clearedRows.length,
                     numDeleted: deletedRows.length,
+                    numTransfersFixed: brokenTransfers.length,
                     mismatchedSplits
                 };
             });
@@ -52571,7 +52623,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ isPreviewEnvironment: () => ( /* binding */isPreviewEnvironment)
                 /* harmony export */ 
             });
-            /* eslint-disable import/no-unused-modules */ function isPreviewEnvironment() {
+            function isPreviewEnvironment() {
                 return String(process.env.REACT_APP_NETLIFY) === 'true';
             }
             function isDevelopmentEnvironment() {
@@ -52675,7 +52727,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('This budget cannot be loaded with this version of the app.');
                 }
                 else if (error === 'budget-not-found') {
-                    return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('Budget “{id}” not found. Check the id of your budget in the Advanced section of the settings page.', {
+                    return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('Budget “{{id}}” not found. Check the ID of your budget in the Advanced section of the settings page.', {
                         id
                     });
                 }
@@ -52704,7 +52756,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     case 'unauthorized':
                         return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('You are not logged in.');
                     case 'token-expired':
-                        return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('Login expired, please login again.');
+                        return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('Login expired, please log in again.');
                     case 'user-cant-be-empty':
                         return (0, i18next__WEBPACK_IMPORTED_MODULE_0__.t)('Please select a user.');
                     case 'invalid-file-id':
@@ -53816,18 +53868,28 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
                 /* harmony export */ describeSchedule: () => ( /* binding */describeSchedule),
                 /* harmony export */ extractScheduleConds: () => ( /* binding */extractScheduleConds),
+                /* harmony export */ getDateWithSkippedWeekend: () => ( /* binding */getDateWithSkippedWeekend),
                 /* harmony export */ getHasTransactionsQuery: () => ( /* binding */getHasTransactionsQuery),
+                /* harmony export */ getNextDate: () => ( /* binding */getNextDate),
                 /* harmony export */ getRecurringDescription: () => ( /* binding */getRecurringDescription),
                 /* harmony export */ getScheduledAmount: () => ( /* binding */getScheduledAmount),
                 /* harmony export */ getStatus: () => ( /* binding */getStatus),
-                /* harmony export */ recurConfigToRSchedule: () => ( /* binding */recurConfigToRSchedule)
+                /* harmony export */ getUpcomingDays: () => ( /* binding */getUpcomingDays),
+                /* harmony export */ recurConfigToRSchedule: () => ( /* binding */recurConfigToRSchedule),
+                /* harmony export */ scheduleIsRecurring: () => ( /* binding */scheduleIsRecurring)
                 /* harmony export */ 
             });
-            /* harmony import */ var _months__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./months */ "./packages/loot-core/src/shared/months.ts");
-            /* harmony import */ var _query__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./query */ "./packages/loot-core/src/shared/query.ts");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/startOfDay/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isWeekend/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/nextMonday/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/previousFriday/index.js");
+            /* harmony import */ var _server_accounts_rules__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../server/accounts/rules */ "./packages/loot-core/src/server/accounts/rules.ts");
+            /* harmony import */ var _months__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./months */ "./packages/loot-core/src/shared/months.ts");
+            /* harmony import */ var _query__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./query */ "./packages/loot-core/src/shared/query.ts");
             // @ts-strict-ignore
             function getStatus(nextDate, completed, hasTrans, upcomingLength) {
-                const today = _months__WEBPACK_IMPORTED_MODULE_0__.currentDay();
+                const upcomingDays = getUpcomingDays(upcomingLength);
+                const today = _months__WEBPACK_IMPORTED_MODULE_1__.currentDay();
                 if (completed) {
                     return 'completed';
                 }
@@ -53837,7 +53899,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 else if (nextDate === today) {
                     return 'due';
                 }
-                else if (nextDate > today && nextDate <= _months__WEBPACK_IMPORTED_MODULE_0__.addDays(today, parseInt(upcomingLength ?? '7'))) {
+                else if (nextDate > today && nextDate <= _months__WEBPACK_IMPORTED_MODULE_1__.addDays(today, upcomingDays)) {
                     return 'upcoming';
                 }
                 else if (nextDate < today) {
@@ -53854,12 +53916,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         $and: {
                             schedule: schedule.id,
                             date: {
-                                $gte: dateCond && dateCond.op === 'is' ? schedule.next_date : _months__WEBPACK_IMPORTED_MODULE_0__.subDays(schedule.next_date, 2)
+                                $gte: dateCond && dateCond.op === 'is' ? schedule.next_date : _months__WEBPACK_IMPORTED_MODULE_1__.subDays(schedule.next_date, 2)
                             }
                         }
                     };
                 });
-                return (0, _query__WEBPACK_IMPORTED_MODULE_1__.q)('transactions').options({
+                return (0, _query__WEBPACK_IMPORTED_MODULE_2__.q)('transactions').options({
                     splits: 'all'
                 }).filter({
                     $or: filters
@@ -53873,7 +53935,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function makeNumberSuffix(num) {
                 // Slight abuse of date-fns to turn a number like "1" into the full
                 // form "1st" but formatting a date with that number
-                return _months__WEBPACK_IMPORTED_MODULE_0__.format(new Date(2020, 0, num, 12), 'do');
+                return _months__WEBPACK_IMPORTED_MODULE_1__.format(new Date(2020, 0, num, 12), 'do');
             }
             function prettyDayName(day) {
                 const days = {
@@ -53900,7 +53962,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                         break;
                     case 'on_date':
-                        endModeSuffix = `, until ${_months__WEBPACK_IMPORTED_MODULE_0__.format(config.endDate, dateFormat)}`;
+                        endModeSuffix = `, until ${_months__WEBPACK_IMPORTED_MODULE_1__.format(config.endDate, dateFormat)}`;
                         break;
                     default:
                 }
@@ -53917,7 +53979,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         {
                             let desc = 'Every ';
                             desc += interval !== 1 ? `${interval} weeks` : 'week';
-                            desc += ' on ' + _months__WEBPACK_IMPORTED_MODULE_0__.format(config.start, 'EEEE');
+                            desc += ' on ' + _months__WEBPACK_IMPORTED_MODULE_1__.format(config.start, 'EEEE');
                             return desc + suffix;
                         }
                     case 'monthly':
@@ -53979,7 +54041,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 }
                             }
                             else {
-                                desc += ' on the ' + _months__WEBPACK_IMPORTED_MODULE_0__.format(config.start, 'do');
+                                desc += ' on the ' + _months__WEBPACK_IMPORTED_MODULE_1__.format(config.start, 'do');
                             }
                             return desc + suffix;
                         }
@@ -53987,7 +54049,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         {
                             let desc = 'Every ';
                             desc += interval !== 1 ? `${interval} years` : 'year';
-                            desc += ' on ' + _months__WEBPACK_IMPORTED_MODULE_0__.format(config.start, 'LLL do');
+                            desc += ' on ' + _months__WEBPACK_IMPORTED_MODULE_1__.format(config.start, 'LLL do');
                             return desc + suffix;
                         }
                     default:
@@ -53996,7 +54058,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             function recurConfigToRSchedule(config) {
                 const base = {
-                    start: _months__WEBPACK_IMPORTED_MODULE_0__.parseDate(config.start),
+                    start: _months__WEBPACK_IMPORTED_MODULE_1__.parseDate(config.start),
                     // @ts-ignore: issues with https://gitlab.com/john.carroll.p/rschedule/-/issues/86
                     frequency: config.frequency.toUpperCase(),
                     byHourOfDay: [
@@ -54012,7 +54074,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         base.count = config.endOccurrences;
                         break;
                     case 'on_date':
-                        base.end = _months__WEBPACK_IMPORTED_MODULE_0__.parseDate(config.endDate);
+                        base.end = _months__WEBPACK_IMPORTED_MODULE_1__.parseDate(config.endDate);
                         break;
                     default:
                 }
@@ -54068,6 +54130,50 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     date: conditions.find((cond) => (cond.op === 'is' || cond.op === 'isapprox') && cond.field === 'date') || null
                 };
             }
+            function getNextDate(dateCond, start = new Date(_months__WEBPACK_IMPORTED_MODULE_1__.currentDay()), noSkipWeekend = false) {
+                start = date_fns__WEBPACK_IMPORTED_MODULE_3__["default"](start);
+                const cond = new _server_accounts_rules__WEBPACK_IMPORTED_MODULE_0__.Condition(dateCond.op, 'date', dateCond.value, null);
+                const value = cond.getValue();
+                if (value.type === 'date') {
+                    return value.date;
+                }
+                else if (value.type === 'recur') {
+                    let dates = value.schedule.occurrences({
+                        start,
+                        take: 1
+                    }).toArray();
+                    if (dates.length === 0) {
+                        // Could be a schedule with limited occurrences, so we try to
+                        // find the last occurrence
+                        dates = value.schedule.occurrences({
+                            reverse: true,
+                            take: 1
+                        }).toArray();
+                    }
+                    if (dates.length > 0) {
+                        let date = dates[0].date;
+                        if (value.schedule.data.skipWeekend && !noSkipWeekend) {
+                            date = getDateWithSkippedWeekend(date, value.schedule.data.weekendSolve);
+                        }
+                        return _months__WEBPACK_IMPORTED_MODULE_1__.dayFromDate(date);
+                    }
+                }
+                return null;
+            }
+            function getDateWithSkippedWeekend(date, solveMode) {
+                if (date_fns__WEBPACK_IMPORTED_MODULE_4__["default"](date)) {
+                    if (solveMode === 'after') {
+                        return date_fns__WEBPACK_IMPORTED_MODULE_5__["default"](date);
+                    }
+                    else if (solveMode === 'before') {
+                        return date_fns__WEBPACK_IMPORTED_MODULE_6__["default"](date);
+                    }
+                    else {
+                        throw new Error('Unknown weekend solve mode, this should not happen!');
+                    }
+                }
+                return date;
+            }
             function getScheduledAmount(amount, inverse = false) {
                 // this check is temporary, and required at the moment as a schedule rule
                 // allows the amount condition to be deleted which causes a crash
@@ -54087,6 +54193,47 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return `Next: ${schedule.next_date}`;
                 }
             }
+            function getUpcomingDays(upcomingLength = '7') {
+                const today = _months__WEBPACK_IMPORTED_MODULE_1__.currentDay();
+                const month = _months__WEBPACK_IMPORTED_MODULE_1__.getMonth(today);
+                switch (upcomingLength) {
+                    case 'currentMonth':
+                        {
+                            const day = _months__WEBPACK_IMPORTED_MODULE_1__.getDay(today);
+                            const end = _months__WEBPACK_IMPORTED_MODULE_1__.getDay(_months__WEBPACK_IMPORTED_MODULE_1__.getMonthEnd(today));
+                            return end - day + 1;
+                        }
+                    case 'oneMonth':
+                        {
+                            return _months__WEBPACK_IMPORTED_MODULE_1__.differenceInCalendarDays(_months__WEBPACK_IMPORTED_MODULE_1__.nextMonth(month), month) + 1;
+                        }
+                    default:
+                        if (upcomingLength.includes('-')) {
+                            const [num, unit] = upcomingLength.split('-');
+                            const value = Math.max(1, parseInt(num, 10));
+                            switch (unit) {
+                                case 'day':
+                                    return value;
+                                case 'week':
+                                    return value * 7;
+                                case 'month':
+                                    const future = _months__WEBPACK_IMPORTED_MODULE_1__.addMonths(today, value);
+                                    return _months__WEBPACK_IMPORTED_MODULE_1__.differenceInCalendarDays(future, month) + 1;
+                                case 'year':
+                                    const futureYear = _months__WEBPACK_IMPORTED_MODULE_1__.addYears(today, value);
+                                    return _months__WEBPACK_IMPORTED_MODULE_1__.differenceInCalendarDays(futureYear, month) + 1;
+                                default:
+                                    return 7;
+                            }
+                        }
+                        return parseInt(upcomingLength, 10);
+                }
+            }
+            function scheduleIsRecurring(dateCond) {
+                const cond = new _server_accounts_rules__WEBPACK_IMPORTED_MODULE_0__.Condition(dateCond.op, 'date', dateCond.value, null);
+                const value = cond.getValue();
+                return value.type === 'recur';
+            }
             /***/ 
         }),
         /***/ "./packages/loot-core/src/shared/transactions.ts": 
@@ -54167,8 +54314,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 // Calculate the new total of split transactions and make sure
                 // that it equals the parent amount
                 const total = (trans.subtransactions || []).reduce((acc, t) => acc + num(t.amount), 0);
+                const { error, ...rest } = trans;
                 return {
-                    ...trans,
+                    ...rest,
                     error: total === num(trans.amount) ? null : SplitTransactionError(total, trans)
                 };
             }
@@ -54348,11 +54496,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             return null;
                         }
                         else if (trans.subtransactions?.length === 1) {
+                            const { error, subtransactions, ...rest } = trans;
                             return {
-                                ...trans,
-                                subtransactions: undefined,
-                                is_parent: false,
-                                error: null
+                                ...rest,
+                                is_parent: false
                             };
                         }
                         else {
@@ -54376,8 +54523,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     const subtransactions = createSubtransactions?.(trans) || [
                         makeChild(trans)
                     ];
+                    const { error, ...rest } = trans;
                     return {
-                        ...trans,
+                        ...rest,
                         is_parent: true,
                         error: num(trans.amount) === 0 ? null : SplitTransactionError(0, trans),
                         subtransactions: subtransactions.map((t) => ({
@@ -54746,7 +54894,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     separatorRegex
                 };
             }
-            // Number utilities
             // We dont use `Number.MAX_SAFE_NUMBER` and such here because those
             // numbers are so large that it's not safe to convert them to floats
             // (i.e. N / 100). For example, `9007199254740987 / 100 ===
@@ -54765,33 +54912,33 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 return value;
             }
-            function toRelaxedNumber(value) {
-                return integerToAmount(currencyToInteger(value) || 0);
+            function toRelaxedNumber(currencyAmount) {
+                return integerToAmount(currencyToInteger(currencyAmount) || 0);
             }
-            function integerToCurrency(n, formatter = getNumberFormat().formatter) {
-                return formatter.format(safeNumber(n) / 100);
+            function integerToCurrency(integerAmount, formatter = getNumberFormat().formatter) {
+                return formatter.format(safeNumber(integerAmount) / 100);
             }
-            function amountToCurrency(n) {
-                return getNumberFormat().formatter.format(n);
+            function amountToCurrency(amount) {
+                return getNumberFormat().formatter.format(amount);
             }
-            function amountToCurrencyNoDecimal(n) {
+            function amountToCurrencyNoDecimal(amount) {
                 return getNumberFormat({
                     ...numberFormatConfig,
                     hideFraction: true
-                }).formatter.format(n);
+                }).formatter.format(amount);
             }
-            function currencyToAmount(str) {
+            function currencyToAmount(currencyAmount) {
                 let amount;
                 if (getNumberFormat().separatorRegex) {
-                    amount = parseFloat(str.replace(getNumberFormat().regex, '').replace(getNumberFormat().separatorRegex, '.'));
+                    amount = parseFloat(currencyAmount.replace(getNumberFormat().regex, '').replace(getNumberFormat().separatorRegex, '.'));
                 }
                 else {
-                    amount = parseFloat(str.replace(getNumberFormat().regex, '').replace(getNumberFormat().separator, '.'));
+                    amount = parseFloat(currencyAmount.replace(getNumberFormat().regex, '').replace(getNumberFormat().separator, '.'));
                 }
                 return isNaN(amount) ? null : amount;
             }
-            function currencyToInteger(str) {
-                const amount = currencyToAmount(str);
+            function currencyToInteger(currencyAmount) {
+                const amount = currencyToAmount(currencyAmount);
                 return amount == null ? null : amountToInteger(amount);
             }
             function stringToInteger(str) {
@@ -54801,11 +54948,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 return null;
             }
-            function amountToInteger(n) {
-                return Math.round(n * 100);
+            function amountToInteger(amount) {
+                return Math.round(amount * 100);
             }
-            function integerToAmount(n) {
-                return parseFloat((safeNumber(n) / 100).toFixed(2));
+            function integerToAmount(integerAmount) {
+                return parseFloat((safeNumber(integerAmount) / 100).toFixed(2));
             }
             // This is used when the input format could be anything (from
             // financial files and we don't want to parse based on the user's