shutro-erp 0.3.5 → 0.3.6

package/dist/payment/.kosh/bindings.js

@@ -1,4 +1,4 @@
-// GENERATED by `pnpm generate:models` (Shutro’s generator). Do not edit. definitions-hash: e6900370f0e9c944
+// GENERATED by `pnpm generate:models` (Shutro’s generator). Do not edit. definitions-hash: c50b4a215467041d
 // Bindings of module `payment`: import the definition API from here to get types scoped to what it can see.
 export { defineModel, defineModule, extendModel, f, replace } from '../../server/orm.js';
 import { definitions } from '../../server/orm.js';

package/dist/payment/.kosh/schema.d.ts

@@ -1,10 +1,11 @@
-// GENERATED by `pnpm generate:models` (Shutro’s generator). Do not edit. definitions-hash: e6900370f0e9c944
+// GENERATED by `pnpm generate:models` (Shutro’s generator). Do not edit. definitions-hash: c50b4a215467041d
 // Schema view of module `payment` (RFC 0002 §7.7): the models it owns or depends on, with the extensions it can see.
 import type { F } from '../../server/orm.js';
 
 /** Model name → model type (RFC 0002 §7.7). */
 export interface SchemaView {
   readonly 'account.account': AccountAccount;
+  readonly 'account.analytic': AccountAnalytic;
   readonly 'account.fiscal.year': AccountFiscalYear;
   readonly 'account.full.reconcile': AccountFullReconcile;
   readonly 'account.journal': AccountJournal;
@@ -18,9 +19,12 @@ export interface SchemaView {
   readonly 'account.tax': AccountTax;
   readonly 'account.tax.component': AccountTaxComponent;
   readonly 'account.withholding': AccountWithholding;
+  readonly 'approval.delegation': ApprovalDelegation;
   readonly 'approval.level': ApprovalLevel;
+  readonly 'approval.link': ApprovalLink;
   readonly 'approval.policy': ApprovalPolicy;
   readonly 'approval.request': ApprovalRequest;
+  readonly 'approval.vote': ApprovalVote;
   readonly 'audit.event': AuditEvent;
   readonly 'auth.api_key': AuthApiKey;
   readonly 'auth.credential': AuthCredential;
@@ -95,6 +99,30 @@ export interface AccountAccount {
 export interface AccountAccountMethods extends F.Methods<typeof import('../../accounting/index.js').accountingShutro, 'account.account'> {
 }
 
+/** `account.analytic` (owner: accounting). */
+export interface AccountAnalytic {
+  readonly name: 'account.analytic';
+  readonly fields: {
+    readonly id: F.Id<'account.analytic'>;
+    readonly createdAt: F.Datetime<{ readonly required: true; readonly readonly: true }>;
+    readonly updatedAt: F.Datetime<{ readonly required: true; readonly readonly: true }>;
+    readonly createdBy: F.Many2one<'res.users', { readonly readonly: true }>;
+    readonly updatedBy: F.Many2one<'res.users', { readonly readonly: true }>;
+    readonly displayName: F.Char<{ readonly required: true; readonly readonly: true; readonly compute: true }>;
+    readonly active: F.Bool<{ readonly required: true; readonly default: true }>;
+    readonly company: F.Many2one<'res.company', { readonly required: true; readonly default: true }>;
+    readonly code: F.Char;
+    readonly name: F.Char<{ readonly required: true; readonly translate: true }>;
+    readonly parent: F.Many2one<'account.analytic'>;
+    readonly note: F.Text;
+  };
+  readonly methods: AccountAnalyticMethods;
+}
+
+/** Methods of `account.analytic`: declared ones and transitions. */
+export interface AccountAnalyticMethods extends F.Methods<typeof import('../../accounting/index.js').accountingShutro, 'account.analytic'> {
+}
+
 /** `account.fiscal.year` (owner: accounting). */
 export interface AccountFiscalYear {
   readonly name: 'account.fiscal.year';
@@ -250,6 +278,7 @@ export interface AccountMoveLine {
     readonly lineKind: F.Selection<'entry' | 'product' | 'tax' | 'counterpart', { readonly required: true; readonly default: true }>;
     readonly invoice: F.Many2one<'account.move', { readonly readonly: true; readonly compute: true; readonly store: true }>;
     readonly product: F.Many2one<'product.product'>;
+    readonly analytic: F.Many2one<'account.analytic'>;
     readonly quantity: F.Decimal<{ readonly default: true }>;
     readonly priceUnit: F.Decimal<{ readonly default: true }>;
     readonly discount: F.Decimal<{ readonly default: true }>;
@@ -491,6 +520,29 @@ export interface AccountWithholding {
 export interface AccountWithholdingMethods extends F.Methods<typeof import('../../accounting/index.js').accountingShutro, 'account.withholding'> {
 }
 
+/** `approval.delegation` (owner: permissions). */
+export interface ApprovalDelegation {
+  readonly name: 'approval.delegation';
+  readonly fields: {
+    readonly id: F.Id<'approval.delegation'>;
+    readonly createdAt: F.Datetime<{ readonly required: true; readonly readonly: true }>;
+    readonly updatedAt: F.Datetime<{ readonly required: true; readonly readonly: true }>;
+    readonly createdBy: F.Many2one<'res.users', { readonly readonly: true }>;
+    readonly updatedBy: F.Many2one<'res.users', { readonly readonly: true }>;
+    readonly displayName: F.Char<{ readonly required: true; readonly readonly: true; readonly compute: true }>;
+    readonly user: F.Many2one<'res.users', { readonly required: true; readonly default: true }>;
+    readonly delegate: F.Many2one<'res.users', { readonly required: true }>;
+    readonly dateFrom: F.DateOnly<{ readonly required: true }>;
+    readonly dateTo: F.DateOnly<{ readonly required: true }>;
+    readonly note: F.Char;
+  };
+  readonly methods: ApprovalDelegationMethods;
+}
+
+/** Methods of `approval.delegation`: declared ones and transitions. */
+export interface ApprovalDelegationMethods extends F.Methods<typeof import('../../permissions/index.js').permissionsShutro, 'approval.delegation'> {
+}
+
 /** `approval.level` (owner: permissions). */
 export interface ApprovalLevel {
   readonly name: 'approval.level';
@@ -505,7 +557,14 @@ export interface ApprovalLevel {
     readonly sequence: F.Integer<{ readonly default: true }>;
     readonly name: F.Char<{ readonly required: true }>;
     readonly condition: F.Json;
-    readonly approverRole: F.Char<{ readonly required: true }>;
+    readonly approverKind: F.Selection<'role' | 'users' | 'manager' | 'field', { readonly required: true; readonly default: true }>;
+    readonly approverRole: F.Char;
+    readonly approverUsers: F.Many2many<'res.users', { readonly required: true }>;
+    readonly approverField: F.Char;
+    readonly quorum: F.Selection<'any' | 'all' | 'count', { readonly required: true; readonly default: true }>;
+    readonly quorumCount: F.Integer;
+    readonly deadlineHours: F.Integer;
+    readonly escalateRole: F.Char;
   };
   readonly methods: ApprovalLevelMethods;
 }
@@ -514,6 +573,29 @@ export interface ApprovalLevel {
 export interface ApprovalLevelMethods extends F.Methods<typeof import('../../permissions/index.js').permissionsShutro, 'approval.level'> {
 }
 
+/** `approval.link` (owner: permissions). */
+export interface ApprovalLink {
+  readonly name: 'approval.link';
+  readonly fields: {
+    readonly id: F.Id<'approval.link'>;
+    readonly createdAt: F.Datetime<{ readonly required: true; readonly readonly: true }>;
+    readonly updatedAt: F.Datetime<{ readonly required: true; readonly readonly: true }>;
+    readonly createdBy: F.Many2one<'res.users', { readonly readonly: true }>;
+    readonly updatedBy: F.Many2one<'res.users', { readonly readonly: true }>;
+    readonly displayName: F.Char<{ readonly required: true; readonly readonly: true; readonly compute: true }>;
+    readonly request: F.Many2one<'approval.request', { readonly required: true }>;
+    readonly user: F.Many2one<'res.users', { readonly required: true }>;
+    readonly tokenHash: F.Char<{ readonly required: true }>;
+    readonly expiresAt: F.Datetime<{ readonly required: true }>;
+    readonly usedAt: F.Datetime;
+  };
+  readonly methods: ApprovalLinkMethods;
+}
+
+/** Methods of `approval.link`: declared ones and transitions. */
+export interface ApprovalLinkMethods extends F.Methods<typeof import('../../permissions/index.js').permissionsShutro, 'approval.link'> {
+}
+
 /** `approval.policy` (owner: permissions). */
 export interface ApprovalPolicy {
   readonly name: 'approval.policy';
@@ -531,6 +613,9 @@ export interface ApprovalPolicy {
     readonly company: F.Many2one<'res.company'>;
     readonly onApproved: F.Char;
     readonly onRejected: F.Char;
+    readonly onSentBack: F.Char;
+    readonly onWithdrawn: F.Char;
+    readonly reasonRequired: F.Bool<{ readonly required: true; readonly default: true }>;
     readonly levels: F.One2many<'approval.level', { readonly required: true }>;
   };
   readonly methods: ApprovalPolicyMethods;
@@ -557,8 +642,16 @@ export interface ApprovalRequest {
     readonly targetModel: F.Char<{ readonly required: true }>;
     readonly targetId: F.Integer<{ readonly required: true }>;
     readonly company: F.Many2one<'res.company'>;
-    readonly approverRole: F.Char<{ readonly required: true }>;
-    readonly state: F.Selection<'pending' | 'approved' | 'rejected' | 'cancelled', { readonly required: true; readonly default: true }>;
+    readonly approverRole: F.Char;
+    readonly approvers: F.Many2many<'res.users', { readonly required: true }>;
+    readonly required: F.Integer<{ readonly required: true; readonly default: true }>;
+    readonly round: F.Integer<{ readonly required: true; readonly default: true }>;
+    readonly votes: F.One2many<'approval.vote', { readonly required: true }>;
+    readonly dueAt: F.Datetime;
+    readonly remindedAt: F.Datetime;
+    readonly escalatedTo: F.Char;
+    readonly escalatedAt: F.Datetime;
+    readonly state: F.Selection<'pending' | 'approved' | 'rejected' | 'sent_back' | 'cancelled', { readonly required: true; readonly default: true }>;
     readonly requestedBy: F.Many2one<'res.users'>;
     readonly decidedBy: F.Many2one<'res.users'>;
     readonly decidedAt: F.Datetime;
@@ -571,6 +664,31 @@ export interface ApprovalRequest {
 export interface ApprovalRequestMethods extends F.Methods<typeof import('../../permissions/index.js').permissionsShutro, 'approval.request'> {
 }
 
+/** `approval.vote` (owner: permissions). */
+export interface ApprovalVote {
+  readonly name: 'approval.vote';
+  readonly fields: {
+    readonly id: F.Id<'approval.vote'>;
+    readonly createdAt: F.Datetime<{ readonly required: true; readonly readonly: true }>;
+    readonly updatedAt: F.Datetime<{ readonly required: true; readonly readonly: true }>;
+    readonly createdBy: F.Many2one<'res.users', { readonly readonly: true }>;
+    readonly updatedBy: F.Many2one<'res.users', { readonly readonly: true }>;
+    readonly displayName: F.Char<{ readonly required: true; readonly readonly: true; readonly compute: true }>;
+    readonly request: F.Many2one<'approval.request', { readonly required: true }>;
+    readonly user: F.Many2one<'res.users', { readonly required: true }>;
+    readonly decision: F.Selection<'approve' | 'reject' | 'send_back', { readonly required: true }>;
+    readonly comment: F.Text;
+    readonly at: F.Datetime<{ readonly required: true }>;
+    readonly onBehalfOf: F.Many2one<'res.users'>;
+    readonly ip: F.Char;
+  };
+  readonly methods: ApprovalVoteMethods;
+}
+
+/** Methods of `approval.vote`: declared ones and transitions. */
+export interface ApprovalVoteMethods extends F.Methods<typeof import('../../permissions/index.js').permissionsShutro, 'approval.vote'> {
+}
+
 /** `audit.event` (owner: base). */
 export interface AuditEvent {
   readonly name: 'audit.event';
@@ -1122,7 +1240,7 @@ export interface PaymentTransaction {
     readonly company: F.Many2one<'res.company', { readonly required: true; readonly default: true }>;
     readonly reference: F.Char<{ readonly required: true; readonly default: true }>;
     readonly provider: F.Many2one<'payment.provider', { readonly required: true }>;
-    readonly move: F.Many2one<'account.move', { readonly required: true }>;
+    readonly move: F.Many2one<'account.move'>;
     readonly partner: F.Many2one<'res.partner'>;
     readonly currency: F.Many2one<'res.currency', { readonly required: true }>;
     readonly amount: F.Monetary<'currency', { readonly required: true }>;
@@ -1131,6 +1249,7 @@ export interface PaymentTransaction {
     readonly payment: F.Many2one<'account.payment'>;
     readonly error: F.Text;
     readonly doneAt: F.Datetime;
+    readonly returnUrl: F.Char;
   };
   readonly methods: PaymentTransactionMethods;
 }
@@ -1221,6 +1340,7 @@ export interface ProductCategory {
     readonly createdBy: F.Many2one<'res.users', { readonly readonly: true }>;
     readonly updatedBy: F.Many2one<'res.users', { readonly readonly: true }>;
     readonly displayName: F.Char<{ readonly required: true; readonly readonly: true; readonly compute: true }>;
+    readonly active: F.Bool<{ readonly required: true; readonly default: true }>;
     readonly name: F.Char<{ readonly required: true; readonly translate: true }>;
     readonly parent: F.Many2one<'product.category'>;
   };

package/dist/payment/index.d.ts

@@ -13,8 +13,12 @@
  * - `GET|POST /api/v1/payment/return/:reference`             back from the provider: on to the portal
  *
  * The callbacks arrive at `POST /api/v1/hooks/<token>` (the provider's endpoint, made with its first payment).
+ * Other apps start payments with `startPayment` (`website_sale`: a shop's checkout) and say what a transaction pays by
+ * overriding `payable()` on `payment.transaction`.
  */
 import { type KoshModule } from '../modules-sdk/index.js';
+import { type Decimal } from '../server/orm.js';
+import type { Env } from './.kosh/bindings.js';
 import { type PaymentAdapter } from './providers.js';
 export { type BkashOptions, bkashAdapter, bkashFromEnvironment } from './bkash.js';
 export { newReference, PaymentProvider, PaymentTransaction, PROVIDERS, paymentShutro, } from './module.js';
@@ -32,6 +36,43 @@ export interface PaymentOptions {
     /** The API's public address: where providers call back (`SHUTRO_ERP_API_URL`). */
     readonly apiUrl?: string;
 }
+export interface StartPayment {
+    /** A provider of the company, enabled. */
+    readonly provider: number;
+    /** The invoice paid; null when another app's document waits for it (its link in `values`). */
+    readonly move?: number | null;
+    readonly partner: {
+        readonly id: number;
+        readonly name: string;
+        readonly email?: string | null;
+        readonly phone?: string | null;
+        readonly mobile?: string | null;
+        readonly street?: string | null;
+        readonly city?: string | null;
+        readonly zip?: string | null;
+        readonly country?: unknown;
+    } | null;
+    readonly currency: {
+        readonly id: number;
+        readonly name: string;
+        readonly decimalPlaces?: number | null;
+    };
+    readonly amount: Decimal;
+    readonly company: number;
+    readonly description: string;
+    /** Where the customer goes back to (the portal's document when absent). */
+    readonly returnUrl?: string;
+    /** More fields of the transaction (another app's link: `saleOrder`). */
+    readonly values?: Readonly<Record<string, unknown>>;
+}
+/**
+ * Starts a payment as the system: a pending transaction for `amount` with the provider, and where to send the
+ * customer. The provider must be enabled, configured on this server, and the fake never live.
+ */
+export declare function startPayment(su: Env, input: StartPayment): Promise<{
+    reference: string;
+    redirectUrl: string;
+}>;
 /** Online payments with explicit options (tests, installations wiring their own adapters). */
 export declare function paymentModule(options?: PaymentOptions): KoshModule;
 /** Online payments (the fake adapter; addresses from the environment). */

package/dist/payment/index.js

@@ -13,6 +13,8 @@
  * - `GET|POST /api/v1/payment/return/:reference`             back from the provider: on to the portal
  *
  * The callbacks arrive at `POST /api/v1/hooks/<token>` (the provider's endpoint, made with its first payment).
+ * Other apps start payments with `startPayment` (`website_sale`: a shop's checkout) and say what a transaction pays by
+ * overriding `payable()` on `payment.transaction`.
  */
 import { accountPortal } from '../account_portal/index.js';
 import { accounting } from '../accounting/index.js';
@@ -21,7 +23,7 @@ import { defineModule } from '../modules-sdk/index.js';
 import { portalDocuments } from '../portal/index.js';
 import { HttpProblem } from '../server/index.js';
 import { orm } from '../server/orm.js';
-import { action, form, list } from '../views/index.js';
+import { action, form, list, search } from '../views/index.js';
 import { bkashFromEnvironment } from './bkash.js';
 import { PaymentProvider, PaymentTransaction, paymentShutro } from './module.js';
 import { ADAPTERS, FAKE_SIGNATURE, fakeAdapter } from './providers.js';
@@ -56,6 +58,102 @@ function callbackHooks(adapters) {
         },
     }));
 }
+/** The adapters and addresses of the running server (set when the routes are registered). */
+let current = null;
+const adapterOf = (code) => {
+    const adapter = current?.adapters.get(code);
+    if (adapter === undefined)
+        throw new HttpProblem(409, 'no-adapter', 'Provider unavailable', `The ${code} adapter is not installed.`);
+    return adapter;
+};
+/** The provider's callback endpoint (made on first use), with its token. */
+async function endpointOf(su, provider) {
+    const [p] = await su
+        .model('payment.provider')
+        .browse([provider.id])
+        .load({ endpoint: true });
+    if (p?.endpoint !== null && p?.endpoint !== undefined)
+        return p.endpoint.token;
+    const made = await su
+        .model('webhook.endpoint')
+        .create([{ name: `${provider.name} callbacks`, hook: `payment.${provider.code}` }]);
+    await su
+        .model('payment.provider')
+        .browse([provider.id])
+        .write({ endpoint: made.ids[0] });
+    const [e] = await made.load({});
+    return e?.token ?? '';
+}
+/**
+ * Starts a payment as the system: a pending transaction for `amount` with the provider, and where to send the
+ * customer. The provider must be enabled, configured on this server, and the fake never live.
+ */
+export async function startPayment(su, input) {
+    if (current === null)
+        throw new HttpProblem(503, 'no-payments', 'Payments unavailable', 'Payments are not set up.');
+    const urls = current.urls;
+    const [provider] = await (await su.model('payment.provider').search({
+        where: {
+            id: orm.asId(input.provider, 'payment.provider'),
+            state: { in: ['test', 'live'] },
+            company: orm.asId(input.company, 'res.company'),
+        },
+        limit: 1,
+    })).load({});
+    if (provider === undefined)
+        throw new HttpProblem(422, 'invalid-provider', 'No such provider', 'Choose one of the providers offered.');
+    const adapter = adapterOf(provider.code);
+    if (provider.code === 'fake' && provider.state === 'live')
+        throw new HttpProblem(409, 'fake-live', 'Test provider', 'The test provider moves no money: it cannot be live.');
+    if (!adapter.configured(provider.state === 'live' ? 'live' : 'test'))
+        throw new HttpProblem(409, 'not-configured', 'Provider not set up', `The ${provider.name} provider has no credentials for ${provider.state} payments on this server.`);
+    const token = await endpointOf(su, provider);
+    const created = await su.model('payment.transaction').create([
+        {
+            ...input.values,
+            provider: provider.id,
+            move: input.move ?? null,
+            partner: input.partner?.id ?? null,
+            currency: input.currency.id,
+            amount: input.amount.toFixed(),
+            company: input.company,
+            returnUrl: input.returnUrl ?? null,
+        },
+    ]);
+    await su.flush(); // company checks run in this superuser scope, not at commit (Shutro request #11)
+    const tx = su.model('payment.transaction').browse(created.ids);
+    const [t] = await tx.load({});
+    const reference = t?.reference ?? '';
+    const p = input.partner;
+    let started;
+    try {
+        started = await adapter.createPayment({
+            reference,
+            amount: input.amount.toFixed(input.currency.decimalPlaces ?? 2),
+            currency: input.currency.name,
+            description: input.description,
+            customer: {
+                name: p?.name ?? '',
+                email: p?.email ?? null,
+                phone: p?.phone ?? p?.mobile ?? null,
+                street: p?.street ?? null,
+                city: p?.city ?? null,
+                zip: p?.zip ?? null,
+                country: (p?.country ?? null),
+            },
+            returnUrl: `${urls.api}/api/v1/payment/return/${encodeURIComponent(reference)}`,
+            callbackUrl: `${urls.api}/api/v1/hooks/${token}`,
+            mode: provider.state === 'live' ? 'live' : 'test',
+        });
+    }
+    catch (error) {
+        throw new HttpProblem(502, 'provider-error', 'The payment could not start', error instanceof Error ? error.message : String(error));
+    }
+    if (started.providerReference !== undefined)
+        await tx.write({ providerReference: started.providerReference });
+    await su.flush();
+    return { reference, redirectUrl: started.redirectUrl };
+}
 function registerPaymentRoutes(context, adapters, urls) {
     const { app } = context;
     const documents = portalDocuments(context.registry);
@@ -63,30 +161,7 @@ function registerPaymentRoutes(context, adapters, urls) {
         if (!env.groups.has('portal.user') || env.groups.has('base.user'))
             throw new HttpProblem(403, 'portal-only', 'Portal users only', 'This is the portal’s API.');
     };
-    const adapterOf = (code) => {
-        const adapter = adapters.get(code);
-        if (adapter === undefined)
-            throw new HttpProblem(409, 'no-adapter', 'Provider unavailable', `The ${code} adapter is not installed.`);
-        return adapter;
-    };
-    /** The provider's callback endpoint (made on first use), with its token. */
-    const endpointOf = async (su, provider) => {
-        const [p] = await su
-            .model('payment.provider')
-            .browse([provider.id])
-            .load({ endpoint: true });
-        if (p?.endpoint !== null && p?.endpoint !== undefined)
-            return p.endpoint.token;
-        const made = await su
-            .model('webhook.endpoint')
-            .create([{ name: `${provider.name} callbacks`, hook: `payment.${provider.code}` }]);
-        await su
-            .model('payment.provider')
-            .browse([provider.id])
-            .write({ endpoint: made.ids[0] });
-        const [e] = await made.load({});
-        return e?.token ?? '';
-    };
+    current = { adapters, urls };
     app.get('/api/portal/v1/payments/providers', async (request) => request.env((env) => {
         portalOnly(env);
         return env.asSuperuser({ reason: 'portal: payment providers' }, async (su) => {
@@ -137,11 +212,6 @@ function registerPaymentRoutes(context, adapters, urls) {
             })).load({});
             if (provider === undefined)
                 throw new HttpProblem(422, 'invalid-provider', 'No such provider', 'Choose one of the providers offered.');
-            const adapter = adapterOf(provider.code);
-            if (provider.code === 'fake' && provider.state === 'live')
-                throw new HttpProblem(409, 'fake-live', 'Test provider', 'The test provider moves no money: it cannot be live.');
-            if (!adapter.configured(provider.state === 'live' ? 'live' : 'test'))
-                throw new HttpProblem(409, 'not-configured', 'Provider not set up', `The ${provider.name} provider has no credentials for ${provider.state} payments on this server.`);
             const [move] = await su
                 .model('account.move')
                 .browse([id])
@@ -151,48 +221,15 @@ function registerPaymentRoutes(context, adapters, urls) {
             const due = move.amountResidual?.amount;
             if (due === undefined || !due.gt(0))
                 throw new HttpProblem(409, 'not-payable', 'Nothing to pay', 'Nothing is due on this document.');
-            const token = await endpointOf(su, provider);
-            const created = await su.model('payment.transaction').create([
-                {
-                    provider: provider.id,
-                    move: move.id,
-                    partner: (move.partner?.id ?? null),
-                    currency: move.currency.id,
-                    amount: due.toFixed(),
-                    company: company,
-                },
-            ]);
-            await su.flush(); // company checks run in this superuser scope, not at commit (Shutro request #11)
-            const [tx] = await created.load({});
-            const reference = tx?.reference ?? '';
-            let started;
-            try {
-                started = await adapter.createPayment({
-                    reference,
-                    amount: due.toFixed(move.currency.decimalPlaces ?? 2),
-                    currency: move.currency.name,
-                    description: `${d.spec.label} ${move.name}`,
-                    customer: {
-                        name: move.partner?.name ?? '',
-                        email: move.partner?.email ?? null,
-                        phone: move.partner?.phone ?? move.partner?.mobile ?? null,
-                        street: move.partner?.street ?? null,
-                        city: move.partner?.city ?? null,
-                        zip: move.partner?.zip ?? null,
-                        country: move.partner?.country ?? null,
-                    },
-                    returnUrl: `${urls.api}/api/v1/payment/return/${encodeURIComponent(reference)}`,
-                    callbackUrl: `${urls.api}/api/v1/hooks/${token}`,
-                    mode: provider.state === 'live' ? 'live' : 'test',
-                });
-            }
-            catch (error) {
-                throw new HttpProblem(502, 'provider-error', 'The payment could not start', error instanceof Error ? error.message : String(error));
-            }
-            if (started.providerReference !== undefined)
-                await created.write({ providerReference: started.providerReference });
-            await su.flush();
-            return { reference, redirectUrl: started.redirectUrl };
+            return startPayment(su, {
+                provider: provider.id,
+                move: move.id,
+                partner: move.partner,
+                currency: move.currency,
+                amount: due,
+                company,
+                description: `${d.spec.label} ${move.name}`,
+            });
         });
         return reply.status(201).send(started);
     });
@@ -210,7 +247,7 @@ function registerPaymentRoutes(context, adapters, urls) {
                 return t === undefined
                     ? null
                     : {
-                        move: t.move.id,
+                        move: t.move?.id ?? 0,
                         state: t.state,
                         amount: t.amount.amount.toFixed(t.currency.decimalPlaces ?? 2),
                         currency: t.currency.name,
@@ -294,7 +331,8 @@ function registerPaymentRoutes(context, adapters, urls) {
                     return t === undefined
                         ? null
                         : {
-                            move: t.move.id,
+                            move: t.move?.id ?? null,
+                            returnUrl: t.returnUrl,
                             company: t.company.id,
                             state: t.state,
                             code: t.provider.code,
@@ -322,6 +360,8 @@ function registerPaymentRoutes(context, adapters, urls) {
                     }
                 }
                 const move = tx?.move ?? null;
+                if (tx?.returnUrl !== null && tx?.returnUrl !== undefined && tx.returnUrl !== '')
+                    return reply.redirect(`${tx.returnUrl}${tx.returnUrl.includes('?') ? '&' : '?'}payment=${encodeURIComponent(reference)}`, 303);
                 return reply.redirect(move === null
                     ? `${urls.portal}/`
                     : `${urls.portal}/d/${encodeURIComponent(payable)}/${move}?payment=${encodeURIComponent(reference)}`, 303);
@@ -391,11 +431,27 @@ export function paymentModule(options = {}) {
                 sequence: 3.7,
             },
         ],
+        search: {
+            'payment.provider': search(PaymentProvider, {
+                fields: ['name'],
+                groupBy: ['code', 'state'],
+            }),
+            'payment.transaction': search(PaymentTransaction, {
+                fields: ['reference', 'providerReference', 'partner.name'],
+                filters: {
+                    done: { label: 'Done', domain: { state: 'done' }, group: 'state' },
+                    pending: { label: 'Pending', domain: { state: 'pending' }, group: 'state' },
+                    failed: { label: 'Failed', domain: { state: 'failed' }, group: 'state' },
+                },
+                groupBy: ['provider', 'state', 'doneAt:month'],
+            }),
+        },
         views: {
             'payment.provider.list': list(PaymentProvider, {
                 columns: ['name', 'code', 'state', 'journal'],
             }),
             'payment.provider.form': form(PaymentProvider, (k) => ({
+                chatter: true,
                 sheet: [
                     k.group('main', ['name', 'code', 'state']),
                     k.group('accounting', ['journal', 'sequence', 'endpoint']),
@@ -405,6 +461,7 @@ export function paymentModule(options = {}) {
                 columns: ['reference', 'move', 'partner', 'provider', 'amount', 'state', 'doneAt'],
             }),
             'payment.transaction.form': form(PaymentTransaction, (k) => ({
+                chatter: true,
                 sheet: [
                     k.group('main', ['reference', 'move', 'partner', 'provider']),
                     k.group('outcome', [