shutro-erp 0.3.5 → 0.3.6

package/dist/payment/module.d.ts

@@ -239,7 +239,7 @@ export declare const PaymentTransaction: import("shutro").Model<"payment.transac
         readonly readonly: false;
     }>;
     readonly move: import("shutro").Many2oneField<"account.move", {
-        readonly required: true;
+        readonly required: false;
         readonly computed: false;
         readonly inverse: false;
         readonly sequence: false;
@@ -328,7 +328,24 @@ export declare const PaymentTransaction: import("shutro").Model<"payment.transac
         readonly hasDefault: false;
         readonly readonly: false;
     }>;
-}, {} & import("shutro").TransitionMethods<{
+    readonly returnUrl: import("shutro").CharField<{
+        readonly required: false;
+        readonly computed: false;
+        readonly inverse: false;
+        readonly sequence: false;
+        readonly computeName: undefined;
+        readonly store: true;
+        readonly hasDefault: false;
+        readonly readonly: false;
+    }, string>;
+}, {
+    /**
+     * The posted documents each of these transactions pays, once the provider confirmed it: its invoice. A module
+     * whose transactions pay something else first makes the invoice there (`website_sale`: the order confirmed and
+     * invoiced) by overriding it.
+     */
+    readonly payable: (this: unknown) => Promise<Map<number, number[]>>;
+} & import("shutro").TransitionMethods<{
     readonly reference: import("shutro").CharField<{
         readonly required: true;
         readonly computed: false;
@@ -349,8 +366,9 @@ export declare const PaymentTransaction: import("shutro").Model<"payment.transac
         readonly hasDefault: false;
         readonly readonly: false;
     }>;
+    /** The invoice paid; empty while another app's document waits for the payment (a shop's order). */
     readonly move: import("shutro").Many2oneField<"account.move", {
-        readonly required: true;
+        readonly required: false;
         readonly computed: false;
         readonly inverse: false;
         readonly sequence: false;
@@ -440,6 +458,17 @@ export declare const PaymentTransaction: import("shutro").Model<"payment.transac
         readonly hasDefault: false;
         readonly readonly: false;
     }>;
+    /** Where the customer goes back to once the provider is done (the portal's document when empty). */
+    readonly returnUrl: import("shutro").CharField<{
+        readonly required: false;
+        readonly computed: false;
+        readonly inverse: false;
+        readonly sequence: false;
+        readonly computeName: undefined;
+        readonly store: true;
+        readonly hasDefault: false;
+        readonly readonly: false;
+    }, string>;
 }>>;
 export declare const paymentShutro: import("shutro").Module<readonly [import("shutro").Model<"payment.provider", {
     readonly id: import("shutro").IdField<"payment.provider">;
@@ -671,7 +700,7 @@ export declare const paymentShutro: import("shutro").Module<readonly [import("sh
         readonly readonly: false;
     }>;
     readonly move: import("shutro").Many2oneField<"account.move", {
-        readonly required: true;
+        readonly required: false;
         readonly computed: false;
         readonly inverse: false;
         readonly sequence: false;
@@ -760,7 +789,24 @@ export declare const paymentShutro: import("shutro").Module<readonly [import("sh
         readonly hasDefault: false;
         readonly readonly: false;
     }>;
-}, {} & import("shutro").TransitionMethods<{
+    readonly returnUrl: import("shutro").CharField<{
+        readonly required: false;
+        readonly computed: false;
+        readonly inverse: false;
+        readonly sequence: false;
+        readonly computeName: undefined;
+        readonly store: true;
+        readonly hasDefault: false;
+        readonly readonly: false;
+    }, string>;
+}, {
+    /**
+     * The posted documents each of these transactions pays, once the provider confirmed it: its invoice. A module
+     * whose transactions pay something else first makes the invoice there (`website_sale`: the order confirmed and
+     * invoiced) by overriding it.
+     */
+    readonly payable: (this: unknown) => Promise<Map<number, number[]>>;
+} & import("shutro").TransitionMethods<{
     readonly reference: import("shutro").CharField<{
         readonly required: true;
         readonly computed: false;
@@ -781,8 +827,9 @@ export declare const paymentShutro: import("shutro").Module<readonly [import("sh
         readonly hasDefault: false;
         readonly readonly: false;
     }>;
+    /** The invoice paid; empty while another app's document waits for the payment (a shop's order). */
     readonly move: import("shutro").Many2oneField<"account.move", {
-        readonly required: true;
+        readonly required: false;
         readonly computed: false;
         readonly inverse: false;
         readonly sequence: false;
@@ -872,6 +919,17 @@ export declare const paymentShutro: import("shutro").Module<readonly [import("sh
         readonly hasDefault: false;
         readonly readonly: false;
     }>;
+    /** Where the customer goes back to once the provider is done (the portal's document when empty). */
+    readonly returnUrl: import("shutro").CharField<{
+        readonly required: false;
+        readonly computed: false;
+        readonly inverse: false;
+        readonly sequence: false;
+        readonly computeName: undefined;
+        readonly store: true;
+        readonly hasDefault: false;
+        readonly readonly: false;
+    }, string>;
 }>>], readonly [import("shutro").Module<readonly [], readonly [import("shutro").Module<readonly [import("shutro").Model<"res.currency.rate", {
     readonly id: import("shutro").IdField<"res.currency.rate">;
     readonly createdAt: import("shutro").ScalarField<'datetime', Date, Date, {
@@ -1385,6 +1443,131 @@ export declare const paymentShutro: import("shutro").Module<readonly [import("sh
         readonly hasDefault: false;
         readonly readonly: false;
     }>;
+}>>, import("shutro").Model<"account.analytic", {
+    readonly id: import("shutro").IdField<"account.analytic">;
+    readonly createdAt: import("shutro").ScalarField<'datetime', Date, Date, {
+        required: true;
+        readonly: true;
+        computed: false;
+        inverse: false;
+        hasDefault: false;
+        sequence: false;
+    }>;
+    readonly updatedAt: import("shutro").ScalarField<'datetime', Date, Date, {
+        required: true;
+        readonly: true;
+        computed: false;
+        inverse: false;
+        hasDefault: false;
+        sequence: false;
+    }>;
+    readonly createdBy: import("shutro").Many2oneField<'res.users', {
+        required: false;
+        readonly: true;
+        computed: false;
+        inverse: false;
+        hasDefault: false;
+        sequence: false;
+    }>;
+    readonly updatedBy: import("shutro").Many2oneField<'res.users', {
+        required: false;
+        readonly: true;
+        computed: false;
+        inverse: false;
+        hasDefault: false;
+        sequence: false;
+    }>;
+    readonly displayName: import("shutro").CharField<{
+        required: true;
+        readonly: true;
+        computed: true;
+        inverse: false;
+        hasDefault: false;
+        sequence: false;
+    }>;
+    readonly active: import("shutro").ActiveField;
+    readonly company: import("shutro").CompanyField<true>;
+    readonly code: import("shutro").CharField<{
+        readonly required: false;
+        readonly computed: false;
+        readonly inverse: false;
+        readonly sequence: false;
+        readonly computeName: undefined;
+        readonly store: true;
+        readonly hasDefault: false;
+        readonly readonly: false;
+    }, string>;
+    readonly name: import("shutro").CharField<{
+        readonly required: true;
+        readonly computed: false;
+        readonly inverse: false;
+        readonly sequence: false;
+        readonly computeName: undefined;
+        readonly store: true;
+        readonly hasDefault: false;
+        readonly readonly: false;
+    }, string | Readonly<Record<string, string>>>;
+    readonly parent: import("shutro").Many2oneField<"account.analytic", {
+        readonly required: false;
+        readonly computed: false;
+        readonly inverse: false;
+        readonly sequence: false;
+        readonly computeName: undefined;
+        readonly store: true;
+        readonly hasDefault: false;
+        readonly readonly: false;
+    }>;
+    readonly note: import("shutro").ScalarField<"text", string, string, {
+        readonly required: false;
+        readonly computed: false;
+        readonly inverse: false;
+        readonly sequence: false;
+        readonly computeName: undefined;
+        readonly store: true;
+        readonly hasDefault: false;
+        readonly readonly: false;
+    }>;
+}, {} & import("shutro").TransitionMethods<{
+    readonly code: import("shutro").CharField<{
+        readonly required: false;
+        readonly computed: false;
+        readonly inverse: false;
+        readonly sequence: false;
+        readonly computeName: undefined;
+        readonly store: true;
+        readonly hasDefault: false;
+        readonly readonly: false;
+    }, string>;
+    readonly name: import("shutro").CharField<{
+        readonly required: true;
+        readonly computed: false;
+        readonly inverse: false;
+        readonly sequence: false;
+        readonly computeName: undefined;
+        readonly store: true;
+        readonly hasDefault: false;
+        readonly readonly: false;
+    }, string | Readonly<Record<string, string>>>;
+    readonly parent: import("shutro").Many2oneField<"account.analytic", {
+        readonly required: false;
+        readonly computed: false;
+        readonly inverse: false;
+        readonly sequence: false;
+        readonly computeName: undefined;
+        readonly store: true;
+        readonly hasDefault: false;
+        readonly readonly: false;
+    }>;
+    readonly note: import("shutro").ScalarField<"text", string, string, {
+        readonly required: false;
+        readonly computed: false;
+        readonly inverse: false;
+        readonly sequence: false;
+        readonly computeName: undefined;
+        readonly store: true;
+        readonly hasDefault: false;
+        readonly readonly: false;
+    }>;
 }>>, import("shutro").Model<"account.account", {
     readonly id: import("shutro").IdField<"account.account">;
     readonly createdAt: import("shutro").ScalarField<'datetime', Date, Date, {
@@ -3077,6 +3260,16 @@ export declare const paymentShutro: import("shutro").Module<readonly [import("sh
         readonly hasDefault: false;
         readonly readonly: false;
     }>;
+    readonly analytic: import("shutro").Many2oneField<"account.analytic", {
+        readonly required: false;
+        readonly computed: false;
+        readonly inverse: false;
+        readonly sequence: false;
+        readonly computeName: undefined;
+        readonly store: true;
+        readonly hasDefault: false;
+        readonly readonly: false;
+    }>;
     readonly quantity: import("shutro").DecimalField<{
         readonly required: false;
         readonly computed: false;
@@ -3428,6 +3621,16 @@ export declare const paymentShutro: import("shutro").Module<readonly [import("sh
         readonly hasDefault: false;
         readonly readonly: false;
     }>;
+    readonly analytic: import("shutro").Many2oneField<"account.analytic", {
+        readonly required: false;
+        readonly computed: false;
+        readonly inverse: false;
+        readonly sequence: false;
+        readonly computeName: undefined;
+        readonly store: true;
+        readonly hasDefault: false;
+        readonly readonly: false;
+    }>;
     readonly quantity: import("shutro").DecimalField<{
         readonly required: false;
         readonly computed: false;
@@ -5353,6 +5556,7 @@ export declare const paymentShutro: import("shutro").Module<readonly [import("sh
         hasDefault: false;
         sequence: false;
     }>;
+    readonly active: import("shutro").ActiveField;
     readonly name: import("shutro").CharField<{
         readonly required: true;
         readonly computed: false;

package/dist/payment/module.js

@@ -8,7 +8,7 @@
 import { randomBytes } from 'node:crypto';
 import { accountPortalShutro } from '../account_portal/index.js';
 import { integrationsShutro } from '../integrations/index.js';
-import { defineModel, defineModule, f } from './.kosh/bindings.js';
+import { defineModel, defineModule, f, method } from './.kosh/bindings.js';
 const ALL = ['read', 'write', 'create', 'unlink', 'export', 'import'];
 /** A transaction's reference: what the provider is told and gives back. */
 export const newReference = () => `PAY-${randomBytes(9).toString('base64url')}`;
@@ -52,7 +52,8 @@ export const PaymentTransaction = defineModel('payment.transaction', {
     fields: {
         reference: f.char({ required: true, index: 'unique', default: newReference }),
         provider: f.many2one('payment.provider', { required: true, checkCompany: true }),
-        move: f.many2one('account.move', { required: true, label: 'Invoice', checkCompany: true }),
+        /** The invoice paid; empty while another app's document waits for the payment (a shop's order). */
+        move: f.many2one('account.move', { label: 'Invoice', checkCompany: true }),
         partner: f.many2one('res.partner', { label: 'Customer' }),
         currency: f.many2one('res.currency', { required: true }),
         amount: f.monetary({ currency: 'currency', required: true }),
@@ -67,11 +68,26 @@ export const PaymentTransaction = defineModel('payment.transaction', {
         payment: f.many2one('account.payment', { label: 'Payment' }),
         error: f.text(),
         doneAt: f.datetime({ label: 'Paid at' }),
+        /** Where the customer goes back to once the provider is done (the portal's document when empty). */
+        returnUrl: f.char({ label: 'Back to' }),
+    },
+    methods: {
+        /**
+         * The posted documents each of these transactions pays, once the provider confirmed it: its invoice. A module
+         * whose transactions pay something else first makes the invoice there (`website_sale`: the order confirmed and
+         * invoiced) by overriding it.
+         */
+        payable: method('payment.transaction', async function () {
+            const out = new Map();
+            for (const t of await this.load({}))
+                out.set(t.id, t.move === null ? [] : [t.move.id]);
+            return out;
+        }),
     },
 });
 export const paymentShutro = defineModule({
     name: 'payment',
-    version: '0.1.0',
+    version: '0.2.0',
     depends: [accountPortalShutro, integrationsShutro],
     models: [PaymentProvider, PaymentTransaction],
 });

package/dist/payment/settle.js

@@ -41,8 +41,17 @@ export async function settle(env, result) {
         await found.write({ state: 'failed', providerReference: result.providerReference, error });
         return { ...same, state: 'failed', changed: true, payment: null };
     }
+    const moves = (await found.payable()).get(tx.id) ?? [];
+    if (moves.length === 0) {
+        await found.write({
+            state: 'failed',
+            providerReference: result.providerReference,
+            error: 'Paid, but there is no document to register the payment against.',
+        });
+        return { ...same, state: 'failed', changed: true, payment: null };
+    }
     const payment = await registerPayment(env, {
-        moves: [tx.move.id],
+        moves,
         journal: tx.provider.journal.id,
         amount: amount.toFixed(),
         memo: `${tx.provider.name} ${result.providerReference ?? tx.reference}`,

package/dist/payroll/.kosh/bindings.d.ts

@@ -0,0 +1,22 @@
+export { defineModel, defineModule, extendModel, f, replace } from '../../server/orm.js';
+import { type DefinitionHelpers } from '../../server/orm.js';
+import type { DefaultLoaded, Env as CoreEnv, RecordSet as CoreRecordSet, Shutro as CoreShutro } from '../../server/orm.js';
+import type { SchemaView } from './schema.js';
+export type { SchemaView };
+/** Every model visible in this view. */
+export type ModelName = keyof SchemaView & string;
+/** `Env` typed to this view. */
+export type Env = CoreEnv<SchemaView>;
+/** `Shutro` typed to this view. */
+export type Shutro = CoreShutro<SchemaView>;
+/** A recordset of `M`, with the default loaded shape unless `L` is given. */
+export type Records<M extends ModelName, L = DefaultLoaded<SchemaView, M>> = CoreRecordSet<SchemaView, M, L>;
+export declare const compute: DefinitionHelpers<SchemaView>['compute'];
+export declare const check: DefinitionHelpers<SchemaView>['check'];
+export declare const onchange: DefinitionHelpers<SchemaView>['onchange'];
+export declare const records: DefinitionHelpers<SchemaView>['records'];
+export declare const method: DefinitionHelpers<SchemaView>['method'];
+/** Module data (RFC 0017): records, overrides of dependencies' records, and references, typed like creates. */
+export declare const record: DefinitionHelpers<SchemaView>['record'];
+export declare const override: DefinitionHelpers<SchemaView>['override'];
+export declare const ref: DefinitionHelpers<SchemaView>['ref'];

package/dist/payroll/.kosh/bindings.js

@@ -0,0 +1,15 @@
+// GENERATED by `pnpm generate:models` (Shutro’s generator). Do not edit. definitions-hash: 2d906a93c12e483a
+// Bindings of module `payroll`: 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';
+/** Definition callbacks typed against this module's view: no casts in computes, checks, onchange, methods. */
+const helpers = definitions();
+export const compute = helpers.compute;
+export const check = helpers.check;
+export const onchange = helpers.onchange;
+export const records = helpers.records;
+export const method = helpers.method;
+/** Module data (RFC 0017): records, overrides of dependencies' records, and references, typed like creates. */
+export const record = helpers.record;
+export const override = helpers.override;
+export const ref = helpers.ref;