Release: merge development into beta

appinfo/info.xml

@@ -26,7 +26,7 @@ Vrij en open source onder de EUPL-1.2-licentie.
 
 **Ondersteuning:** Voor ondersteuning, neem contact op via support@conduction.nl.
     ]]></description>
-    <version>0.2.9-unstable.20260831013830</version>
+    <version>0.2.12-unstable.20260901050759</version>
     <licence>EUPL-1.2</licence>
     <author mail="info@conduction.nl" homepage="https://www.conduction.nl/">Conduction</author>
     <namespace>Shillinq</namespace>

eslint.config.mjs

@@ -144,11 +144,32 @@ export default [
 			'no-console': 'off',
 			'n/no-process-exit': 'off',
 			'n/hashbang': 'off',
-			// `_` / `__` as a deliberate throwaway binding — `catch (_)`, a
-			// discarded destructuring slot. Narrow on purpose: the pattern matches
-			// UNDERSCORES ONLY, so a real name that happens to start with `_` is
-			// still reported. v9 drives plain `.js` through the CORE rule (the
-			// `@typescript-eslint` swap is per-file-type), so it is set here.
+			// Tests import devDependencies by definition; this rule is about what
+			// ships in the published package, which tests/ never does.
+			'n/no-unpublished-import': 'off',
+		},
+	},
+
+	{
+		// `_` / `__` as a deliberate throwaway binding — `catch (_)`, a discarded
+		// destructuring slot. Narrow on purpose: the pattern matches UNDERSCORES
+		// ONLY, so a real name that happens to start with `_` is still reported.
+		//
+		// 🔴 `.js` / `.mjs` ONLY, NOT `.ts`. The CORE rule is not TypeScript-aware:
+		// applied to a `.ts` file it reads the parameter NAMES inside a function
+		// TYPE as bindings and reports them unused. Measured on humaniq —
+		//
+		//   t?: (app: string, key: string) => string
+		//
+		// produced four `no-unused-vars` errors for `app` and `key`, which are
+		// documentation, not variables. The same mis-scoping made every unused
+		// `catch (e)` in a `.ts` spec report TWICE, once per rule.
+		//
+		// v9 already turns the core rule off for `.ts` and drives
+		// `@typescript-eslint/no-unused-vars` instead; naming `.ts` here switched
+		// it back on. TypeScript files are handled by the block below.
+		files: ['tests/**/*.js', 'tests/**/*.mjs'],
+		rules: {
 			'no-unused-vars': [
 				'error',
 				{
@@ -165,12 +186,116 @@ export default [
 					ignoreRestSiblings: true,
 				},
 			],
-			// Tests import devDependencies by definition; this rule is about what
-			// ships in the published package, which tests/ never does.
-			'n/no-unpublished-import': 'off',
 		},
 	},
 
+	{
+		// The TypeScript half of the block above. Same intent, same patterns, on
+		// the rule that actually understands the language: it knows a name inside
+		// a function type is not a binding, so type annotations stay quiet while a
+		// genuinely dead local is still reported.
+		files: ['tests/**/*.ts', 'tests/**/*.tsx'],
+		rules: {
+			'@typescript-eslint/no-unused-vars': [
+				'error',
+				{
+					varsIgnorePattern: '^_+$',
+					caughtErrors: 'all',
+					caughtErrorsIgnorePattern: '^_+$',
+					argsIgnorePattern: '^_',
+					ignoreRestSiblings: true,
+				},
+			],
+		},
+	},
+
+	{
+		// 🔴 Node-side CLI tooling under `scripts/`, which is COMMONJS. Flat
+		// config defaults every `.js` to ESM with browser-ish globals, so without
+		// this block eslint reports the CommonJS wrapper itself as undefined
+		// identifiers. Measured on this app: 52 of the 233 errors under
+		// `tests/` + `scripts/` were `no-undef`, ALL of them in `scripts/`, and
+		// all five names were the environment rather than a typo — `process` 23,
+		// `require` 20, `__dirname` 6, `__filename` 2, `module` 1.
+		//
+		// This is describing the environment, not relaxing a rule, and it is the
+		// same argument the test-globals block below makes: declaring them keeps
+		// `no-undef` able to do its real job, which is catching a genuinely
+		// misspelled identifier. Suppressing the rule instead would bury that.
+		//
+		// `no-console` is off because printing its report is what a CLI checker
+		// is FOR.
+		//
+		// 🔴 NO `n/*` ENTRIES HERE, DELIBERATELY. `eslint-plugin-n` is NOT
+		// registered for these files under eslint 10 + @nextcloud/eslint-config
+		// 9, so `'n/no-process-exit': 'off'` would be dead config that reads as
+		// if it were doing something. Measured both ways on this app: 0 `n/`
+		// findings with the entries and 0 without.
+		//
+		// What DID report was the opposite — four `scripts/*.js` carried
+		// `/* eslint-disable n/no-process-exit */` and `/* eslint-disable
+		// n/shebang */` left over from the eslintrc era, and an inline disable
+		// naming an unregistered plugin is itself an error ("Definition for rule
+		// 'n/shebang' was not found"). Those 8 comments are removed; do not add
+		// `n/*` rules back to replace them.
+		//
+		// ⚠️ `.js` and `.cjs` ONLY. A `scripts/*.mjs` is genuinely ESM and must
+		// keep the default `sourceType`, or `import` stops parsing there.
+		files: ['scripts/**/*.js', 'scripts/**/*.cjs'],
+		languageOptions: {
+			sourceType: 'commonjs',
+			globals: {
+				require: 'readonly',
+				module: 'writable',
+				exports: 'writable',
+				process: 'readonly',
+				__dirname: 'readonly',
+				__filename: 'readonly',
+				console: 'readonly',
+				Buffer: 'readonly',
+				global: 'readonly',
+				URL: 'readonly',
+				TextEncoder: 'readonly',
+				TextDecoder: 'readonly',
+			},
+		},
+		rules: {
+			'no-console': 'off',
+		},
+	},
+
+	{
+		// The ESM half of the block above. A `scripts/*.mjs` is genuinely a module
+		// and must keep the default `sourceType`, so it gets Node's globals but
+		// none of the CommonJS wrapper. Measured: `process` reported undefined 2x
+		// in hermiq's generate-opengemeenten-icons.mjs and 4x in openregister's
+		// l10n/runtime-check.mjs, which the `.js`/`.cjs` block deliberately does
+		// not match.
+		files: ['scripts/**/*.mjs', 'tests/**/*.mjs'],
+		languageOptions: {
+			globals: {
+				process: 'readonly',
+				console: 'readonly',
+				Buffer: 'readonly',
+				global: 'readonly',
+				URL: 'readonly',
+				TextEncoder: 'readonly',
+				TextDecoder: 'readonly',
+			},
+		},
+		rules: {
+			'no-console': 'off',
+		},
+	},
+
+	{
+		// eslint must not try to PARSE a shell script. `tests/e2e/seed.test.sh`
+		// matches the `**/*.test.*` glob some presets use, and eslint then reads
+		// it as JavaScript and reports "Parsing error: Unexpected character" —
+		// a finding about a file it should never have opened.
+		ignores: ['**/*.sh', '**/*.bash'],
+	},
+
 	{
 		// Test globals. Several apps keep their spec files INSIDE `src/`, which the
 		// lint script scans, and neither `@nextcloud/eslint-config` nor the runner

lib/Repair/FoldExpensesAndHoursIntoProject.php

@@ -90,6 +90,8 @@ public function getName(): string {
 	 * @param IOutput $output The repair-step output (progress + warnings).
 	 *
 	 * @return void
+	 *
+	 * @spec openspec/specs/bookkeeping-consultancy-project-accounting/spec.md
 	 */
 	public function run(IOutput $output): void {
 		try {
@@ -99,7 +101,7 @@ public function run(IOutput $output): void {
 			// Index every Project by every identifier a source object might
 			// reference (id / uuid / projectNumber / code). Values are kept
 			// as live mutable arrays so multiple lines fold into one save.
-			$projects = $this->readAllRows(objectService: $this->objectService, registerSlug: $registerSlug, schema: 'Project');
+			$projects = $this->readAllRows(objectService: $this->objectService, registerSlug: $registerSlug, schema: 'engagement');
 
 			if ($projects === []) {
 				$output->info('Shillinq: no Project records — expense/hours fold skipped.');
@@ -171,11 +173,11 @@ public function run(IOutput $output): void {
 				try {
 					$this->objectService
 						->setRegister($registerSlug)
-						->setSchema('Project')
+						->setSchema('engagement')
 						->saveObject(
 							object: $record,
 							register: $registerSlug,
-							schema: 'Project',
+							schema: 'engagement',
 							_rbac: false,
 							_multitenancy: false,
 						);

lib/Repair/RematerialiseConvertedCalculations.php

@@ -101,7 +101,7 @@ class RematerialiseConvertedCalculations implements IRepairStep {
 		'ZzpDeduction',
 		'SisaReport',
 		'InventoryReorderRule',
-		'Project',
+		'engagement',
 		'ProjectAssignment',
 		'VatReturn',
 		'InnovatieboxElection',

lib/Settings/register.d/000-register-declaration.json

@@ -356,7 +356,7 @@
                     "PricingTier",
                     "Programma",
                     "Programmabegroting",
-                    "Project",
+                    "engagement",
                     "ProjectAssignment",
                     "ProjectBudget",
                     "ProvincialeFondsPosting",

lib/Settings/register.d/abstract-project-cost-lines.json

@@ -2,7 +2,7 @@
   "x-shillinq-fragment": "abstract-project-cost-lines",
   "components": {
     "schemas": {
-      "Project": {
+      "engagement": {
         "version": "0.2.0",
         "properties": {
           "costLines": {

lib/Settings/register.d/add-shillinq-audit-trail.json

@@ -542,7 +542,7 @@
 					"description": "OR's audit-trail-immutable captures every create / update / lifecycle / delete event on PerDiemRate with actor, timestamp, action, before/after snapshot, and hash chain per ADR-022 + REQ-AT-001..AT-002. Retention is governed by OR per REQ-AT-005 (no shillinq cleanup job)."
 				}
 			},
-			"Project": {
+			"engagement": {
 				"x-openregister-audit-trail": {
 					"enabled": true,
 					"description": "OR's audit-trail-immutable captures every create / update / lifecycle / delete event on Project with actor, timestamp, action, before/after snapshot, and hash chain per ADR-022 + REQ-AT-001..AT-002. Retention is governed by OR per REQ-AT-005 (no shillinq cleanup job)."

lib/Settings/register.d/bookings-deposit-to-invoice.json

@@ -402,7 +402,7 @@
       },
       "Invoice": {
         "slug": "Invoice",
-        "icon": "FileDocumentOutline",
+        "icon": "ReceiptTextOutline",
         "version": "0.1.0",
         "title": "Invoice",
         "description": "A final customer invoice materialised in Shillinq when a booking order completes. Carries a service line and, when a deposit was authorised, a negative deposit-credit line. Bidirectionally linked to its Order via sourceDocumentUri and to the credited DepositPayment via depositPaymentId (REQ-DI-001). Integrates into Shillinq AR aging with no special handling (REQ-DI-009).",

lib/Settings/register.d/bookkeeping-cost-centers-dimensions.json

@@ -456,7 +456,7 @@
             ],
             "filter": {},
             "join": {
-              "through": "Project",
+              "through": "engagement",
               "on": "Project.code",
               "select": [
                 "Project.name",
@@ -570,7 +570,7 @@
     {
       "@self": {
         "register": "shillinq",
-        "schema": "Project",
+        "schema": "engagement",
         "slug": "proj-internal-platform"
       },
       "code": "PROJ-INT-PLAT",
@@ -584,7 +584,7 @@
     {
       "@self": {
         "register": "shillinq",
-        "schema": "Project",
+        "schema": "engagement",
         "slug": "proj-grant-research"
       },
       "code": "PROJ-GRANT-RND",

lib/Settings/register.d/bookkeeping-detachering-payroll-administratie.json

@@ -9,7 +9,7 @@
     "schemas": {
       "Employee": {
         "slug": "Employee",
-        "icon": "AccountTie",
+        "icon": "AccountTieOutline",
         "version": "0.1.0",
         "title": "Employee",
         "description": "Employee / detached worker / freelancer master record (REQ-PAY-001). Carries legal name, BSN (11-proef validated, masked on display per ADR-005), contract classification and onboarding/exit dates. A contact/person is a Nextcloud entity; this register holds the payroll-administration projection only.",
@@ -211,7 +211,7 @@
       },
       "Payroll": {
         "slug": "Payroll",
-        "icon": "CashMultiple",
+        "icon": "CashSync",
         "version": "0.1.0",
         "title": "Payroll",
         "description": "Payroll period sub-ledger record (REQ-PAY-002). Captures gross input and aggregated deduction totals; on issue it materialises a balanced GLTransaction (REQ-PAY-008) per the T1 JournalEntry pattern. UBL Peppol BIS 30 field shape is declared for T4 passthrough but NOT computed here (REQ-PAY-010).",

lib/Settings/register.d/zz-order-primitive.json

@@ -10,7 +10,7 @@
     "schemas": {
       "OrderPrimitive": {
         "slug": "OrderPrimitive",
-        "icon": "FileDocumentMultipleOutline",
+        "icon": "ClipboardListOutline",
         "version": "0.1.0",
         "title": "Order",
         "x-schema-org": "schema:Order",

lib/Settings/register.d/zzz-mcp-tool-surface.json

@@ -168,7 +168,7 @@
           }
         }
       },
-      "Project": {
+      "engagement": {
         "configuration": {
           "x-openregister-mcp": {
             "enabled": true,

lib/Settings/shillinq_mock_register.json

@@ -2,7 +2,7 @@
   "openapi": "3.0.0",
   "info": {
     "title": "shillinq demo data",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "description": "Demo data covering every schema this app supplies, offered as the first step of the app's setup walkthrough. Generated from the schemas themselves, so every object satisfies the schema that will validate it."
   },
   "x-openregister": {
@@ -23760,7 +23760,7 @@
       {
         "@self": {
           "register": "shillinq",
-          "schema": "Project",
+          "schema": "engagement",
           "slug": "project-voorbeeld-name-1-1"
         },
         "administrationId": "Voorbeeld Administrationid 1",
@@ -23810,7 +23810,7 @@
       {
         "@self": {
           "register": "shillinq",
-          "schema": "Project",
+          "schema": "engagement",
           "slug": "project-voorbeeld-name-2-2"
         },
         "administrationId": "Voorbeeld Administrationid 2",
@@ -23860,7 +23860,7 @@
       {
         "@self": {
           "register": "shillinq",
-          "schema": "Project",
+          "schema": "engagement",
           "slug": "project-voorbeeld-name-3-3"
         },
         "administrationId": "Voorbeeld Administrationid 3",
@@ -33567,33 +33567,6 @@
         "mkbProfitExemptionPercentage": 1.0,
         "source": "Voorbeeld Source 3"
       },
-      {
-        "@self": {
-          "register": "shillinq",
-          "schema": "example",
-          "slug": "example-voorbeeld-title-1-1"
-        },
-        "title": "Voorbeeld Title 1",
-        "description": "Voorbeeld Description 1"
-      },
-      {
-        "@self": {
-          "register": "shillinq",
-          "schema": "example",
-          "slug": "example-voorbeeld-title-2-2"
-        },
-        "title": "Voorbeeld Title 2",
-        "description": "Voorbeeld Description 2"
-      },
-      {
-        "@self": {
-          "register": "shillinq",
-          "schema": "example",
-          "slug": "example-voorbeeld-title-3-3"
-        },
-        "title": "Voorbeeld Title 3",
-        "description": "Voorbeeld Description 3"
-      },
       {
         "@self": {
           "register": "shillinq",