@diy-accounting-uk/diya-gl 1.2.53 → 1.2.55

package/dist/app/data/releases.json

@@ -1611,6 +1611,58 @@
           "scorecard": "101608 passed, 0 warnings, 0 failed"
         }
       }
+    },
+    {
+      "tag": "diya-gl-v1.2.53",
+      "date": "2026-10-20",
+      "formatVersion": "diya-gl/1",
+      "engineVersion": "1.2.53+f18282c3",
+      "taxDataHash": "51bdff60e993",
+      "reconciledCommit": "54e8731a91279975e61b1a232fbb67fda89515f0",
+      "templates": {
+        "bst": {
+          "hash": "0d003e10e00c",
+          "scorecard": "812 passed, 0 warnings, 0 failed"
+        },
+        "taxi": {
+          "hash": "1ff69654d64d",
+          "scorecard": "700 passed, 0 warnings, 0 failed"
+        },
+        "se": {
+          "hash": "064605ae76ed",
+          "scorecard": "8015 passed, 0 warnings, 0 failed"
+        },
+        "ltd": {
+          "hash": "a65ab09cf35c",
+          "scorecard": "101608 passed, 0 warnings, 0 failed"
+        }
+      }
+    },
+    {
+      "tag": "diya-gl-v1.2.54",
+      "date": "2026-10-23",
+      "formatVersion": "diya-gl/1",
+      "engineVersion": "1.2.54+21f315a0",
+      "taxDataHash": "51bdff60e993",
+      "reconciledCommit": "54e8731a91279975e61b1a232fbb67fda89515f0",
+      "templates": {
+        "bst": {
+          "hash": "0d003e10e00c",
+          "scorecard": "812 passed, 0 warnings, 0 failed"
+        },
+        "taxi": {
+          "hash": "1ff69654d64d",
+          "scorecard": "700 passed, 0 warnings, 0 failed"
+        },
+        "se": {
+          "hash": "064605ae76ed",
+          "scorecard": "8015 passed, 0 warnings, 0 failed"
+        },
+        "ltd": {
+          "hash": "a65ab09cf35c",
+          "scorecard": "101608 passed, 0 warnings, 0 failed"
+        }
+      }
     }
   ]
 }

package/dist/app/lib/provenance-data.js

@@ -12,7 +12,7 @@
 
 export const PROVENANCE_DATA = {
   formatVersion: "diya-gl/1",
-  engineVersion: "1.2.53+f18282c3",
+  engineVersion: "1.2.55+bb0dbecd",
   taxDataHash: "51bdff60e993",
   reconciledCommit: "54e8731a91279975e61b1a232fbb67fda89515f0",
   templates: {

package/dist/app/lib/xlsx-exporter.js

@@ -73,6 +73,20 @@ const REVERSE_SALES = buildReverseCodeMap(LTD_SALES_CODE_MAP);
 /**
  * Check if a cell contains a formula (has <f> tag).
  */
+// The rows between first and last, inclusive, on which the column holds a cell with content:
+// a typed value or a formula. A bank book's receipt and payment lists sit side by side and each
+// has gaps where the other side has a row, so a reader walks the rows its own column fills
+// rather than stopping at the first gap or testing every row of the sheet.
+function rowsWithContent(xml, column, first, last) {
+  const rows = new Set();
+  const cellPattern = new RegExp(`<c\\s+r="${column}(\\d+)"[^>]*>`, "g");
+  for (const match of xml.matchAll(cellPattern)) {
+    const row = Number(match[1]);
+    if (row >= first && row <= last && !match[0].endsWith("/>")) rows.add(row);
+  }
+  return [...rows].sort((a, b) => a - b);
+}
+
 function hasCellFormula(xml, cellRef) {
   const cellPattern = new RegExp(`<c\\s+r="${cellRef}"[^>]*(?:/>|>([\\s\\S]*?)</c>)`, "s");
   const match = xml.match(cellPattern);
@@ -952,12 +966,14 @@ export async function extractBankTransactions(set, product, period, extractionMa
         obEmitted = true;
       }
 
-      // Receipts: rows 6+, A=date, B=source, E=code, F=amount
-      for (let row = 6; row <= 200; row++) {
+      // Receipts: rows 6+, A=date, B=source, E=code, F=amount. A bank book lists receipts and
+      // payments side by side in statement order, so a row with a payment and no receipt is a
+      // gap on this side, not the end of the list; only the totals formula ends it.
+      for (const row of rowsWithContent(xml, "F", 6, 200)) {
+        if (hasCellFormula(xml, `F${row}`)) break;
         const dateVal = readCellValue(xml, `A${row}`, sharedStrings);
         const amount = readCellValue(xml, `F${row}`, sharedStrings);
-        if (dateVal === null || amount === null || typeof amount !== "number") break;
-        if (hasCellFormula(xml, `F${row}`)) break;
+        if (dateVal === null || amount === null || typeof amount !== "number") continue;
 
         const source = readCellValue(xml, `B${row}`, sharedStrings) || "";
         const code = readCellValue(xml, `E${row}`, sharedStrings) || "";
@@ -984,11 +1000,11 @@ export async function extractBankTransactions(set, product, period, extractionMa
       }
 
       // Payments: rows 6+, columns per the file's payment layout
-      for (let row = 6; row <= 200; row++) {
+      for (const row of rowsWithContent(xml, payment.amount, 6, 200)) {
+        if (hasCellFormula(xml, `${payment.amount}${row}`)) break;
         const dateVal = readCellValue(xml, `${payment.date}${row}`, sharedStrings);
         const amount = readCellValue(xml, `${payment.amount}${row}`, sharedStrings);
-        if (dateVal === null || amount === null || typeof amount !== "number") break;
-        if (hasCellFormula(xml, `${payment.amount}${row}`)) break;
+        if (dateVal === null || amount === null || typeof amount !== "number") continue;
 
         const supplier = readCellValue(xml, `${payment.supplier}${row}`, sharedStrings) || "";
         const code = readCellValue(xml, `${payment.code}${row}`, sharedStrings) || "";

package/dist/app/products/bst.js

@@ -350,7 +350,7 @@ export const HEADLINES = {
   turnover: { key: "cell/Profit & Loss Acc!C4" },
   costOfSales: { keys: ["cell/Profit & Loss Acc!C6", "cell/Profit & Loss Acc!C7"] },
   runningCosts: { key: "cell/Profit & Loss Acc!C22" },
-  tax: { key: "cell/Income Tax!E18" },
+  tax: { key: "cell/Income Tax!E18", subtitle: "income tax and Class 4 NI, less CIS" },
   assets: {
     writtenDown: { key: "cell/Fixed Assets!M1", optional: true },
     stock: { key: "cell/PurchasesStock!D30", optional: true },

package/dist/app/products/ltd.js

@@ -1336,10 +1336,9 @@ export const CELL_MAP = [
 // The declaration wraps every single-cell reference as `{ key }` (or
 // `{ key, optional }`) and every summed group as `{ keys: [...] }`, the
 // shape the shared headline reducer (app/lib/headlines.js) reads across
-// products. Ltd's current-assets cell (`PubBalSht!E13`) already sums stock,
-// trade debtors and cash, so it fills the reducer's `assets.stock` part --
-// the total's other summed-in figure -- and there is no separate `debtors`
-// part the way BST has one. `tax.secondLine` and `assets.secondLine` each
+// products. Ltd reads stock at cost, cash at bank and in hand, and trade
+// debtors from their own published balance sheet lines (E10, E12, E11), so
+// each lands in its own part of the assets tile. `tax.secondLine` and `assets.secondLine` each
 // add one labelled figure beside that tile's own value, excluded from every
 // sum: the tax charge still outstanding and the balance sheet's net-assets
 // total. `turnover.pieExtra` adds the dividends the board declared as a
@@ -1365,11 +1364,14 @@ export const HEADLINES = {
   tax: {
     key: "cell/Financialaccounts.xlsx!CorporationTax!K35", // SUM(I33:I34)
     label: "Corporation tax",
+    subtitle: "corporation tax",
     secondLine: { label: "Tax outstanding", key: "cell/Financialaccounts.xlsx!CorporationTax!K39" }, // K35-K37
   },
   assets: {
     writtenDown: { key: "cell/Financialaccounts.xlsx!PubBalSht!F6" }, // fixed assets NBV
-    stock: { key: "cell/Financialaccounts.xlsx!PubBalSht!E13" }, // stock, trade debtors, cash
+    stock: { key: "cell/Financialaccounts.xlsx!PubBalSht!E10" }, // stock at cost
+    cash: { key: "cell/Financialaccounts.xlsx!PubBalSht!E12" }, // cash at bank and in hand
+    debtors: { key: "cell/Financialaccounts.xlsx!PubBalSht!E11" }, // trade debtors
     secondLine: { label: "Net assets", key: "cell/Financialaccounts.xlsx!PubBalSht!F33" },
   },
   // B11 to B13, cost of sales' own three lines, are not repeated here: the

package/dist/app/products/se.js

@@ -1284,14 +1284,11 @@ export const HEADLINES = {
   },
   costOfSales: { key: `${HUB}!Profit & Loss Account!B17` },
   runningCosts: { key: `${HUB}!Profit & Loss Account!B35`, label: "Admin expenses" },
-  tax: { key: `${HUB}!Income Tax!E18` },
+  tax: { key: `${HUB}!Income Tax!E18`, subtitle: "income tax and Class 4 NI, less CIS" },
   assets: {
     writtenDown: { key: "cell/Fixedassets.xlsx!Schedule!K1", optional: true },
     stock: { key: `${HUB}!StockControl!AB30`, optional: true },
-    extra: [
-      { label: "Cash at bank", key: "cell/Bank.xlsx!Mar!A2" },
-      { label: "Cash in hand", key: "cell/Cash.xlsx!Mar!A2" },
-    ],
+    cash: { keys: ["cell/Bank.xlsx!Mar!A2", "cell/Cash.xlsx!Mar!A2"] },
     debtors: { key: "cell/Sales.xlsx!ClosingDebtors!G1", optional: true },
   },
   // The pie's own fourteen lines: B21 to B34, the P&L rows Total Admin

package/dist/app/products/taxi.js

@@ -446,7 +446,7 @@ export const HEADLINES = {
   costOfSales: { key: "cell/Profit & Loss Acc!B12", label: "vehicle costs" },
   runningCosts: { key: "cell/Profit & Loss Acc!B22", label: "running the business" },
   assets: { writtenDown: { key: "cell/Fixed Assets!K1", optional: true } },
-  tax: { key: `cell/${TAX_SHEET}!E17`, label: "income tax and Class 4 NI" },
+  tax: { key: `cell/${TAX_SHEET}!E17`, label: "income tax and Class 4 NI", subtitle: "income tax and Class 4 NI, less CIS" },
   pieLines: [
     ["cell/Profit & Loss Acc!B6", "Fuel"],
     ["cell/Profit & Loss Acc!B7", "Car hire"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diy-accounting-uk/diya-gl",
-  "version": "1.2.53",
+  "version": "1.2.55",
   "type": "module",
   "description": "Recalculate, read and write DIYA-GL books from the command line",
   "license": "Apache-2.0",