@fin.cx/compatibility 3.0.0 → 4.1.0

package/dist_ts/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@fin.cx/compatibility',
-    version: '3.0.0',
+    version: '4.1.0',
     description: 'Exchange formats of third-party accounting systems: the EXTF Buchungsstapel in Windows-1252 on the rows of @fin.cx/skr, and the document-image archive (document.xml and ZIP)'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx1QkFBdUI7SUFDN0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLCtLQUErSztDQUM3TCxDQUFBIn0=

package/dist_ts/error.d.ts

@@ -1,10 +1,14 @@
 /**
  * Why an exchange file could not be written:
- * - `invalid_bookings`: a draft the account policy refuses; the message names it;
+ * - `invalid_bookings`: a draft the account policy refuses, the message names it; or a general reversal among the
+ *   bookings handed over to a correction Buchungsstapel (a correction file passed as the state handed over);
  * - `export_failed`: the conversion into rows failed;
- * - `invalid_documents`: a document of a document-image archive DATEV does not take (its GUID, its format), or none.
+ * - `invalid_documents`: a document of a document-image archive DATEV does not take (its GUID, its format), or none;
+ * - `nothing_to_correct`: a correction Buchungsstapel whose current bookings are the ones handed over;
+ * - `handed_over_cost_centres_unknown`: a correction of a period whose bookings handed over include one whose cost
+ *   centres its record does not state (stored before 4.1) and no rows sent were given; the message names it.
  */
-export type TCompatibilityErrorCode = 'invalid_bookings' | 'export_failed' | 'invalid_documents';
+export type TCompatibilityErrorCode = 'invalid_bookings' | 'export_failed' | 'invalid_documents' | 'nothing_to_correct' | 'handed_over_cost_centres_unknown';
 export declare class CompatibilityError extends Error {
     readonly code: TCompatibilityErrorCode;
     constructor(codeArg: TCompatibilityErrorCode, messageArg: string);

package/dist_ts/error.js

@@ -5,4 +5,4 @@ export class CompatibilityError extends Error {
         this.code = codeArg;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9lcnJvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFRQSxNQUFNLE9BQU8sa0JBQW1CLFNBQVEsS0FBSztJQUczQyxZQUFZLE9BQWdDLEVBQUUsVUFBa0I7UUFDOUQsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2xCLElBQUksQ0FBQyxJQUFJLEdBQUcsb0JBQW9CLENBQUM7UUFDakMsSUFBSSxDQUFDLElBQUksR0FBRyxPQUFPLENBQUM7SUFDdEIsQ0FBQztDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9lcnJvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFZQSxNQUFNLE9BQU8sa0JBQW1CLFNBQVEsS0FBSztJQUczQyxZQUFZLE9BQWdDLEVBQUUsVUFBa0I7UUFDOUQsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2xCLElBQUksQ0FBQyxJQUFJLEdBQUcsb0JBQW9CLENBQUM7UUFDakMsSUFBSSxDQUFDLElBQUksR0FBRyxPQUFPLENBQUM7SUFDdEIsQ0FBQztDQUNGIn0=

package/dist_ts/extf/index.d.ts

@@ -21,14 +21,29 @@ export interface IExportBooking {
     text: string;
     /** the document GUID the row links to (field 20, `BEDI "GUID"`) */
     documentGuid?: string;
+    /**
+     * The cost centres of the row (fields 37 and 38, KOST1 and KOST2), empty where it states none. `bookingsOfRows`
+     * records both on every booking; a booking stored before 4.1 has neither, although the row sent stated them: its
+     * cost centres are not known. `differingBookingCount` compares it without them; a correction refuses it
+     * (`handed_over_cost_centres_unknown`) unless it is given the rows sent (`handedOverRows`).
+     */
+    kost1?: string;
+    kost2?: string;
+    /**
+     * The row is a general reversal (field 118 "Generalumkehr", written "1"): it takes back the booking of the same
+     * fields on DATEV's side. Absent on an ordinary row.
+     */
+    generalumkehr?: true;
 }
 /** The bookings of rows, in their order. */
 export declare const bookingsOfRows: (rowsArg: readonly IDatevBuchungsstapelRow[]) => IExportBooking[];
 /**
  * How many rows two Buchungsstapel of one period do not share, compared on
- * what a booking says (its day, amount, side, accounts, BU key and Belegfeld
- * 1) and not on its wording or its document link. The rows are compared as a
- * multiset: a row that stands twice in one and once in the other differs once.
+ * what a booking says (its day, amount, side, accounts, BU key, Belegfeld 1,
+ * cost centres, and whether it is a general reversal) and not on its wording or its document link. The rows are
+ * compared as a multiset: a row that stands twice in one and once in the other differs once. A booking stored before
+ * 4.1, which does not record its cost centres, never differs on them (`pairBookings`); compare `bookingsOfRows` of
+ * the rows sent for an answer that counts them.
  */
 export declare const differingBookingCount: (leftArg: readonly IExportBooking[], rightArg: readonly IExportBooking[]) => number;
 /**
@@ -88,3 +103,71 @@ export interface IBuchungsstapelFile {
 }
 /** Writes a Buchungsstapel: the rows of the drafts, the header and the caption row, encoded in Windows-1252. */
 export declare const writeBuchungsstapel: (optionsArg: IBuchungsstapelOptions) => IBuchungsstapelFile;
+/**
+ * The row a booking handed over was written as, for a general reversal of it: every field the booking keeps
+ * (`IExportBooking`) in its place, the Belegdatum at midnight UTC as the writer reads it.
+ */
+export declare const rowOfBooking: (bookingArg: IExportBooking) => IDatevBuchungsstapelRow;
+/**
+ * What a correction of a period handed over changes, compared as `differingBookingCount` compares: the bookings
+ * handed over that the current ones no longer hold (`reversed`, each once for each time it is missing), the ones they
+ * still hold (`kept`, as they were handed over) and the current rows the bookings handed over do not hold (`added`),
+ * each in its order. A booking that stands in both is kept: a changed text or document link is no changed booking,
+ * a changed cost centre is. A booking handed over whose cost centres its record does not state (stored before 4.1)
+ * is refused (`handed_over_cost_centres_unknown`): pass `bookingsOfRows` of the rows sent instead.
+ */
+export declare const correctionOf: (handedOverArg: readonly IExportBooking[], currentArg: readonly IDatevBuchungsstapelRow[]) => {
+    reversed: IExportBooking[];
+    kept: IExportBooking[];
+    added: IDatevBuchungsstapelRow[];
+};
+/**
+ * The state of a period handed over, given once: the bookings stored of it (`handedOver`) or the rows of the Stapel
+ * sent (`handedOverRows`). A general reversal in it is refused: the state handed over is compared, not a correction
+ * file.
+ */
+export interface ICorrectionBuchungsstapelOptions {
+    /**
+     * The bookings of the period as they were handed over, as a whole: the bookings of its Buchungsstapel as stored
+     * (`IBuchungsstapelFile.bookings`), or after a correction the period's bookings as that correction left them
+     * (`bookingsAfter`). Each must state its cost centres: one stored before 4.1 does not, and is refused
+     * (`handed_over_cost_centres_unknown`); pass the rows sent for it.
+     */
+    handedOver?: readonly IExportBooking[];
+    /**
+     * The rows of the Buchungsstapel as it was sent: the transmitted file read back (`@fin.cx/skr`
+     * `readExtfBuchungsstapel(bytes).rows`, skr 6.1.0 and later) or the rows written (`IBuchungsstapelFile.rows`). What
+     * DATEV received, cost centres (fields 37 and 38) included, so a reversal mirrors it exactly. For a Stapel whose
+     * bookings were stored before 4.1.
+     */
+    handedOverRows?: readonly IDatevBuchungsstapelRow[];
+    /** the period's drafts as they stand now */
+    drafts: readonly plugins.skrCore.IJournalDraft[];
+    /** the policy the drafts are checked against */
+    policy: plugins.skrCore.IAccountPolicy;
+    /** the header of the file: the same period (`dateFrom`, `dateTo`) as the Stapel handed over, a label of its own */
+    header: IDatevExtfHeaderOptions;
+    filename: string;
+}
+export interface ICorrectionBuchungsstapelFile extends IBuchungsstapelFile {
+    /** the bookings handed over it takes back, each written as a general reversal */
+    reversed: IExportBooking[];
+    /** the rows it books anew */
+    added: IDatevBuchungsstapelRow[];
+    /**
+     * The period's bookings as DATEV holds them after this correction: each booking handed over that it keeps, as it
+     * was handed over (its text and document link too), then the rows it books anew. What the next correction is
+     * compared against.
+     */
+    bookingsAfter: IExportBooking[];
+}
+/**
+ * Writes the correction Buchungsstapel of a period handed over whose bookings changed since: only what changed. Each
+ * booking handed over that the drafts no longer hold is written again with field 118 "Generalumkehr" set, so DATEV
+ * takes it back on its side and day, and each row the drafts hold that was not handed over is written as it is; rows
+ * in both are not written. Every row keeps its Belegdatum, so it counts in the period it belongs to. A booking handed
+ * over is never changed or replaced (§ 146 Abs. 4 AO): it is taken back and booked anew. Throws `nothing_to_correct`
+ * when nothing changed; `invalid_bookings` for a general reversal in the state handed over, or for a state given
+ * twice or not at all; `handed_over_cost_centres_unknown` for a booking whose cost centres are not known.
+ */
+export declare const writeCorrectionBuchungsstapel: (optionsArg: ICorrectionBuchungsstapelOptions) => ICorrectionBuchungsstapelFile;

package/dist_ts/extf/index.js

@@ -20,33 +20,94 @@ export const bookingsOfRows = (rowsArg) => rowsArg.map((rowArg) => ({
     ...(rowArg.belegfeld2 ? { belegfeld2: rowArg.belegfeld2 } : {}),
     text: rowArg.buchungstext,
     ...(rowArg.belegLink ? { documentGuid: guidOfLink(rowArg.belegLink) } : {}),
+    // recorded on every booking, empty where the row states none: a booking without them was stored before 4.1
+    kost1: rowArg.kost1 ?? '',
+    kost2: rowArg.kost2 ?? '',
+    ...(rowArg.generalumkehr === true ? { generalumkehr: true } : {}),
 }));
 /**
- * How many rows two Buchungsstapel of one period do not share, compared on
- * what a booking says (its day, amount, side, accounts, BU key and Belegfeld
- * 1) and not on its wording or its document link. The rows are compared as a
- * multiset: a row that stands twice in one and once in the other differs once.
+ * What a booking says, as two Stapel of one period are compared, apart from its cost centres: its day, amount, side,
+ * accounts, BU key, Belegfeld 1 and whether it is a general reversal, not its wording or document link. A reversal
+ * never matches an ordinary row.
  */
-export const differingBookingCount = (leftArg, rightArg) => {
-    const keyOf = (bookingArg) => [bookingArg.date, bookingArg.umsatzCents, bookingArg.sollHaben, bookingArg.konto, bookingArg.gegenkonto, bookingArg.buKey, bookingArg.belegfeld1 ?? ''].join('|');
-    const unmatched = new Map();
-    for (const booking of leftArg) {
-        unmatched.set(keyOf(booking), (unmatched.get(keyOf(booking)) ?? 0) + 1);
-    }
-    let differing = 0;
-    for (const booking of rightArg) {
-        const left = unmatched.get(keyOf(booking)) ?? 0;
-        if (left > 0) {
-            unmatched.set(keyOf(booking), left - 1);
+const baseKeyOf = (bookingArg) => JSON.stringify([
+    bookingArg.date,
+    bookingArg.umsatzCents,
+    bookingArg.sollHaben,
+    bookingArg.konto,
+    bookingArg.gegenkonto,
+    bookingArg.buKey,
+    bookingArg.belegfeld1 ?? '',
+    bookingArg.generalumkehr ? 'GU' : '',
+]);
+/** Whether a booking records its cost centres: every booking read from rows since 4.1 does, one stored before does not. */
+const recordsCostCentres = (bookingArg) => bookingArg.kost1 !== undefined || bookingArg.kost2 !== undefined;
+/** What a booking that records its cost centres says, the cost centres included. */
+const fullKeyOf = (bookingArg) => JSON.stringify([baseKeyOf(bookingArg), bookingArg.kost1 ?? '', bookingArg.kost2 ?? '']);
+/**
+ * Pairs the bookings of two Stapel of one period that say the same, as a multiset: two bookings that record their
+ * cost centres pair on every key field, the cost centres included, so a changed cost centre is a changed booking. A
+ * booking that does not record them (stored before 4.1, although the row sent stated them) pairs with any booking of
+ * the same other key fields: its record says nothing of them, so they never make it differ. Unpaired recorded bookings take the
+ * unrecorded ones of the other side first, which pair with anything, so as many pairs as possible are made.
+ */
+const pairBookings = (leftArg, rightArg) => {
+    const leftPaired = leftArg.map(() => false);
+    const rightPaired = rightArg.map(() => false);
+    const take = (queuesArg, keyArg) => queuesArg.get(keyArg)?.shift();
+    const queue = (queuesArg, keyArg, indexArg) => {
+        queuesArg.set(keyArg, [...(queuesArg.get(keyArg) ?? []), indexArg]);
+    };
+    // recorded with recorded, on every key field
+    const recordedRight = new Map();
+    rightArg.forEach((bookingArg, indexArg) => {
+        if (recordsCostCentres(bookingArg)) {
+            queue(recordedRight, fullKeyOf(bookingArg), indexArg);
         }
-        else {
-            differing += 1;
+    });
+    leftArg.forEach((bookingArg, indexArg) => {
+        const paired = recordsCostCentres(bookingArg) ? take(recordedRight, fullKeyOf(bookingArg)) : undefined;
+        if (paired !== undefined) {
+            leftPaired[indexArg] = true;
+            rightPaired[paired] = true;
         }
-    }
-    for (const left of unmatched.values()) {
-        differing += left;
-    }
-    return differing;
+    });
+    // what is left, on the key fields without the cost centres, where one of the two does not record them
+    const unrecordedRight = new Map();
+    const openRecordedRight = new Map();
+    rightArg.forEach((bookingArg, indexArg) => {
+        if (!rightPaired[indexArg]) {
+            queue(recordsCostCentres(bookingArg) ? openRecordedRight : unrecordedRight, baseKeyOf(bookingArg), indexArg);
+        }
+    });
+    const pairLeft = (recordedArg) => {
+        leftArg.forEach((bookingArg, indexArg) => {
+            if (leftPaired[indexArg] || recordsCostCentres(bookingArg) !== recordedArg) {
+                return;
+            }
+            const key = baseKeyOf(bookingArg);
+            const paired = recordedArg ? take(unrecordedRight, key) : take(openRecordedRight, key) ?? take(unrecordedRight, key);
+            if (paired !== undefined) {
+                leftPaired[indexArg] = true;
+                rightPaired[paired] = true;
+            }
+        });
+    };
+    pairLeft(true);
+    pairLeft(false);
+    return { leftPaired, rightPaired };
+};
+/**
+ * How many rows two Buchungsstapel of one period do not share, compared on
+ * what a booking says (its day, amount, side, accounts, BU key, Belegfeld 1,
+ * cost centres, and whether it is a general reversal) and not on its wording or its document link. The rows are
+ * compared as a multiset: a row that stands twice in one and once in the other differs once. A booking stored before
+ * 4.1, which does not record its cost centres, never differs on them (`pairBookings`); compare `bookingsOfRows` of
+ * the rows sent for an answer that counts them.
+ */
+export const differingBookingCount = (leftArg, rightArg) => {
+    const { leftPaired, rightPaired } = pairBookings(leftArg, rightArg);
+    return [...leftPaired, ...rightPaired].filter((pairedArg) => !pairedArg).length;
 };
 /**
  * Checks every draft against the account policy and turns the drafts into
@@ -109,10 +170,9 @@ export const replacedCharactersOfRows = (rowsArg) => {
     });
     return replacements;
 };
-/** Writes a Buchungsstapel: the rows of the drafts, the header and the caption row, encoded in Windows-1252. */
-export const writeBuchungsstapel = (optionsArg) => {
-    const rows = datevRowsOf(optionsArg.drafts, optionsArg.policy);
-    const { csv } = plugins.skrCore.writeExtfBuchungsstapel(rows, optionsArg.header);
+/** The file of rows: the header and the caption row, the rows, encoded in Windows-1252, with where each character stands. */
+const fileOfRows = (rows, headerArg, filenameArg) => {
+    const { csv } = plugins.skrCore.writeExtfBuchungsstapel(rows, headerArg);
     const { bytes, replaced } = encodeWindows1252(csv);
     // the file is the header line, the caption line and one line per row, each ending in CRLF (`writeExtfBuchungsstapel`)
     const rowLines = rows.map((rowArg) => plugins.skrCore.datevRowFields(rowArg));
@@ -137,6 +197,86 @@ export const writeBuchungsstapel = (optionsArg) => {
         }
         return { ...replacedArg, row, field: fieldAt(fieldStartsOf(rowLines[row]), replacedArg.offset - lineStarts[row]) };
     });
-    return { filename: optionsArg.filename, csv, bytes, rows, bookings: bookingsOfRows(rows), replacedCharacters };
+    return { filename: filenameArg, csv, bytes, rows, bookings: bookingsOfRows(rows), replacedCharacters };
+};
+/** Writes a Buchungsstapel: the rows of the drafts, the header and the caption row, encoded in Windows-1252. */
+export const writeBuchungsstapel = (optionsArg) => fileOfRows(datevRowsOf(optionsArg.drafts, optionsArg.policy), optionsArg.header, optionsArg.filename);
+/**
+ * The row a booking handed over was written as, for a general reversal of it: every field the booking keeps
+ * (`IExportBooking`) in its place, the Belegdatum at midnight UTC as the writer reads it.
+ */
+export const rowOfBooking = (bookingArg) => ({
+    umsatzCents: bookingArg.umsatzCents,
+    sollHaben: bookingArg.sollHaben,
+    konto: bookingArg.konto,
+    gegenKonto: bookingArg.gegenkonto,
+    buSchluessel: bookingArg.buKey,
+    belegDatum: new Date(`${bookingArg.date}T00:00:00.000Z`),
+    ...(bookingArg.belegfeld1 ? { belegfeld1: bookingArg.belegfeld1 } : {}),
+    ...(bookingArg.belegfeld2 ? { belegfeld2: bookingArg.belegfeld2 } : {}),
+    buchungstext: bookingArg.text,
+    ...(bookingArg.documentGuid ? { belegLink: bookingArg.documentGuid } : {}),
+    ...(bookingArg.kost1 ? { kost1: bookingArg.kost1 } : {}),
+    ...(bookingArg.kost2 ? { kost2: bookingArg.kost2 } : {}),
+    festschreibung: false,
+    ...(bookingArg.generalumkehr ? { generalumkehr: true } : {}),
+});
+/** A booking as a refusal names it: its place among the bookings handed over, day, amount, side, accounts and Belegfeld 1. */
+const bookingNameOf = (bookingArg, indexArg) => `booking ${indexArg + 1} (${bookingArg.date}, ${bookingArg.umsatzCents} ${bookingArg.sollHaben} ${bookingArg.konto}/${bookingArg.gegenkonto}`
+    + `${bookingArg.belegfeld1 ? `, Belegfeld 1 ${bookingArg.belegfeld1}` : ''})`;
+/**
+ * Refuses a state handed over that holds a booking whose cost centres its record does not state (stored before 4.1).
+ * The Stapel sent stated them (fields 37 and 38), so DATEV holds them: whether the booking must be taken back turns on
+ * them, and a reversal that does not state them would leave them standing in DATEV's cost accounting. The rows sent
+ * tell them (`handedOverRows`).
+ */
+const refuseCostCentresUnknown = (handedOverArg) => {
+    const unknown = handedOverArg.findIndex((bookingArg) => !recordsCostCentres(bookingArg));
+    if (unknown >= 0) {
+        throw new CompatibilityError('handed_over_cost_centres_unknown', `${bookingNameOf(handedOverArg[unknown], unknown)} was stored without the cost centres it was sent with; pass the rows of the Stapel sent (handedOverRows)`);
+    }
+};
+/**
+ * What a correction of a period handed over changes, compared as `differingBookingCount` compares: the bookings
+ * handed over that the current ones no longer hold (`reversed`, each once for each time it is missing), the ones they
+ * still hold (`kept`, as they were handed over) and the current rows the bookings handed over do not hold (`added`),
+ * each in its order. A booking that stands in both is kept: a changed text or document link is no changed booking,
+ * a changed cost centre is. A booking handed over whose cost centres its record does not state (stored before 4.1)
+ * is refused (`handed_over_cost_centres_unknown`): pass `bookingsOfRows` of the rows sent instead.
+ */
+export const correctionOf = (handedOverArg, currentArg) => {
+    refuseCostCentresUnknown(handedOverArg);
+    const { leftPaired, rightPaired } = pairBookings(handedOverArg, bookingsOfRows(currentArg));
+    return {
+        reversed: handedOverArg.filter((_bookingArg, indexArg) => !leftPaired[indexArg]),
+        kept: handedOverArg.filter((_bookingArg, indexArg) => leftPaired[indexArg]),
+        added: currentArg.filter((_rowArg, indexArg) => !rightPaired[indexArg]),
+    };
+};
+/**
+ * Writes the correction Buchungsstapel of a period handed over whose bookings changed since: only what changed. Each
+ * booking handed over that the drafts no longer hold is written again with field 118 "Generalumkehr" set, so DATEV
+ * takes it back on its side and day, and each row the drafts hold that was not handed over is written as it is; rows
+ * in both are not written. Every row keeps its Belegdatum, so it counts in the period it belongs to. A booking handed
+ * over is never changed or replaced (§ 146 Abs. 4 AO): it is taken back and booked anew. Throws `nothing_to_correct`
+ * when nothing changed; `invalid_bookings` for a general reversal in the state handed over, or for a state given
+ * twice or not at all; `handed_over_cost_centres_unknown` for a booking whose cost centres are not known.
+ */
+export const writeCorrectionBuchungsstapel = (optionsArg) => {
+    const handedOver = optionsArg.handedOverRows !== undefined ? bookingsOfRows(optionsArg.handedOverRows) : optionsArg.handedOver;
+    if (handedOver === undefined || (optionsArg.handedOver !== undefined && optionsArg.handedOverRows !== undefined)) {
+        throw new CompatibilityError('invalid_bookings', 'pass the state handed over once: the bookings stored (handedOver) or the rows sent (handedOverRows)');
+    }
+    const reversal = handedOver.findIndex((bookingArg) => bookingArg.generalumkehr === true);
+    if (reversal >= 0) {
+        throw new CompatibilityError('invalid_bookings', `the state handed over holds a general reversal (booking ${reversal + 1}); pass the period's bookings as they stood, not a correction file`);
+    }
+    const current = datevRowsOf(optionsArg.drafts, optionsArg.policy);
+    const { reversed, kept, added } = correctionOf(handedOver, current);
+    if (reversed.length === 0 && added.length === 0) {
+        throw new CompatibilityError('nothing_to_correct', 'the bookings of the period are the ones handed over; there is nothing to correct');
+    }
+    const rows = [...reversed.map((bookingArg) => ({ ...rowOfBooking(bookingArg), generalumkehr: true })), ...added];
+    return { ...fileOfRows(rows, optionsArg.header, optionsArg.filename), reversed, added, bookingsAfter: [...kept, ...bookingsOfRows(added)] };
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/extf/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/extf/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAA2B,MAAM,sBAAsB,CAAC;AAElF,OAAO,EAAE,kBAAkB,EAAgC,MAAM,aAAa,CAAC;AAK/E,sFAAsF;AACtF,MAAM,CAAC,MAAM,iBAAiB,GAAG,gCAAgC,CAAC;AAElE,wFAAwF;AACxF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,QAAgB,EAAU,EAAE,CAAC,uBAAuB,QAAQ,MAAM,CAAC;AA+BhG,0EAA0E;AAC1E,MAAM,UAAU,GAAG,CAAC,OAAe,EAAU,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AAElH,4CAA4C;AAC5C,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAA2C,EAAoB,EAAE,CAC9F,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC,WAAW;IAC/B,SAAS,EAAE,MAAM,CAAC,SAAS;IAC3B,KAAK,EAAE,MAAM,CAAC,KAAK;IACnB,UAAU,EAAE,MAAM,CAAC,UAAU;IAC7B,KAAK,EAAE,MAAM,CAAC,YAAY;IAC1B,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;IAClD,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/D,IAAI,EAAE,MAAM,CAAC,YAAY;IACzB,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3E,2GAA2G;IAC3G,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE;IACzB,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE;IACzB,GAAG,CAAC,MAAM,CAAC,aAAa,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;CAC3E,CAAC,CAAC,CAAC;AAEN;;;;GAIG;AACH,MAAM,SAAS,GAAG,CAAC,UAA0B,EAAU,EAAE,CACvD,IAAI,CAAC,SAAS,CAAC;IACb,UAAU,CAAC,IAAI;IACf,UAAU,CAAC,WAAW;IACtB,UAAU,CAAC,SAAS;IACpB,UAAU,CAAC,KAAK;IAChB,UAAU,CAAC,UAAU;IACrB,UAAU,CAAC,KAAK;IAChB,UAAU,CAAC,UAAU,IAAI,EAAE;IAC3B,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;CACrC,CAAC,CAAC;AAEL,2HAA2H;AAC3H,MAAM,kBAAkB,GAAG,CAAC,UAA0B,EAAW,EAAE,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,IAAI,UAAU,CAAC,KAAK,KAAK,SAAS,CAAC;AAErI,oFAAoF;AACpF,MAAM,SAAS,GAAG,CAAC,UAA0B,EAAU,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC,KAAK,IAAI,EAAE,EAAE,UAAU,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;AAElJ;;;;;;GAMG;AACH,MAAM,YAAY,GAAG,CACnB,OAAkC,EAClC,QAAmC,EACgB,EAAE;IACrD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,CAAC,SAAgC,EAAE,MAAc,EAAsB,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;IACtH,MAAM,KAAK,GAAG,CAAC,SAAgC,EAAE,MAAc,EAAE,QAAgB,EAAQ,EAAE;QACzF,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC;IACF,6CAA6C;IAC7C,MAAM,aAAa,GAAG,IAAI,GAAG,EAAoB,CAAC;IAClD,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;QACxC,IAAI,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;YACnC,KAAK,CAAC,aAAa,EAAE,SAAS,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAC;QACxD,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;QACvC,MAAM,MAAM,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACvG,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,UAAU,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;YAC5B,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC,CAAC;IACH,sGAAsG;IACtG,MAAM,eAAe,GAAG,IAAI,GAAG,EAAoB,CAAC;IACpD,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAoB,CAAC;IACtD,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;QACxC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3B,KAAK,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,eAAe,EAAE,SAAS,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC/G,CAAC;IACH,CAAC,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,CAAC,WAAoB,EAAQ,EAAE;QAC9C,OAAO,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;YACvC,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,kBAAkB,CAAC,UAAU,CAAC,KAAK,WAAW,EAAE,CAAC;gBAC3E,OAAO;YACT,CAAC;YACD,MAAM,GAAG,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;YAClC,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YACrH,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,UAAU,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;gBAC5B,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;YAC7B,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IACF,QAAQ,CAAC,IAAI,CAAC,CAAC;IACf,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChB,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC;AACrC,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,OAAkC,EAAE,QAAmC,EAAU,EAAE;IACvH,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACpE,OAAO,CAAC,GAAG,UAAU,EAAE,GAAG,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;AAClF,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,SAAmD,EAAE,SAAyC,EAA6B,EAAE;IACvJ,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;QAC9B,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC1E,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YACtB,MAAM,IAAI,kBAAkB,CAAC,kBAAkB,EAAE,UAAU,KAAK,CAAC,WAAW,MAAM,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpH,CAAC;IACH,CAAC;IACD,IAAI,CAAC;QACH,yGAAyG;QACzG,OAAO,OAAO,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,GAAG,SAAS,CAAC,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAChH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,kBAAkB,CAAC,eAAe,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACxG,CAAC;AACH,CAAC,CAAC;AAiCF;;;;GAIG;AACH,MAAM,aAAa,GAAG,CAAC,SAA4B,EAAY,EAAE;IAC/D,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7B,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,SAA4B,EAAE,SAAiB,EAAU,EAAE;IAC1E,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,OAAO,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,SAAS,EAAE,CAAC;QACzE,KAAK,IAAI,CAAC,CAAC;IACb,CAAC;IACD,OAAO,KAAK,GAAG,CAAC,CAAC;AACnB,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,OAA2C,EAAqB,EAAE;IACzG,MAAM,YAAY,GAAsB,EAAE,CAAC;IAC3C,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;QACnC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;QACrC,KAAK,MAAM,QAAQ,IAAI,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YACpE,YAAY,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;QAC/G,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAcF,6HAA6H;AAC7H,MAAM,UAAU,GAAG,CAAC,IAA+B,EAAE,SAAkC,EAAE,WAAmB,EAAuB,EAAE;IACnI,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACzE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACnD,sHAAsH;IACtH,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9E,MAAM,CAAC,UAAU,GAAG,EAAE,EAAE,WAAW,GAAG,EAAE,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACjE,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;IACjE,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,IAAI,MAAM,GAAG,SAAS,CAAC;IACvB,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC9B,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxB,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IACxC,CAAC;IACD,IAAI,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QAChL,MAAM,IAAI,kBAAkB,CAAC,eAAe,EAAE,8EAA8E,CAAC,CAAC;IAChI,CAAC;IACD,MAAM,kBAAkB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,WAAW,EAA8B,EAAE;QAClF,IAAI,WAAW,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC;YACnC,OAAO,EAAE,GAAG,WAAW,EAAE,CAAC;QAC5B,CAAC;QACD,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,OAAO,GAAG,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;YAChF,GAAG,IAAI,CAAC,CAAC;QACX,CAAC;QACD,OAAO,EAAE,GAAG,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;IACrH,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,CAAC,IAAI,CAAC,EAAE,kBAAkB,EAAE,CAAC;AACzG,CAAC,CAAC;AAEF,gHAAgH;AAChH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,UAAkC,EAAuB,EAAE,CAC7F,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;AAExG;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,UAA0B,EAA2B,EAAE,CAAC,CAAC;IACpF,WAAW,EAAE,UAAU,CAAC,WAAW;IACnC,SAAS,EAAE,UAAU,CAAC,SAAS;IAC/B,KAAK,EAAE,UAAU,CAAC,KAAK;IACvB,UAAU,EAAE,UAAU,CAAC,UAAU;IACjC,YAAY,EAAE,UAAU,CAAC,KAAgD;IACzE,UAAU,EAAE,IAAI,IAAI,CAAC,GAAG,UAAU,CAAC,IAAI,gBAAgB,CAAC;IACxD,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACvE,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACvE,YAAY,EAAE,UAAU,CAAC,IAAI;IAC7B,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1E,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACxD,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACxD,cAAc,EAAE,KAAK;IACrB,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;CAC7D,CAAC,CAAC;AAEH,8HAA8H;AAC9H,MAAM,aAAa,GAAG,CAAC,UAA0B,EAAE,QAAgB,EAAU,EAAE,CAC7E,WAAW,QAAQ,GAAG,CAAC,KAAK,UAAU,CAAC,IAAI,KAAK,UAAU,CAAC,WAAW,IAAI,UAAU,CAAC,SAAS,IAAI,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,UAAU,EAAE;MAC3I,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;AAEhF;;;;;GAKG;AACH,MAAM,wBAAwB,GAAG,CAAC,aAAwC,EAAQ,EAAE;IAClF,MAAM,OAAO,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;IACzF,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;QACjB,MAAM,IAAI,kBAAkB,CAC1B,kCAAkC,EAClC,GAAG,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,0GAA0G,CAC5J,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,aAAwC,EACxC,UAA8C,EAC4C,EAAE;IAC5F,wBAAwB,CAAC,aAAa,CAAC,CAAC;IACxC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC,aAAa,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC5F,OAAO;QACL,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAChF,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC3E,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;KACxE,CAAC;AACJ,CAAC,CAAC;AA4CF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,UAA4C,EAAiC,EAAE;IAC3H,MAAM,UAAU,GAAG,UAAU,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;IAC/H,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,UAAU,CAAC,UAAU,KAAK,SAAS,IAAI,UAAU,CAAC,cAAc,KAAK,SAAS,CAAC,EAAE,CAAC;QACjH,MAAM,IAAI,kBAAkB,CAAC,kBAAkB,EAAE,qGAAqG,CAAC,CAAC;IAC1J,CAAC;IACD,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,KAAK,IAAI,CAAC,CAAC;IACzF,IAAI,QAAQ,IAAI,CAAC,EAAE,CAAC;QAClB,MAAM,IAAI,kBAAkB,CAAC,kBAAkB,EAAE,2DAA2D,QAAQ,GAAG,CAAC,oEAAoE,CAAC,CAAC;IAChM,CAAC;IACD,MAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAClE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACpE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,kBAAkB,CAAC,oBAAoB,EAAE,kFAAkF,CAAC,CAAC;IACzI,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,YAAY,CAAC,UAAU,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC;IACjH,OAAO,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;AAC9I,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fin.cx/compatibility",
-  "version": "3.0.0",
+  "version": "4.1.0",
   "private": false,
   "description": "Exchange formats of third-party accounting systems: the EXTF Buchungsstapel in Windows-1252 on the rows of @fin.cx/skr, and the document-image archive (document.xml and ZIP)",
   "main": "dist_ts/index.js",
@@ -42,12 +42,12 @@
   },
   "homepage": "https://code.foss.global/fin.cx/compatibility#readme",
   "dependencies": {
-    "@fin.cx/skr": "^5.2.0",
     "@push.rocks/smartarchive": "^5.4.1"
   },
   "devDependencies": {
+    "@fin.cx/skr": "^6.0.0",
     "@git.zone/tsbuild": "^5.0.0",
-    "@git.zone/tsrun": "^3.0.1",
+    "@git.zone/tsrun": "^3.0.2",
     "@git.zone/tstest": "^6.3.2",
     "@types/node": "^26.6.2"
   },
@@ -57,6 +57,9 @@
     "readme.md",
     "license.md"
   ],
+  "peerDependencies": {
+    "@fin.cx/skr": "^6.0.0"
+  },
   "scripts": {
     "test": "(tstest test/ --verbose)",
     "build": "(tsbuild)",

package/readme.md

@@ -14,9 +14,11 @@ For reporting bugs, issues, or security vulnerabilities, please visit [community
 ## Install
 
 ```bash
-pnpm install @fin.cx/compatibility
+pnpm install @fin.cx/compatibility @fin.cx/skr
 ```
 
+`@fin.cx/skr` (^6.0.0) is a peer dependency: the drafts and the account policy the EXTF writer takes are built by your copy of skr, and the writer turns them into rows with the same copy, so the rows follow the chart the drafts were booked on (which accounts are Automatikkonten, which carry VAT). A second copy of skr of another major would write rows by another chart; a package manager that finds your skr outside the range says so as an unmet peer.
+
 ## Usage
 
 ```typescript
@@ -50,7 +52,10 @@ file.replacedCharacters; // [{ offset, character: 'ő', row: 1, field: 14 }, …
 - **A draft the account policy refuses** throws `CompatibilityError` with code `invalid_bookings` and a message naming the draft.
 - **A failed conversion** throws code `export_failed`.
 - **A document-image archive DATEV would not take** (no document, a GUID of another form, a format it does not take) throws code `invalid_documents`.
-- **`differingBookingCount(left, right)`** counts the rows two Stapel of one period do not share. It compares each booking's day, amount, side, accounts, BU key and Belegfeld 1, as a multiset, and ignores wording and document links.
+- **`differingBookingCount(left, right)`** counts the rows two Stapel of one period do not share. It compares each booking's day, amount, side, accounts, BU key, Belegfeld 1, cost centres (KOST1, KOST2) and whether it is a general reversal, as a multiset, and ignores wording and document links. A booking stored before 4.1 has no cost-centre fields: its record says nothing of them, and they never make it differ; compare `bookingsOfRows` of the rows sent for an answer that counts them.
+- **A correction of a period handed over.** `writeCorrectionBuchungsstapel({ handedOver, drafts, policy, header, filename })` writes only what changed since the state handed over: each booking handed over that the drafts no longer hold is written again with field 118 "Generalumkehr" set, so DATEV takes it back on its own side and day, then each row of the drafts that was not handed over; what stands in both is not written. A changed text or document link is no change; a changed cost centre is, so the booking is taken back on the cost centre DATEV received and booked on the new one. Every row keeps its Belegdatum, so it counts in the period it belongs to; a booking handed over is never replaced (§ 146 Abs. 4 AO), which also holds once DATEV has fixed the period (Festschreibung). The file names what it takes back (`reversed`), what it books (`added`) and the bookings after it (`bookingsAfter`: each booking it keeps as it was handed over, text and document link included, then the new rows). `correctionOf(handedOver, rows)` gives `reversed`, `kept` and `added` without a file, and `rowOfBooking(booking)` the row a booking was written as.
+- **The state handed over** is given once: the bookings stored of it (`handedOver`: the bookings of its Buchungsstapel as 4.1 records them, or the last correction's `bookingsAfter`), or the rows of the Stapel as it was sent (`handedOverRows`: the transmitted file read back with `@fin.cx/skr` `readExtfBuchungsstapel(bytes).rows`, skr 6.1.0 and later, or the `rows` of the file written). A booking stored before 4.1 has no cost-centre fields, although the Stapel sent stated them (fields 37 and 38): a correction refuses it with code `handed_over_cost_centres_unknown`, naming it, since whether it must be taken back turns on the cost centres DATEV holds and a reversal without them would not mirror it; pass `handedOverRows` for such a period. Nothing changed is refused with `nothing_to_correct`; a general reversal in the state handed over (a correction file passed as the state), or a state given twice or not at all, with `invalid_bookings`.
+- **A booking keeps its general reversal** (`IExportBooking.generalumkehr`, from field 118) and its cost centres (`kost1`, `kost2`, empty where the row states none).
 
 ```typescript
 import { belegbilder } from '@fin.cx/compatibility';

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@fin.cx/compatibility',
-  version: '3.0.0',
+  version: '4.1.0',
   description: 'Exchange formats of third-party accounting systems: the EXTF Buchungsstapel in Windows-1252 on the rows of @fin.cx/skr, and the document-image archive (document.xml and ZIP)'
 }

package/ts/error.ts

@@ -1,10 +1,14 @@
 /**
  * Why an exchange file could not be written:
- * - `invalid_bookings`: a draft the account policy refuses; the message names it;
+ * - `invalid_bookings`: a draft the account policy refuses, the message names it; or a general reversal among the
+ *   bookings handed over to a correction Buchungsstapel (a correction file passed as the state handed over);
  * - `export_failed`: the conversion into rows failed;
- * - `invalid_documents`: a document of a document-image archive DATEV does not take (its GUID, its format), or none.
+ * - `invalid_documents`: a document of a document-image archive DATEV does not take (its GUID, its format), or none;
+ * - `nothing_to_correct`: a correction Buchungsstapel whose current bookings are the ones handed over;
+ * - `handed_over_cost_centres_unknown`: a correction of a period whose bookings handed over include one whose cost
+ *   centres its record does not state (stored before 4.1) and no rows sent were given; the message names it.
  */
-export type TCompatibilityErrorCode = 'invalid_bookings' | 'export_failed' | 'invalid_documents';
+export type TCompatibilityErrorCode = 'invalid_bookings' | 'export_failed' | 'invalid_documents' | 'nothing_to_correct' | 'handed_over_cost_centres_unknown';
 
 export class CompatibilityError extends Error {
   public readonly code: TCompatibilityErrorCode;

package/ts/extf/index.ts

@@ -27,6 +27,19 @@ export interface IExportBooking {
   text: string;
   /** the document GUID the row links to (field 20, `BEDI "GUID"`) */
   documentGuid?: string;
+  /**
+   * The cost centres of the row (fields 37 and 38, KOST1 and KOST2), empty where it states none. `bookingsOfRows`
+   * records both on every booking; a booking stored before 4.1 has neither, although the row sent stated them: its
+   * cost centres are not known. `differingBookingCount` compares it without them; a correction refuses it
+   * (`handed_over_cost_centres_unknown`) unless it is given the rows sent (`handedOverRows`).
+   */
+  kost1?: string;
+  kost2?: string;
+  /**
+   * The row is a general reversal (field 118 "Generalumkehr", written "1"): it takes back the booking of the same
+   * fields on DATEV's side. Absent on an ordinary row.
+   */
+  generalumkehr?: true;
 }
 
 /** The GUID inside a Beleglink value (`BEDI "GUID"` or the bare GUID). */
@@ -45,34 +58,103 @@ export const bookingsOfRows = (rowsArg: readonly IDatevBuchungsstapelRow[]): IEx
     ...(rowArg.belegfeld2 ? { belegfeld2: rowArg.belegfeld2 } : {}),
     text: rowArg.buchungstext,
     ...(rowArg.belegLink ? { documentGuid: guidOfLink(rowArg.belegLink) } : {}),
+    // recorded on every booking, empty where the row states none: a booking without them was stored before 4.1
+    kost1: rowArg.kost1 ?? '',
+    kost2: rowArg.kost2 ?? '',
+    ...(rowArg.generalumkehr === true ? { generalumkehr: true as const } : {}),
   }));
 
+/**
+ * What a booking says, as two Stapel of one period are compared, apart from its cost centres: its day, amount, side,
+ * accounts, BU key, Belegfeld 1 and whether it is a general reversal, not its wording or document link. A reversal
+ * never matches an ordinary row.
+ */
+const baseKeyOf = (bookingArg: IExportBooking): string =>
+  JSON.stringify([
+    bookingArg.date,
+    bookingArg.umsatzCents,
+    bookingArg.sollHaben,
+    bookingArg.konto,
+    bookingArg.gegenkonto,
+    bookingArg.buKey,
+    bookingArg.belegfeld1 ?? '',
+    bookingArg.generalumkehr ? 'GU' : '',
+  ]);
+
+/** Whether a booking records its cost centres: every booking read from rows since 4.1 does, one stored before does not. */
+const recordsCostCentres = (bookingArg: IExportBooking): boolean => bookingArg.kost1 !== undefined || bookingArg.kost2 !== undefined;
+
+/** What a booking that records its cost centres says, the cost centres included. */
+const fullKeyOf = (bookingArg: IExportBooking): string => JSON.stringify([baseKeyOf(bookingArg), bookingArg.kost1 ?? '', bookingArg.kost2 ?? '']);
+
+/**
+ * Pairs the bookings of two Stapel of one period that say the same, as a multiset: two bookings that record their
+ * cost centres pair on every key field, the cost centres included, so a changed cost centre is a changed booking. A
+ * booking that does not record them (stored before 4.1, although the row sent stated them) pairs with any booking of
+ * the same other key fields: its record says nothing of them, so they never make it differ. Unpaired recorded bookings take the
+ * unrecorded ones of the other side first, which pair with anything, so as many pairs as possible are made.
+ */
+const pairBookings = (
+  leftArg: readonly IExportBooking[],
+  rightArg: readonly IExportBooking[],
+): { leftPaired: boolean[]; rightPaired: boolean[] } => {
+  const leftPaired = leftArg.map(() => false);
+  const rightPaired = rightArg.map(() => false);
+  const take = (queuesArg: Map<string, number[]>, keyArg: string): number | undefined => queuesArg.get(keyArg)?.shift();
+  const queue = (queuesArg: Map<string, number[]>, keyArg: string, indexArg: number): void => {
+    queuesArg.set(keyArg, [...(queuesArg.get(keyArg) ?? []), indexArg]);
+  };
+  // recorded with recorded, on every key field
+  const recordedRight = new Map<string, number[]>();
+  rightArg.forEach((bookingArg, indexArg) => {
+    if (recordsCostCentres(bookingArg)) {
+      queue(recordedRight, fullKeyOf(bookingArg), indexArg);
+    }
+  });
+  leftArg.forEach((bookingArg, indexArg) => {
+    const paired = recordsCostCentres(bookingArg) ? take(recordedRight, fullKeyOf(bookingArg)) : undefined;
+    if (paired !== undefined) {
+      leftPaired[indexArg] = true;
+      rightPaired[paired] = true;
+    }
+  });
+  // what is left, on the key fields without the cost centres, where one of the two does not record them
+  const unrecordedRight = new Map<string, number[]>();
+  const openRecordedRight = new Map<string, number[]>();
+  rightArg.forEach((bookingArg, indexArg) => {
+    if (!rightPaired[indexArg]) {
+      queue(recordsCostCentres(bookingArg) ? openRecordedRight : unrecordedRight, baseKeyOf(bookingArg), indexArg);
+    }
+  });
+  const pairLeft = (recordedArg: boolean): void => {
+    leftArg.forEach((bookingArg, indexArg) => {
+      if (leftPaired[indexArg] || recordsCostCentres(bookingArg) !== recordedArg) {
+        return;
+      }
+      const key = baseKeyOf(bookingArg);
+      const paired = recordedArg ? take(unrecordedRight, key) : take(openRecordedRight, key) ?? take(unrecordedRight, key);
+      if (paired !== undefined) {
+        leftPaired[indexArg] = true;
+        rightPaired[paired] = true;
+      }
+    });
+  };
+  pairLeft(true);
+  pairLeft(false);
+  return { leftPaired, rightPaired };
+};
+
 /**
  * How many rows two Buchungsstapel of one period do not share, compared on
- * what a booking says (its day, amount, side, accounts, BU key and Belegfeld
- * 1) and not on its wording or its document link. The rows are compared as a
- * multiset: a row that stands twice in one and once in the other differs once.
+ * what a booking says (its day, amount, side, accounts, BU key, Belegfeld 1,
+ * cost centres, and whether it is a general reversal) and not on its wording or its document link. The rows are
+ * compared as a multiset: a row that stands twice in one and once in the other differs once. A booking stored before
+ * 4.1, which does not record its cost centres, never differs on them (`pairBookings`); compare `bookingsOfRows` of
+ * the rows sent for an answer that counts them.
  */
 export const differingBookingCount = (leftArg: readonly IExportBooking[], rightArg: readonly IExportBooking[]): number => {
-  const keyOf = (bookingArg: IExportBooking): string =>
-    [bookingArg.date, bookingArg.umsatzCents, bookingArg.sollHaben, bookingArg.konto, bookingArg.gegenkonto, bookingArg.buKey, bookingArg.belegfeld1 ?? ''].join('|');
-  const unmatched = new Map<string, number>();
-  for (const booking of leftArg) {
-    unmatched.set(keyOf(booking), (unmatched.get(keyOf(booking)) ?? 0) + 1);
-  }
-  let differing = 0;
-  for (const booking of rightArg) {
-    const left = unmatched.get(keyOf(booking)) ?? 0;
-    if (left > 0) {
-      unmatched.set(keyOf(booking), left - 1);
-    } else {
-      differing += 1;
-    }
-  }
-  for (const left of unmatched.values()) {
-    differing += left;
-  }
-  return differing;
+  const { leftPaired, rightPaired } = pairBookings(leftArg, rightArg);
+  return [...leftPaired, ...rightPaired].filter((pairedArg) => !pairedArg).length;
 };
 
 /**
@@ -182,10 +264,9 @@ export interface IBuchungsstapelFile {
   replacedCharacters: IBuchungsstapelReplacement[];
 }
 
-/** Writes a Buchungsstapel: the rows of the drafts, the header and the caption row, encoded in Windows-1252. */
-export const writeBuchungsstapel = (optionsArg: IBuchungsstapelOptions): IBuchungsstapelFile => {
-  const rows = datevRowsOf(optionsArg.drafts, optionsArg.policy);
-  const { csv } = plugins.skrCore.writeExtfBuchungsstapel(rows, optionsArg.header);
+/** The file of rows: the header and the caption row, the rows, encoded in Windows-1252, with where each character stands. */
+const fileOfRows = (rows: IDatevBuchungsstapelRow[], headerArg: IDatevExtfHeaderOptions, filenameArg: string): IBuchungsstapelFile => {
+  const { csv } = plugins.skrCore.writeExtfBuchungsstapel(rows, headerArg);
   const { bytes, replaced } = encodeWindows1252(csv);
   // the file is the header line, the caption line and one line per row, each ending in CRLF (`writeExtfBuchungsstapel`)
   const rowLines = rows.map((rowArg) => plugins.skrCore.datevRowFields(rowArg));
@@ -210,5 +291,141 @@ export const writeBuchungsstapel = (optionsArg: IBuchungsstapelOptions): IBuchun
     }
     return { ...replacedArg, row, field: fieldAt(fieldStartsOf(rowLines[row]), replacedArg.offset - lineStarts[row]) };
   });
-  return { filename: optionsArg.filename, csv, bytes, rows, bookings: bookingsOfRows(rows), replacedCharacters };
+  return { filename: filenameArg, csv, bytes, rows, bookings: bookingsOfRows(rows), replacedCharacters };
+};
+
+/** Writes a Buchungsstapel: the rows of the drafts, the header and the caption row, encoded in Windows-1252. */
+export const writeBuchungsstapel = (optionsArg: IBuchungsstapelOptions): IBuchungsstapelFile =>
+  fileOfRows(datevRowsOf(optionsArg.drafts, optionsArg.policy), optionsArg.header, optionsArg.filename);
+
+/**
+ * The row a booking handed over was written as, for a general reversal of it: every field the booking keeps
+ * (`IExportBooking`) in its place, the Belegdatum at midnight UTC as the writer reads it.
+ */
+export const rowOfBooking = (bookingArg: IExportBooking): IDatevBuchungsstapelRow => ({
+  umsatzCents: bookingArg.umsatzCents,
+  sollHaben: bookingArg.sollHaben,
+  konto: bookingArg.konto,
+  gegenKonto: bookingArg.gegenkonto,
+  buSchluessel: bookingArg.buKey as IDatevBuchungsstapelRow['buSchluessel'],
+  belegDatum: new Date(`${bookingArg.date}T00:00:00.000Z`),
+  ...(bookingArg.belegfeld1 ? { belegfeld1: bookingArg.belegfeld1 } : {}),
+  ...(bookingArg.belegfeld2 ? { belegfeld2: bookingArg.belegfeld2 } : {}),
+  buchungstext: bookingArg.text,
+  ...(bookingArg.documentGuid ? { belegLink: bookingArg.documentGuid } : {}),
+  ...(bookingArg.kost1 ? { kost1: bookingArg.kost1 } : {}),
+  ...(bookingArg.kost2 ? { kost2: bookingArg.kost2 } : {}),
+  festschreibung: false,
+  ...(bookingArg.generalumkehr ? { generalumkehr: true } : {}),
+});
+
+/** A booking as a refusal names it: its place among the bookings handed over, day, amount, side, accounts and Belegfeld 1. */
+const bookingNameOf = (bookingArg: IExportBooking, indexArg: number): string =>
+  `booking ${indexArg + 1} (${bookingArg.date}, ${bookingArg.umsatzCents} ${bookingArg.sollHaben} ${bookingArg.konto}/${bookingArg.gegenkonto}`
+  + `${bookingArg.belegfeld1 ? `, Belegfeld 1 ${bookingArg.belegfeld1}` : ''})`;
+
+/**
+ * Refuses a state handed over that holds a booking whose cost centres its record does not state (stored before 4.1).
+ * The Stapel sent stated them (fields 37 and 38), so DATEV holds them: whether the booking must be taken back turns on
+ * them, and a reversal that does not state them would leave them standing in DATEV's cost accounting. The rows sent
+ * tell them (`handedOverRows`).
+ */
+const refuseCostCentresUnknown = (handedOverArg: readonly IExportBooking[]): void => {
+  const unknown = handedOverArg.findIndex((bookingArg) => !recordsCostCentres(bookingArg));
+  if (unknown >= 0) {
+    throw new CompatibilityError(
+      'handed_over_cost_centres_unknown',
+      `${bookingNameOf(handedOverArg[unknown], unknown)} was stored without the cost centres it was sent with; pass the rows of the Stapel sent (handedOverRows)`,
+    );
+  }
+};
+
+/**
+ * What a correction of a period handed over changes, compared as `differingBookingCount` compares: the bookings
+ * handed over that the current ones no longer hold (`reversed`, each once for each time it is missing), the ones they
+ * still hold (`kept`, as they were handed over) and the current rows the bookings handed over do not hold (`added`),
+ * each in its order. A booking that stands in both is kept: a changed text or document link is no changed booking,
+ * a changed cost centre is. A booking handed over whose cost centres its record does not state (stored before 4.1)
+ * is refused (`handed_over_cost_centres_unknown`): pass `bookingsOfRows` of the rows sent instead.
+ */
+export const correctionOf = (
+  handedOverArg: readonly IExportBooking[],
+  currentArg: readonly IDatevBuchungsstapelRow[],
+): { reversed: IExportBooking[]; kept: IExportBooking[]; added: IDatevBuchungsstapelRow[] } => {
+  refuseCostCentresUnknown(handedOverArg);
+  const { leftPaired, rightPaired } = pairBookings(handedOverArg, bookingsOfRows(currentArg));
+  return {
+    reversed: handedOverArg.filter((_bookingArg, indexArg) => !leftPaired[indexArg]),
+    kept: handedOverArg.filter((_bookingArg, indexArg) => leftPaired[indexArg]),
+    added: currentArg.filter((_rowArg, indexArg) => !rightPaired[indexArg]),
+  };
+};
+
+/**
+ * The state of a period handed over, given once: the bookings stored of it (`handedOver`) or the rows of the Stapel
+ * sent (`handedOverRows`). A general reversal in it is refused: the state handed over is compared, not a correction
+ * file.
+ */
+export interface ICorrectionBuchungsstapelOptions {
+  /**
+   * The bookings of the period as they were handed over, as a whole: the bookings of its Buchungsstapel as stored
+   * (`IBuchungsstapelFile.bookings`), or after a correction the period's bookings as that correction left them
+   * (`bookingsAfter`). Each must state its cost centres: one stored before 4.1 does not, and is refused
+   * (`handed_over_cost_centres_unknown`); pass the rows sent for it.
+   */
+  handedOver?: readonly IExportBooking[];
+  /**
+   * The rows of the Buchungsstapel as it was sent: the transmitted file read back (`@fin.cx/skr`
+   * `readExtfBuchungsstapel(bytes).rows`, skr 6.1.0 and later) or the rows written (`IBuchungsstapelFile.rows`). What
+   * DATEV received, cost centres (fields 37 and 38) included, so a reversal mirrors it exactly. For a Stapel whose
+   * bookings were stored before 4.1.
+   */
+  handedOverRows?: readonly IDatevBuchungsstapelRow[];
+  /** the period's drafts as they stand now */
+  drafts: readonly plugins.skrCore.IJournalDraft[];
+  /** the policy the drafts are checked against */
+  policy: plugins.skrCore.IAccountPolicy;
+  /** the header of the file: the same period (`dateFrom`, `dateTo`) as the Stapel handed over, a label of its own */
+  header: IDatevExtfHeaderOptions;
+  filename: string;
+}
+
+export interface ICorrectionBuchungsstapelFile extends IBuchungsstapelFile {
+  /** the bookings handed over it takes back, each written as a general reversal */
+  reversed: IExportBooking[];
+  /** the rows it books anew */
+  added: IDatevBuchungsstapelRow[];
+  /**
+   * The period's bookings as DATEV holds them after this correction: each booking handed over that it keeps, as it
+   * was handed over (its text and document link too), then the rows it books anew. What the next correction is
+   * compared against.
+   */
+  bookingsAfter: IExportBooking[];
+}
+
+/**
+ * Writes the correction Buchungsstapel of a period handed over whose bookings changed since: only what changed. Each
+ * booking handed over that the drafts no longer hold is written again with field 118 "Generalumkehr" set, so DATEV
+ * takes it back on its side and day, and each row the drafts hold that was not handed over is written as it is; rows
+ * in both are not written. Every row keeps its Belegdatum, so it counts in the period it belongs to. A booking handed
+ * over is never changed or replaced (§ 146 Abs. 4 AO): it is taken back and booked anew. Throws `nothing_to_correct`
+ * when nothing changed; `invalid_bookings` for a general reversal in the state handed over, or for a state given
+ * twice or not at all; `handed_over_cost_centres_unknown` for a booking whose cost centres are not known.
+ */
+export const writeCorrectionBuchungsstapel = (optionsArg: ICorrectionBuchungsstapelOptions): ICorrectionBuchungsstapelFile => {
+  const handedOver = optionsArg.handedOverRows !== undefined ? bookingsOfRows(optionsArg.handedOverRows) : optionsArg.handedOver;
+  if (handedOver === undefined || (optionsArg.handedOver !== undefined && optionsArg.handedOverRows !== undefined)) {
+    throw new CompatibilityError('invalid_bookings', 'pass the state handed over once: the bookings stored (handedOver) or the rows sent (handedOverRows)');
+  }
+  const reversal = handedOver.findIndex((bookingArg) => bookingArg.generalumkehr === true);
+  if (reversal >= 0) {
+    throw new CompatibilityError('invalid_bookings', `the state handed over holds a general reversal (booking ${reversal + 1}); pass the period's bookings as they stood, not a correction file`);
+  }
+  const current = datevRowsOf(optionsArg.drafts, optionsArg.policy);
+  const { reversed, kept, added } = correctionOf(handedOver, current);
+  if (reversed.length === 0 && added.length === 0) {
+    throw new CompatibilityError('nothing_to_correct', 'the bookings of the period are the ones handed over; there is nothing to correct');
+  }
+  const rows = [...reversed.map((bookingArg) => ({ ...rowOfBooking(bookingArg), generalumkehr: true })), ...added];
+  return { ...fileOfRows(rows, optionsArg.header, optionsArg.filename), reversed, added, bookingsAfter: [...kept, ...bookingsOfRows(added)] };
 };