Skip to content

Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.

chore(license): free accounting + configurator, lock CE-leaking features (#1688)

Brad Barbinb99dd084a78c
diff --git a/.ai/lessons.md b/.ai/lessons.md
index 56720977e4..3a31d331b6 100644
--- a/.ai/lessons.md
+++ b/.ai/lessons.md
@@ -386,7 +386,7 @@ Format: `Context → Problem → Rule → Applies to`
**Rule:** When hand-seeding `journalLine` rows, set the sign to move the account toward its natural balance: `+` increases an Asset/Expense (debit) and increases a Liability/Equity/Revenue (credit). Verify against the `journalEntries` view (`totalDebits == totalCredits` per `journalEntryId`) before relying on the data — an unbalanced entry silently blocks period close. Posted `journal`/`journalLine` rows are immutable (`journal_posted_immutable` / `journalLine_posted_immutable`); to correct seeded mistakes you must disable those triggers on the local DB (superuser), never in a migration.
-**Applies to:** any SQL journal fixtures; the `journalEntries` view; the `tb-balanced` close check in `computePeriodReadiness` (`accounting.ee.service.ts`).
+**Applies to:** any SQL journal fixtures; the `journalEntries` view; the `tb-balanced` close check in `computePeriodReadiness` (`accounting.service.ts`).
## A period snapshot written at close races Locked-period postings unless the posting guard locks the period row
diff --git a/.claude/rules/accounting-sync-handlers.md b/.claude/rules/accounting-sync-handlers.md
index 1569d237d2..1387bf2564 100644
--- a/.claude/rules/accounting-sync-handlers.md
+++ b/.claude/rules/accounting-sync-handlers.md
@@ -92,7 +92,7 @@ Doctrine, mirroring the inbound pull sweep: **events are latency; the sweep is o
- **Presence** — pages the last 90 days of Completed journalEntry ops and verifies each distinct externalId still exists remotely via `fetchRemoteJournalTotals` (`core/remote-journal.ts` — dispatches on the concrete provider class: Xero manual journals, Rillet journal entries, QBO journal entries; returns net debit-signed totals per remote account ref, `found: false` for missing/voided/deleted, never throws except `RatelimitError`). Drift entries land at `companyIntegration.metadata.settings.postingSync.lastReconciliation` (the SyncActivity banner's feed).
- **Tie-out** — writes one `accountingSyncTieOut` row per (integration × accountingPeriod × account) (migration `20260811223145`; single-column FK to `accountingPeriod` — its PK is `(id)` alone; RLS is SELECT-only under `accounting_view`, rows written by the cron via service role). Per cell: `carbonPostedAmount` split into `synced/docBacked/excluded/pending/blocked` by each journal's ledger disposition (least-delivered bucket wins across an op + its `:reversal` twin; `DOC_BACKED` counts as delivered only while the backing document really synced), `providerAmount` from the presence fetches (strictly reused, never fetched twice; NULL when uncovered), `internalDelta` (I1: carbonPosted − sum of buckets) and `externalDelta` (I5: synced − provider).
-- **ERP surface** — `x+/accounting+/sync-tieout.tsx` (+ `$cellId` drawer drill-down), nav item under Accounting → Reports (`path.to.accountingSyncTieOut`); the SyncActivity tab gets a tie-out summary card + a Failed/Warning count badge. **Period close**: the "External GL sync complete" Blocker auto-check (`autoCheckKey: "external-gl-sync"`, seeded for new companies and reconciled for existing ones in the same migration) is computed by `getPeriodExternalGlSyncReadiness` (apps/erp `accounting.ee.service.ts`) — every journal posted into the period must carry a terminal disposition (Completed/Excluded/Skipped) for every active accounting integration; auto-passes only when NO active accounting integration exists (posting sync is always-on when one is connected).
+- **ERP surface** — `x+/accounting+/sync-tieout.tsx` (+ `$cellId` drawer drill-down), nav item under Accounting → Reports (`path.to.accountingSyncTieOut`); the SyncActivity tab gets a tie-out summary card + a Failed/Warning count badge. **Period close**: the "External GL sync complete" Blocker auto-check (`autoCheckKey: "external-gl-sync"`, seeded for new companies and reconciled for existing ones in the same migration) is computed by `getPeriodExternalGlSyncReadiness` (apps/erp `accounting.service.ts`) — every journal posted into the period must carry a terminal disposition (Completed/Excluded/Skipped) for every active accounting integration; auto-passes only when NO active accounting integration exists (posting sync is always-on when one is connected).
## externalIntegrationMapping table
diff --git a/.claude/rules/commercial-licensing.md b/.claude/rules/commercial-licensing.md
index ebcf924253..430a0c2016 100644
--- a/.claude/rules/commercial-licensing.md
+++ b/.claude/rules/commercial-licensing.md
@@ -13,7 +13,7 @@ unlocked by editing open-licensed code. Grounded against `packages/ee/src/plan.t
## The license boundary
Carbon is open-core. The commercial license (root `LICENSE`) covers **`packages/ee`
-and every file whose name contains `.ee`** (e.g. `accounting.ee.service.ts`). Everything
+and every file whose name contains `.ee`** (e.g. `ApprovalRuleForm.ee.tsx`). Everything
else is community-licensed. This is the same model as Twenty CRM (their marker is a
`/* @license Enterprise */` header; ours is the `packages/ee` package + the `.ee` infix).
diff --git a/.claude/rules/fixed-asset-lifecycle.md b/.claude/rules/fixed-asset-lifecycle.md
index 3b0342a556..4178214d7c 100644
--- a/.claude/rules/fixed-asset-lifecycle.md
+++ b/.claude/rules/fixed-asset-lifecycle.md
@@ -75,12 +75,12 @@ enum value (CHECK: only Fixed Asset lines have non-NULL `assetId`). The
(acquisitionCost/Date, accumulatedDepreciation, depreciationStartDate),
`depreciationRunValidator` (periodEnd only), `fixedAssetDisposalValidator`
(disposalDate only), `fixedAssetUsageLogValidator`.
-- Service: `accounting.ee.service.ts` — `getFixedAsset(s)`, `insert/update/deleteFixedAsset`,
+- Service: `accounting.service.ts` — `getFixedAsset(s)`, `insert/update/deleteFixedAsset`,
`getFixedAssetsListForSale` (status Active/Fully Depreciated), class CRUD,
`insert/getDepreciationRun(s)`, `getDepreciationRunLines`,
`getAssetDepreciationHistory`, `getFixedAssetDisposal`, usage-log helpers.
Note `upsertFixedAsset` is deprecated — use insert/update.
-- Server transactions (Kysely): `accounting.ee.server.ts` — `postDisposal()` (L37)
+- Server transactions (Kysely): `accounting.server.ts` — `postDisposal()` (L37)
and `postDepreciationRun()` (L225) build journals and update asset rows.
- Calc utils: `accounting.utils.ts` — `buildDepreciationLines()` (L447),
`getNextPeriodEnd()` (L252), MACRS data.
diff --git a/.claude/rules/inventory-system.md b/.claude/rules/inventory-system.md
index ac7024348d..4bb1affeae 100644
--- a/.claude/rules/inventory-system.md
+++ b/.claude/rules/inventory-system.md
@@ -55,7 +55,7 @@ Key service functions (verified):
company group, from `functions/lib/seed.data.ts`; backfilled to existing groups by
`20260808114732_backfill-scrap-reason-dimension.sql`). Like CustomerType/ItemPostingGroup
it is entity-backed — its values resolve live from the `scrapReason` table via
- `getEntityDimensionValues`/`getEntityValuesByIds` (accounting.ee.service.ts), so adding a
+ `getEntityDimensionValues`/`getEntityValuesByIds` (accounting.service.ts), so adding a
scrap reason immediately makes it a selectable/taggable dimension value with no sync step.
A tag is only written when the entity type has an **active** `dimension` row — a scrap
posting's ScrapReason `extraDimension` is dropped in `post-adjustment.ts` if the dimension
diff --git a/.claude/rules/mcp-tools-reference.md b/.claude/rules/mcp-tools-reference.md
index e4a65d3c30..9d5908b3ad 100644
--- a/.claude/rules/mcp-tools-reference.md
+++ b/.claude/rules/mcp-tools-reference.md
@@ -412,8 +412,7 @@ exports into the same module namespace), and writes `apps/erp/app/routes/api+/mc
`account` · `accounting` · `documents` · `inventory` · `invoicing` · `items` ·
`people` · `production` · `purchasing` · `quality` · `resources` · `sales` ·
`settings` · `shared` · `users`. Each maps 1:1 to a
-`apps/erp/app/modules/<module>/<module>.service.ts` namespace (accounting is the
-`.ee`-licensed `accounting.ee.service.ts`; the registry key stays `accounting`).
+`apps/erp/app/modules/<module>/<module>.service.ts` namespace.
<!-- UNVERIFIED: exact per-module/total tool counts (~1200) drift on every regen — read tool-metadata.json for the live number, don't trust a hardcoded count. -->
diff --git a/.github/CLA.md b/.github/CLA.md
index a7e29ff5d9..add965020f 100644
--- a/.github/CLA.md
+++ b/.github/CLA.md
@@ -3,17 +3,17 @@
The following terms are used throughout this agreement:
- You - the person or legal entity including its affiliates asked to accept this agreement. An affiliate is any entity that controls or is controlled by the legal entity, or is under common control with it.
-- Project - is an umbrella term that refers to any and all Carbon Manufacturing System Corp. open source projects.
+- Project - is an umbrella term that refers to any and all Carbon Manufacturing Systems Corporation open source projects.
- Contribution - any type of work that is submitted to a Project, including any modifications or additions to existing work.
-- Submitted - conveyed to a Project via a pull request, commit, issue, or any form of electronic, written, or verbal communication with Carbon Manufacturing System Corp., contributors or maintainers.
+- Submitted - conveyed to a Project via a pull request, commit, issue, or any form of electronic, written, or verbal communication with Carbon Manufacturing Systems Corporation, contributors or maintainers.
# Grant of Copyright License.
-Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, users and to Carbon Manufacturing System Corp. a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your contributions and such derivative works. Except for this license, You reserve all rights, title, and interest in your contributions.
+Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, users and to Carbon Manufacturing Systems Corporation a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your contributions and such derivative works. Except for this license, You reserve all rights, title, and interest in your contributions.
# Grant of Patent License.
-Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, users and to Carbon Manufacturing System Corp. a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer your contributions, where such license applies only to those patent claims licensable by you that are necessarily infringed by your contribution or by combination of your contribution with the project to which this contribution was submitted.
+Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, users and to Carbon Manufacturing Systems Corporation a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer your contributions, where such license applies only to those patent claims licensable by you that are necessarily infringed by your contribution or by combination of your contribution with the project to which this contribution was submitted.
If any entity institutes patent litigation - including cross-claim or counterclaim in a lawsuit - against You alleging that your contribution or any project it was submitted to constitutes or is responsible for direct or contributory patent infringement, then any patent licenses granted to that entity under this agreement shall terminate as of the date such litigation is filed.
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
new file mode 100644
index 0000000000..e7677013ea
--- /dev/null
+++ b/.github/workflows/cla.yml
@@ -0,0 +1,36 @@
+name: CLA Assistant
+
+on:
+ issue_comment:
+ types: [created]
+ pull_request_target:
+ types: [opened, closed, synchronize]
+
+permissions:
+ actions: write
+ contents: write
+ pull-requests: write
+
+jobs:
+ CLAAssistant:
+ runs-on: ubuntu-latest
+ steps:
+ - name: CLA Assistant
+ if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
+ # Pinned to the v2.6.1 commit SHA (the action's repo is archived/read-only).
+ uses: contributor-assistant/github-action@ca4a40a7d1004f18d9960b404b97e5f30a505a08 # v2.6.1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ # A repo-scoped Personal Access Token stored as the CLA_PAT secret.
+ # Required so signatures can be committed to the signatures branch below.
+ PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_PAT }}
+ with:
+ path-to-signatures: signatures/version1/cla.json
+ path-to-document: https://github.com/crbnos/carbon/blob/main/.github/CLA.md
+ # Signatures are stored on a dedicated branch to keep main clean.
+ branch: cla-signatures
+ custom-notsigned-prcomment: 'Thank you for your contribution. Before we can merge it, please read our [Contributor License Agreement](https://github.com/crbnos/carbon/blob/main/.github/CLA.md) and sign it by posting the comment below in this pull request.'
+ custom-pr-sign-comment: 'I have read the CLA Document and I hereby sign the CLA'
+ custom-allsigned-prcomment: 'All contributors have signed the CLA.'
+ # Bots never sign the CLA.
+ allowlist: dependabot[bot],*[bot]
diff --git a/LICENSE b/LICENSE
index 7e6ead9da7..d8a20f9bde 100644
--- a/LICENSE
+++ b/LICENSE
@@ -9,7 +9,7 @@ Carbon is licensed as follows:
2. The Enterprise files are (a) every file in the packages/ee directory,
including its subdirectories, and (b) every file anywhere in this
repository whose file name contains ".ee." (for example,
- "ConfiguratorForm.ee.tsx"). The Enterprise files are not licensed under
+ "ApprovalRuleForm.ee.tsx"). The Enterprise files are not licensed under
the AGPLv3. They are licensed only under the Carbon Commercial License
in packages/ee/LICENSE.
diff --git a/README.md b/README.md
index 7f6da4a0da..f6dbf52aad 100644
--- a/README.md
+++ b/README.md
@@ -186,7 +186,7 @@ Posthog has a free tier which should be plenty to support local development. If
### Clone
-Clone the repo into a public GitHub repository (or fork https://github.com/crbnos/carbon/fork). If you want to make the repo private, you should [acquire a commercial license](https://carbon.ms/sales) to comply with the AGPL license.
+Clone the repo, or fork it at https://github.com/crbnos/carbon/fork. Carbon is licensed under AGPLv3. If you'd rather not share your changes with your users, as AGPLv3 requires, or if you want the Enterprise features in packages/ee, you'll need a [commercial license](https://carbon.ms/sales).
```bash
git clone https://github.com/crbnos/carbon.git
diff --git a/apps/erp/app/components/Configurator/ConfigurationEditor/ConfigurationEditor.ee.tsx b/apps/erp/app/components/Configurator/ConfigurationEditor/ConfigurationEditor.tsx
similarity index 99%
rename from apps/erp/app/components/Configurator/ConfigurationEditor/ConfigurationEditor.ee.tsx
rename to apps/erp/app/components/Configurator/ConfigurationEditor/ConfigurationEditor.tsx
index 773fdf2833..981a719622 100644
--- a/apps/erp/app/components/Configurator/ConfigurationEditor/ConfigurationEditor.ee.tsx
+++ b/apps/erp/app/components/Configurator/ConfigurationEditor/ConfigurationEditor.tsx
@@ -39,7 +39,7 @@ import {
generateTypeDefinitions,
getDefaultValue
} from "../utils";
-import ParameterPanel from "./ParameterPanel.ee";
+import ParameterPanel from "./ParameterPanel";
interface ConfiguratorProps {
configuration: Configuration;
diff --git a/apps/erp/app/components/Configurator/ConfigurationEditor/ParameterPanel.ee.tsx b/apps/erp/app/components/Configurator/ConfigurationEditor/ParameterPanel.tsx
similarity index 100%
rename from apps/erp/app/components/Configurator/ConfigurationEditor/ParameterPanel.ee.tsx
rename to apps/erp/app/components/Configurator/ConfigurationEditor/ParameterPanel.tsx
diff --git a/apps/erp/app/components/Configurator/ConfigurationEditor/index.ts b/apps/erp/app/components/Configurator/ConfigurationEditor/index.ts
index 55225ffe2e..32704d5fa4 100644
--- a/apps/erp/app/components/Configurator/ConfigurationEditor/index.ts
+++ b/apps/erp/app/components/Configurator/ConfigurationEditor/index.ts
@@ -1,3 +1,3 @@
-import ConfigurationEditor from "./ConfigurationEditor.ee";
+import ConfigurationEditor from "./ConfigurationEditor";
export { ConfigurationEditor };
diff --git a/apps/erp/app/components/Configurator/ConfiguratorForm/ConfiguratorForm.ee.tsx b/apps/erp/app/components/Configurator/ConfiguratorForm/ConfiguratorForm.tsx
similarity index 100%
rename from apps/erp/app/components/Configurator/ConfiguratorForm/ConfiguratorForm.ee.tsx
rename to apps/erp/app/components/Configurator/ConfiguratorForm/ConfiguratorForm.tsx
diff --git a/apps/erp/app/components/Configurator/ConfiguratorForm/index.ts b/apps/erp/app/components/Configurator/ConfiguratorForm/index.ts
index c7c63fdad4..c8c7d79082 100644
--- a/apps/erp/app/components/Configurator/ConfiguratorForm/index.ts
+++ b/apps/erp/app/components/Configurator/ConfiguratorForm/index.ts
@@ -1 +1 @@
-export { ConfiguratorModal } from "./ConfiguratorForm.ee";
+export { ConfiguratorModal } from "./ConfiguratorForm";
diff --git a/apps/erp/app/modules/accounting/accounting.defaults.test.ts b/apps/erp/app/modules/accounting/accounting.defaults.test.ts
index 32c3b03bd4..4e04adaa5f 100644
--- a/apps/erp/app/modules/accounting/accounting.defaults.test.ts
+++ b/apps/erp/app/modules/accounting/accounting.defaults.test.ts
@@ -45,18 +45,18 @@ vi.mock("~/modules/accounting/ui/AccountDefaults", () => ({
AccountDefaultsForm: () => null
}));
vi.mock("~/modules/accounting", async () => ({
- ...(await import("./accounting.ee.service")),
+ ...(await import("./accounting.service")),
...(await import("./accounting.models"))
}));
-import {
- getDefaultAccounts,
- updateDefaultAccounts
-} from "./accounting.ee.service";
import {
defaultAccountValidator,
defaultIncomeAcountValidator
} from "./accounting.models";
+import {
+ getDefaultAccounts,
+ updateDefaultAccounts
+} from "./accounting.service";
const income = Object.fromEntries(
Object.keys(defaultIncomeAcountValidator.shape).map((key) => [
diff --git a/apps/erp/app/modules/accounting/accounting.models.ts b/apps/erp/app/modules/accounting/accounting.models.ts
index 02457fdb66..7da2e04731 100644
--- a/apps/erp/app/modules/accounting/accounting.models.ts
+++ b/apps/erp/app/modules/accounting/accounting.models.ts
@@ -109,7 +109,7 @@ export const analyticsReportKeys = [
export type AnalyticsReportKey = (typeof analyticsReportKeys)[number];
// Account scope: exactly one selector. "scrapAccounts" resolves at runtime to
-// accountDefault.scrapAccount (getScrapAccountIds in accounting.ee.service.ts).
+// accountDefault.scrapAccount (getScrapAccountIds in accounting.service.ts).
export type AnalyticsAccountScope =
| { classes: (typeof accountClassTypes)[number][] }
| { types: (typeof accountTypes)[number][] }
diff --git a/apps/erp/app/modules/accounting/accounting.periods.test.ts b/apps/erp/app/modules/accounting/accounting.periods.test.ts
index 958ad354aa..6be6e21c01 100644
--- a/apps/erp/app/modules/accounting/accounting.periods.test.ts
+++ b/apps/erp/app/modules/accounting/accounting.periods.test.ts
@@ -1,7 +1,7 @@
import { describe, expect, it, vi } from "vitest";
// The settings barrel re-exports its UI, which transitively pulls Lingui `msg`
-// macros that vitest does not transform. accounting.ee.service only needs
+// macros that vitest does not transform. accounting.service only needs
// getNextSequence from it, which these tests never exercise — stub it to keep
// the import graph light and macro-free.
vi.mock("~/modules/settings", () => ({
@@ -26,7 +26,7 @@ vi.mock("@carbon/glossary", () => ({
import type {
PeriodCloseTaskRow,
PeriodReadinessCheck
-} from "./accounting.ee.service";
+} from "./accounting.service";
import {
checklistTasksToCreate,
closeAccountingPeriod,
@@ -40,7 +40,7 @@ import {
postJournalEntry,
reopenAccountingPeriod,
skipCloseTask
-} from "./accounting.ee.service";
+} from "./accounting.service";
// ---------------------------------------------------------------------------
// Sequential close / reverse-sequential reopen gates (acceptance criteria 4/5)
diff --git a/apps/erp/app/modules/accounting/accounting.ee.server.ts b/apps/erp/app/modules/accounting/accounting.server.ts
similarity index 99%
rename from apps/erp/app/modules/accounting/accounting.ee.server.ts
rename to apps/erp/app/modules/accounting/accounting.server.ts
index d1870b6e2b..83977d3efe 100644
--- a/apps/erp/app/modules/accounting/accounting.ee.server.ts
+++ b/apps/erp/app/modules/accounting/accounting.server.ts
@@ -12,7 +12,7 @@ import {
getAccountLedgerSummary,
getConsolidatedBalances,
getConsolidatedPeriodSeries
-} from "./accounting.ee.service";
+} from "./accounting.service";
import { acquisitionLines } from "./accounting.utils";
/** Resolve only the authorized group's root CTA configuration for reporting.
diff --git a/apps/erp/app/modules/accounting/accounting.ee.service.ts b/apps/erp/app/modules/accounting/accounting.service.ts
similarity index 100%
rename from apps/erp/app/modules/accounting/accounting.ee.service.ts
rename to apps/erp/app/modules/accounting/accounting.service.ts
diff --git a/apps/erp/app/modules/accounting/accounting.translation.test.ts b/apps/erp/app/modules/accounting/accounting.translation.test.ts
index 39c36a3625..d44785467c 100644
--- a/apps/erp/app/modules/accounting/accounting.translation.test.ts
+++ b/apps/erp/app/modules/accounting/accounting.translation.test.ts
@@ -24,7 +24,7 @@ import {
getFinancialStatementPeriodSeries,
translateCompanyBalances,
translateCompanyPeriodSeries
-} from "./accounting.ee.service";
+} from "./accounting.service";
import type { ChartPeriodSeries } from "./types";
import { NET_INCOME_ACCOUNT_ID } from "./types";
diff --git a/apps/erp/app/modules/accounting/index.ts b/apps/erp/app/modules/accounting/index.ts
index cbf9fdb972..ed0be7c8cf 100644
--- a/apps/erp/app/modules/accounting/index.ts
+++ b/apps/erp/app/modules/accounting/index.ts
@@ -1,3 +1,3 @@
-export * from "./accounting.ee.service";
export * from "./accounting.models";
+export * from "./accounting.service";
export * from "./types";
diff --git a/apps/erp/app/modules/accounting/types.ts b/apps/erp/app/modules/accounting/types.ts
index 3ccdfcb8d3..bbf5b1c107 100644
--- a/apps/erp/app/modules/accounting/types.ts
+++ b/apps/erp/app/modules/accounting/types.ts
@@ -1,4 +1,5 @@
import type { Database, Json } from "@carbon/database";
+import type { periodCloseStatuses } from "./accounting.models";
import type {
getAccount,
getAccountingPeriods,
@@ -17,8 +18,7 @@ import type {
getProjects,
getPurchaseLinePivotLines,
getReportViews
-} from "./accounting.ee.service";
-import type { periodCloseStatuses } from "./accounting.models";
+} from "./accounting.service";
export type Account = NonNullable<
Awaited<ReturnType<typeof getAccount>>["data"]
@@ -515,7 +515,7 @@ import type {
getFixedAssetClasses,
getFixedAssetDisposal,
getFixedAssets
-} from "./accounting.ee.service";
+} from "./accounting.service";
export type FixedAssetClass = NonNullable<
Awaited<ReturnType<typeof getFixedAssetClass>>["data"]
diff --git a/apps/erp/app/modules/accounting/ui/Reports/PivotControlBar.tsx b/apps/erp/app/modules/accounting/ui/Reports/PivotControlBar.tsx
index 071b510e9d..e0735435b4 100644
--- a/apps/erp/app/modules/accounting/ui/Reports/PivotControlBar.tsx
+++ b/apps/erp/app/modules/accounting/ui/Reports/PivotControlBar.tsx
@@ -32,13 +32,13 @@ import { DimensionEntityTypeIcon } from "~/components/Icons";
import ConfirmDelete from "~/components/Modals/ConfirmDelete";
import { useUrlParams } from "~/hooks";
import { path } from "~/utils/path";
-import type { getActiveDimensionsWithValues } from "../../accounting.ee.service";
import type {
AnalyticsReportKey,
PivotMeasure,
PivotState
} from "../../accounting.models";
import { financialReportColumns, pivotMeasures } from "../../accounting.models";
+import type { getActiveDimensionsWithValues } from "../../accounting.service";
import type { ReportView } from "../../types";
import SaveViewModal from "./SaveViewModal";
diff --git a/apps/erp/app/modules/accounting/ui/SyncTieOut/SyncTieOutTable.tsx b/apps/erp/app/modules/accounting/ui/SyncTieOut/SyncTieOutTable.tsx
index 69e73be0a0..6ff3837d72 100644
--- a/apps/erp/app/modules/accounting/ui/SyncTieOut/SyncTieOutTable.tsx
+++ b/apps/erp/app/modules/accounting/ui/SyncTieOut/SyncTieOutTable.tsx
@@ -15,7 +15,7 @@ import { DateTime, Hyperlink, Table } from "~/components";
import { Enumerable } from "~/components/Enumerable";
import { useCurrencyFormatter } from "~/hooks/useCurrencyFormatter";
import { path } from "~/utils/path";
-import type { AccountingSyncTieOutListItem } from "../../accounting.ee.service";
+import type { AccountingSyncTieOutListItem } from "../../accounting.service";
type SyncTieOutTableProps = {
data: AccountingSyncTieOutListItem[];
diff --git a/apps/erp/app/modules/agent/kb/docs/reference/configurator.md b/apps/erp/app/modules/agent/kb/docs/reference/configurator.md
index f649eab8b0..41de1f1d10 100644
--- a/apps/erp/app/modules/agent/kb/docs/reference/configurator.md
+++ b/apps/erp/app/modules/agent/kb/docs/reference/configurator.md
@@ -27,7 +27,7 @@ A **rule** binds a *field* of the method to a snippet of code (`configurationRul
Rules attach per-field right on the embedded `docs/reference/methods` editors. On the bill of materials each component exposes configurable fields — `itemId` (swap the component), `quantity`, `unitOfMeasureCode`, and `methodType` (`BillOfMaterial.tsx:841,866,890,1043`); on the bill of process, operation fields like the work center, process, and setup/labor/machine times. A field with a rule shows a "configured" marker instead of a static value.
-You author the code in a **Monaco editor** (`ConfigurationEditor.ee.tsx`) that generates the function skeleton and type definitions for you from the parameters, with a **Run** button to test the output before saving. The code is the body of a `configure(params)` function; `params` holds your parameters by key, and you `return` the value for that field:
+You author the code in a **Monaco editor** (`ConfigurationEditor.tsx`) that generates the function skeleton and type definitions for you from the parameters, with a **Run** button to test the output before saving. The code is the body of a `configure(params)` function; `params` holds your parameters by key, and you `return` the value for that field:
```typescript
function configure(params: Params): number {
diff --git a/apps/erp/app/modules/invoicing/invoicing.application-history.test.ts b/apps/erp/app/modules/invoicing/invoicing.application-history.test.ts
index 9eb33c5bbe..500251bc58 100644
--- a/apps/erp/app/modules/invoicing/invoicing.application-history.test.ts
+++ b/apps/erp/app/modules/invoicing/invoicing.application-history.test.ts
@@ -13,7 +13,7 @@ vi.mock("@carbon/glossary", () => ({
vi.mock("~/modules/purchasing", () => ({}));
vi.mock("../people/people.service", () => ({}));
vi.mock("../sales/sales.service", () => ({}));
-vi.mock("../accounting/accounting.ee.service", () => ({}));
+vi.mock("../accounting/accounting.service", () => ({}));
import {
getInvoiceSettlements,
diff --git a/apps/erp/app/modules/invoicing/invoicing.service.card-transaction.test.ts b/apps/erp/app/modules/invoicing/invoicing.service.card-transaction.test.ts
index 58053b5a27..a0a32bddbf 100644
--- a/apps/erp/app/modules/invoicing/invoicing.service.card-transaction.test.ts
+++ b/apps/erp/app/modules/invoicing/invoicing.service.card-transaction.test.ts
@@ -13,7 +13,7 @@ vi.mock("@carbon/glossary", () => ({
vi.mock("~/modules/purchasing", () => ({}));
vi.mock("../people/people.service", () => ({}));
vi.mock("../sales/sales.service", () => ({}));
-vi.mock("../accounting/accounting.ee.service", () => ({}));
+vi.mock("../accounting/accounting.service", () => ({}));
import { getCardTransaction } from "./invoicing.service";
diff --git a/apps/erp/app/modules/invoicing/invoicing.service.ts b/apps/erp/app/modules/invoicing/invoicing.service.ts
index 96c1010952..20aadfddbc 100644
--- a/apps/erp/app/modules/invoicing/invoicing.service.ts
+++ b/apps/erp/app/modules/invoicing/invoicing.service.ts
@@ -34,7 +34,7 @@ import {
import type { GenericQueryFilters } from "~/utils/query";
import { LIST_COUNT, setGenericQueryFilters } from "~/utils/query";
import { sanitize } from "~/utils/supabase";
-import { getExchangeRate } from "../accounting/accounting.ee.service";
+import { getExchangeRate } from "../accounting/accounting.service";
import { getEmployeeJob } from "../people/people.service";
import {
getCustomerPayment,
diff --git a/apps/erp/app/modules/invoicing/invoicing.settlements.test.ts b/apps/erp/app/modules/invoicing/invoicing.settlements.test.ts
index 556796e1d4..336e019122 100644
--- a/apps/erp/app/modules/invoicing/invoicing.settlements.test.ts
+++ b/apps/erp/app/modules/invoicing/invoicing.settlements.test.ts
@@ -13,7 +13,7 @@ vi.mock("@carbon/glossary", () => ({
vi.mock("~/modules/purchasing", () => ({}));
vi.mock("../people/people.service", () => ({}));
vi.mock("../sales/sales.service", () => ({}));
-vi.mock("../accounting/accounting.ee.service", () => ({}));
+vi.mock("../accounting/accounting.service", () => ({}));
import * as service from "./invoicing.service";
diff --git a/apps/erp/app/modules/purchasing/purchasing.service.ts b/apps/erp/app/modules/purchasing/purchasing.service.ts
index 9f05f3a8ad..a3cea8ffc8 100644
--- a/apps/erp/app/modules/purchasing/purchasing.service.ts
+++ b/apps/erp/app/modules/purchasing/purchasing.service.ts
@@ -26,7 +26,7 @@ import { sanitize } from "~/utils/supabase";
import {
getCurrencyByCode,
getExchangeRate
-} from "../accounting/accounting.ee.service";
+} from "../accounting/accounting.service";
import type { PurchaseInvoice } from "../invoicing/types";
import { upsertExternalLink } from "../shared/shared.service";
import type {
diff --git a/apps/erp/app/routes/api+/agent+/chat.ts b/apps/erp/app/routes/api+/agent+/chat.ts
index dc494255eb..0f8cba0220 100644
--- a/apps/erp/app/routes/api+/agent+/chat.ts
+++ b/apps/erp/app/routes/api+/agent+/chat.ts
@@ -1,5 +1,5 @@
import { requirePermissions } from "@carbon/auth/auth.server";
-import { companyHasPlan } from "@carbon/ee/plan.server";
+import { companyHasFeature } from "@carbon/ee/plan.server";
import type { UIMessage } from "ai";
import type { ActionFunctionArgs } from "react-router";
import {
@@ -31,7 +31,7 @@ export async function action({ request }: ActionFunctionArgs) {
const { client, companyId, companyGroupId, userId } =
await requirePermissions(request, {});
- const allowed = await companyHasPlan(client, companyId, {
+ const allowed = await companyHasFeature(client, companyId, {
feature: "AI_AGENT"
});
if (!allowed) {
diff --git a/apps/erp/app/routes/api+/v1+/lib/dispatch-parity.test.ts b/apps/erp/app/routes/api+/v1+/lib/dispatch-parity.test.ts
index 2891f5b940..4934de5741 100644
--- a/apps/erp/app/routes/api+/v1+/lib/dispatch-parity.test.ts
+++ b/apps/erp/app/routes/api+/v1+/lib/dispatch-parity.test.ts
@@ -34,7 +34,7 @@ const spies = vi.hoisted(() => ({
vi.mock("~/modules/account/account.service", () => ({
upsertNotificationPreference: spies.upsertNotificationPreference
}));
-vi.mock("~/modules/accounting/accounting.ee.service", () => ({
+vi.mock("~/modules/accounting/accounting.service", () => ({
getAccountLedger: spies.getAccountLedger,
getTrialBalance: spies.getTrialBalance,
upsertAccount: spies.upsertAccount
diff --git a/apps/erp/app/routes/api+/v1+/lib/registry.server.ts b/apps/erp/app/routes/api+/v1+/lib/registry.server.ts
index 6d8c806747..6e0547b51f 100644
--- a/apps/erp/app/routes/api+/v1+/lib/registry.server.ts
+++ b/apps/erp/app/routes/api+/v1+/lib/registry.server.ts
@@ -4,7 +4,7 @@
// dispatcher all resolve through it.
import * as accountFunctions from "~/modules/account/account.service";
-import * as accountingFunctions from "~/modules/accounting/accounting.ee.service";
+import * as accountingFunctions from "~/modules/accounting/accounting.service";
import * as documentsFunctions from "~/modules/documents/documents.service";
import * as inventoryFunctions from "~/modules/inventory/inventory.service";
import * as invoicingFunctions from "~/modules/invoicing/invoicing.service";
diff --git a/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.post.tsx b/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.post.tsx
index d9c6b3546b..7b3010ff54 100644
--- a/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.post.tsx
+++ b/apps/erp/app/routes/x+/depreciation-run+/$depreciationRunId.post.tsx
@@ -4,7 +4,7 @@ import { flash } from "@carbon/auth/session.server";
import type { ActionFunctionArgs } from "react-router";
import { redirect } from "react-router";
import { getOrCreateAccountingPeriod } from "~/modules/accounting";
-import { postDepreciationRun } from "~/modules/accounting/accounting.ee.server";
+import { postDepreciationRun } from "~/modules/accounting/accounting.server";
import { getDatabaseClient } from "~/services/database.server";
import { path } from "~/utils/path";
diff --git a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.dispose.tsx b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.dispose.tsx
index b47849093c..9887682ada 100644
--- a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.dispose.tsx
+++ b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.dispose.tsx
@@ -9,7 +9,7 @@ import {
getFixedAsset,
getOrCreateAccountingPeriod
} from "~/modules/accounting";
-import { postDisposal } from "~/modules/accounting/accounting.ee.server";
+import { postDisposal } from "~/modules/accounting/accounting.server";
import { FixedAssetDisposalForm } from "~/modules/accounting/ui/FixedAssets";
import { getDatabaseClient } from "~/services/database.server";
import { path } from "~/utils/path";
diff --git a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.register.tsx b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.register.tsx
index 24ec9b80fd..53f4401dde 100644
--- a/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.register.tsx
+++ b/apps/erp/app/routes/x+/fixed-asset+/$fixedAssetId.register.tsx
@@ -10,7 +10,7 @@ import {
getFixedAsset,
getOrCreateAccountingPeriod
} from "~/modules/accounting";
-import { postAssetRegistration } from "~/modules/accounting/accounting.ee.server";
+import { postAssetRegistration } from "~/modules/accounting/accounting.server";
import { FixedAssetRegisterForm } from "~/modules/accounting/ui/FixedAssets";
import { getCompanySettings } from "~/modules/settings";
import { getDatabaseClient } from "~/services/database.server";
diff --git a/apps/erp/app/routes/x+/reports+/balance-sheet.$accountId.tsx b/apps/erp/app/routes/x+/reports+/balance-sheet.$accountId.tsx
index 7afa3be80c..4af27ad34f 100644
--- a/apps/erp/app/routes/x+/reports+/balance-sheet.$accountId.tsx
+++ b/apps/erp/app/routes/x+/reports+/balance-sheet.$accountId.tsx
@@ -8,7 +8,7 @@ import {
getAccountLedger,
getAccountLedgerSummary
} from "~/modules/accounting";
-import { getConsolidatedAccountLedger } from "~/modules/accounting/accounting.ee.server";
+import { getConsolidatedAccountLedger } from "~/modules/accounting/accounting.server";
import { AccountLedgerDrawer } from "~/modules/accounting/ui/Reports";
import { path } from "~/utils/path";
diff --git a/apps/erp/app/routes/x+/reports+/balance-sheet.test.ts b/apps/erp/app/routes/x+/reports+/balance-sheet.test.ts
index 7da5127744..8530081ff1 100644
--- a/apps/erp/app/routes/x+/reports+/balance-sheet.test.ts
+++ b/apps/erp/app/routes/x+/reports+/balance-sheet.test.ts
@@ -10,7 +10,7 @@ import {
getFinancialStatementPeriodSeries,
getFiscalYearSettings
} from "~/modules/accounting";
-import { getConsolidatedPeriodSeriesForReport } from "~/modules/accounting/accounting.ee.server";
+import { getConsolidatedPeriodSeriesForReport } from "~/modules/accounting/accounting.server";
import type { ChartPeriodSeries } from "~/modules/accounting/types";
import { NET_INCOME_ACCOUNT_ID } from "~/modules/accounting/types";
import { exportPeriodReport } from "~/modules/accounting/ui/Reports/exportReport";
@@ -68,15 +68,15 @@ vi.mock("~/modules/shared/timezone.server", () => ({
getCompanyTimeZone: vi.fn(async () => "America/New_York")
}));
vi.mock("~/modules/accounting", async () => ({
- ...(await import("~/modules/accounting/accounting.ee.service")),
+ ...(await import("~/modules/accounting/accounting.service")),
...(await import("~/modules/accounting/accounting.models")),
getCompaniesInGroup: vi.fn(),
getFinancialStatementPeriodSeries: vi.fn(),
getFinancialStatementBalances: vi.fn(),
getFiscalYearSettings: vi.fn()
}));
-vi.mock("~/modules/accounting/accounting.ee.server", async () => ({
- ...(await vi.importActual("~/modules/accounting/accounting.ee.server")),
+vi.mock("~/modules/accounting/accounting.server", async () => ({
+ ...(await vi.importActual("~/modules/accounting/accounting.server")),
getConsolidatedPeriodSeriesForReport: vi.fn()
}));
vi.mock("@carbon/auth/client.server", () => ({
diff --git a/apps/erp/app/routes/x+/reports+/balance-sheet.tsx b/apps/erp/app/routes/x+/reports+/balance-sheet.tsx
index f8d1e133d7..0822061bb6 100644
--- a/apps/erp/app/routes/x+/reports+/balance-sheet.tsx
+++ b/apps/erp/app/routes/x+/reports+/balance-sheet.tsx
@@ -21,7 +21,7 @@ import {
import {
applyCtaToReportPeriodSeriesForReport,
getConsolidatedPeriodSeriesForReport
-} from "~/modules/accounting/accounting.ee.server";
+} from "~/modules/accounting/accounting.server";
import {
exportPeriodReport,
getPeriodColumnLabel,
diff --git a/apps/erp/app/routes/x+/reports+/executive-pnl.tsx b/apps/erp/app/routes/x+/reports+/executive-pnl.tsx
index 65a7014d74..0a02d3547c 100644
--- a/apps/erp/app/routes/x+/reports+/executive-pnl.tsx
+++ b/apps/erp/app/routes/x+/reports+/executive-pnl.tsx
@@ -18,7 +18,7 @@ import {
getFinancialStatementPeriodSeries,
getFiscalYearSettings
} from "~/modules/accounting";
-import { getConsolidatedPeriodSeriesForReport } from "~/modules/accounting/accounting.ee.server";
+import { getConsolidatedPeriodSeriesForReport } from "~/modules/accounting/accounting.server";
import type { ExecutivePnlRowKey } from "~/modules/accounting/ui/Reports";
import {
ExecutivePnlSummary,
diff --git a/apps/erp/app/routes/x+/reports+/income-statement.$accountId.tsx b/apps/erp/app/routes/x+/reports+/income-statement.$accountId.tsx
index c8f76d3757..817cbe937c 100644
--- a/apps/erp/app/routes/x+/reports+/income-statement.$accountId.tsx
+++ b/apps/erp/app/routes/x+/reports+/income-statement.$accountId.tsx
@@ -8,7 +8,7 @@ import {
getAccountLedger,
getAccountLedgerSummary
} from "~/modules/accounting";
-import { getConsolidatedAccountLedger } from "~/modules/accounting/accounting.ee.server";
+import { getConsolidatedAccountLedger } from "~/modules/accounting/accounting.server";
import { AccountLedgerDrawer } from "~/modules/accounting/ui/Reports";
import { path } from "~/utils/path";
diff --git a/apps/erp/app/routes/x+/reports+/income-statement.tsx b/apps/erp/app/routes/x+/reports+/income-statement.tsx
index 7a1b2225cf..5483085671 100644
--- a/apps/erp/app/routes/x+/reports+/income-statement.tsx
+++ b/apps/erp/app/routes/x+/reports+/income-statement.tsx
@@ -18,7 +18,7 @@ import {
getFinancialStatementPeriodSeries,
getFiscalYearSettings
} from "~/modules/accounting";
-import { getConsolidatedPeriodSeriesForReport } from "~/modules/accounting/accounting.ee.server";
+import { getConsolidatedPeriodSeriesForReport } from "~/modules/accounting/accounting.server";
import {
exportPeriodReport,
getPeriodColumnLabel,
diff --git a/apps/erp/app/routes/x+/reports+/trial-balance.$accountId.tsx b/apps/erp/app/routes/x+/reports+/trial-balance.$accountId.tsx
index 6e9f13ca2a..ab7e1f720a 100644
--- a/apps/erp/app/routes/x+/reports+/trial-balance.$accountId.tsx
+++ b/apps/erp/app/routes/x+/reports+/trial-balance.$accountId.tsx
@@ -8,7 +8,7 @@ import {
getAccountLedger,
getAccountLedgerSummary
} from "~/modules/accounting";
-import { getConsolidatedAccountLedger } from "~/modules/accounting/accounting.ee.server";
+import { getConsolidatedAccountLedger } from "~/modules/accounting/accounting.server";
import { AccountLedgerDrawer } from "~/modules/accounting/ui/Reports";
import { path } from "~/utils/path";
diff --git a/apps/erp/app/routes/x+/reports+/trial-balance.tsx b/apps/erp/app/routes/x+/reports+/trial-balance.tsx
index 2fb038eebe..1a6feceb6e 100644
--- a/apps/erp/app/routes/x+/reports+/trial-balance.tsx
+++ b/apps/erp/app/routes/x+/reports+/trial-balance.tsx
@@ -15,7 +15,7 @@ import {
getFiscalYearSettings,
translateCompanyBalances
} from "~/modules/accounting";
-import { getConsolidatedBalancesForReport } from "~/modules/accounting/accounting.ee.server";
+import { getConsolidatedBalancesForReport } from "~/modules/accounting/accounting.server";
import {
exportTrialBalance,
ReportFilters,
diff --git a/apps/erp/app/routes/x+/settings+/audit-logs.tsx b/apps/erp/app/routes/x+/settings+/audit-logs.tsx
index 6525b8f3d9..2f10761781 100644
--- a/apps/erp/app/routes/x+/settings+/audit-logs.tsx
+++ b/apps/erp/app/routes/x+/settings+/audit-logs.tsx
@@ -10,7 +10,7 @@ import {
isAuditLogEnabled,
syncAuditSubscriptions
} from "@carbon/database/audit";
-import { requirePlan } from "@carbon/ee/plan.server";
+import { requireFeature } from "@carbon/ee/plan.server";
import { Button, Heading, ScrollArea, VStack } from "@carbon/react";
import { msg } from "@lingui/core/macro";
import { Trans } from "@lingui/react/macro";
@@ -89,7 +89,7 @@ export async function action({ request }: ActionFunctionArgs) {
switch (actionType) {
case "enable": {
- await requirePlan({
+ await requireFeature({
request,
client,
companyId,
diff --git a/apps/erp/app/routes/x+/settings+/integrations.$id.tsx b/apps/erp/app/routes/x+/settings+/integrations.$id.tsx
index 2be7ef5597..983796d448 100644
--- a/apps/erp/app/routes/x+/settings+/integrations.$id.tsx
+++ b/apps/erp/app/routes/x+/settings+/integrations.$id.tsx
@@ -48,7 +48,7 @@ import {
} from "@carbon/ee/hooks.server";
import { getPath, SECRET_KEYS } from "@carbon/ee/integrations/secrets";
import { isIntegrationWhitelisted } from "@carbon/ee/plan";
-import { requirePlan } from "@carbon/ee/plan.server";
+import { requireFeature } from "@carbon/ee/plan.server";
import { STRIPE_SECRET_KEY } from "@carbon/env";
import { validationError, validator } from "@carbon/form";
import { getLogger } from "@carbon/logger";
@@ -73,7 +73,7 @@ import {
import {
getAccountsList,
getActiveDimensionsWithValues
-} from "~/modules/accounting/accounting.ee.service";
+} from "~/modules/accounting/accounting.service";
import {
getIntegration,
IntegrationForm,
@@ -1567,7 +1567,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
}
if (!isIntegrationWhitelisted(integrationId)) {
- await requirePlan({
+ await requireFeature({
request,
client,
companyId,
diff --git a/apps/erp/app/routes/x+/settings+/integrations.deactivate.$id.tsx b/apps/erp/app/routes/x+/settings+/integrations.deactivate.$id.tsx
index c28f1dbf42..e7d1e4b6f3 100644
--- a/apps/erp/app/routes/x+/settings+/integrations.deactivate.$id.tsx
+++ b/apps/erp/app/routes/x+/settings+/integrations.deactivate.$id.tsx
@@ -4,7 +4,7 @@ import { flash } from "@carbon/auth/session.server";
import { integrations as availableIntegrations } from "@carbon/ee";
import { getIntegrationServerHooks } from "@carbon/ee/hooks.server";
import { isIntegrationWhitelisted } from "@carbon/ee/plan";
-import { requirePlan } from "@carbon/ee/plan.server";
+import { requireFeature } from "@carbon/ee/plan.server";
import type { ActionFunctionArgs } from "react-router";
import { redirect } from "react-router";
import {
@@ -23,7 +23,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
if (!integrationId) throw new Error("Integration ID not found");
if (!isIntegrationWhitelisted(integrationId)) {
- await requirePlan({
+ await requireFeature({
request,
client,
companyId,
diff --git a/apps/erp/app/routes/x+/workflow+/$id.canvas.tsx b/apps/erp/app/routes/x+/workflow+/$id.canvas.tsx
index e0e2c06197..812a7138ee 100644
--- a/apps/erp/app/routes/x+/workflow+/$id.canvas.tsx
+++ b/apps/erp/app/routes/x+/workflow+/$id.canvas.tsx
@@ -1,7 +1,7 @@
import { assertIsPost } from "@carbon/auth";
import { requirePermissions } from "@carbon/auth/auth.server";
import type { Json } from "@carbon/database";
-import { requirePlan } from "@carbon/ee/plan.server";
+import { requireFeature } from "@carbon/ee/plan.server";
import { validationError, validator } from "@carbon/form";
import type { ActionFunctionArgs } from "react-router";
import { data } from "react-router";
@@ -18,7 +18,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
const { client, companyId } = await requirePermissions(request, {
update: "workflows"
});
- await requirePlan({
+ await requireFeature({
request,
client,
companyId,
diff --git a/apps/erp/app/routes/x+/workflow+/$id.positions.tsx b/apps/erp/app/routes/x+/workflow+/$id.positions.tsx
index 707b6b102f..4915551439 100644
--- a/apps/erp/app/routes/x+/workflow+/$id.positions.tsx
+++ b/apps/erp/app/routes/x+/workflow+/$id.positions.tsx
@@ -1,6 +1,6 @@
import { assertIsPost } from "@carbon/auth";
import { requirePermissions } from "@carbon/auth/auth.server";
-import { requirePlan } from "@carbon/ee/plan.server";
+import { requireFeature } from "@carbon/ee/plan.server";
import { validationError, validator } from "@carbon/form";
import type { ActionFunctionArgs } from "react-router";
import { data } from "react-router";
@@ -27,7 +27,7 @@ export async function action({ params, request }: ActionFunctionArgs) {
const { client, companyId } = await requirePermissions(request, {
update: "workflows"
});
- await requirePlan({
+ await requireFeature({
request,
client,
companyId,
diff --git a/apps/erp/app/routes/x+/workflow+/$id.publish.tsx b/apps/erp/app/routes/x+/workflow+/$id.publish.tsx
index a3eef997b4..f01f99859f 100644
--- a/apps/erp/app/routes/x+/workflow+/$id.publish.tsx
+++ b/apps/erp/app/routes/x+/workflow+/$id.publish.tsx
@@ -1,7 +1,7 @@
import { assertIsPost, error, success } from "@carbon/auth";
import { requirePermissions } from "@carbon/auth/auth.server";
import { flash } from "@carbon/auth/session.server";
-import { requirePlan } from "@carbon/ee/plan.server";
+import { requireFeature } from "@carbon/ee/plan.server";
import { validationError, validator } from "@carbon/form";
import type { ActionFunctionArgs } from "react-router";
import { data } from "react-router";
@@ -14,7 +14,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
const { client, companyId, userId } = await requirePermissions(request, {
update: "workflows"
});
- await requirePlan({
+ await requireFeature({
request,
client,
companyId,
diff --git a/apps/erp/app/routes/x+/workflow+/$id.save.tsx b/apps/erp/app/routes/x+/workflow+/$id.save.tsx
index cdf3d8ae87..810dadc689 100644
--- a/apps/erp/app/routes/x+/workflow+/$id.save.tsx
+++ b/apps/erp/app/routes/x+/workflow+/$id.save.tsx
@@ -1,7 +1,7 @@
import { assertIsPost } from "@carbon/auth";
import { requirePermissions } from "@carbon/auth/auth.server";
import type { Json } from "@carbon/database";
-import { requirePlan } from "@carbon/ee/plan.server";
+import { requireFeature } from "@carbon/ee/plan.server";
import { validationError, validator } from "@carbon/form";
import { getLogger } from "@carbon/logger";
import {
@@ -24,7 +24,7 @@ export async function action({ request }: ActionFunctionArgs) {
const { client, companyId, userId } = await requirePermissions(request, {
update: "workflows"
});
- await requirePlan({
+ await requireFeature({
request,
client,
companyId,
diff --git a/apps/erp/app/routes/x+/workflow+/$id.test-run.tsx b/apps/erp/app/routes/x+/workflow+/$id.test-run.tsx
index 4f3e77b354..61e28c8728 100644
--- a/apps/erp/app/routes/x+/workflow+/$id.test-run.tsx
+++ b/apps/erp/app/routes/x+/workflow+/$id.test-run.tsx
@@ -2,7 +2,7 @@ import { assertIsPost } from "@carbon/auth";
import { requirePermissions } from "@carbon/auth/auth.server";
import { getCarbonServiceRole } from "@carbon/auth/client.server";
import { fkDisplayRegistry } from "@carbon/database/audit.config";
-import { requirePlan } from "@carbon/ee/plan.server";
+import { requireFeature } from "@carbon/ee/plan.server";
import { validator } from "@carbon/form";
import { executeManualWorkflowRun, noAccess } from "@carbon/jobs/inngest";
import { datetime } from "@carbon/utils";
@@ -42,7 +42,7 @@ function refuse(error: string, status = 400, issues: WorkflowIssue[] = []) {
async function requireOwnedWorkflow(request: Request, id: string | undefined) {
const { client, companyId, companyGroupId, userId } =
await requirePermissions(request, { update: "workflows" });
- await requirePlan({
+ await requireFeature({
request,
client,
companyId,
diff --git a/apps/erp/app/routes/x+/workflow+/$id.tsx b/apps/erp/app/routes/x+/workflow+/$id.tsx
index f66a73c92b..2c04aa48bb 100644
--- a/apps/erp/app/routes/x+/workflow+/$id.tsx
+++ b/apps/erp/app/routes/x+/workflow+/$id.tsx
@@ -1,5 +1,5 @@
import { requirePermissions } from "@carbon/auth/auth.server";
-import { requirePlan } from "@carbon/ee/plan.server";
+import { requireFeature } from "@carbon/ee/plan.server";
import {
Alert,
AlertDescription,
@@ -68,7 +68,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
view: "workflows",
role: "employee"
});
- await requirePlan({
+ await requireFeature({
request,
client,
companyId,
diff --git a/apps/erp/app/routes/x+/workflow+/$id.unpublish.tsx b/apps/erp/app/routes/x+/workflow+/$id.unpublish.tsx
index dc363e1c54..c872abb178 100644
--- a/apps/erp/app/routes/x+/workflow+/$id.unpublish.tsx
+++ b/apps/erp/app/routes/x+/workflow+/$id.unpublish.tsx
@@ -1,7 +1,7 @@
import { assertIsPost, error, success } from "@carbon/auth";
import { requirePermissions } from "@carbon/auth/auth.server";
import { flash } from "@carbon/auth/session.server";
-import { requirePlan } from "@carbon/ee/plan.server";
+import { requireFeature } from "@carbon/ee/plan.server";
import type { ActionFunctionArgs } from "react-router";
import { data } from "react-router";
import { unpublishWorkflow } from "~/modules/workflows/workflows.server";
@@ -15,7 +15,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
const { client, companyId, userId } = await requirePermissions(request, {
update: "workflows"
});
- await requirePlan({
+ await requireFeature({
request,
client,
companyId,
diff --git a/apps/erp/app/routes/x+/workflow+/$id.version.new.tsx b/apps/erp/app/routes/x+/workflow+/$id.version.new.tsx
index 545dc7f23f..79fcfb06e9 100644
--- a/apps/erp/app/routes/x+/workflow+/$id.version.new.tsx
+++ b/apps/erp/app/routes/x+/workflow+/$id.version.new.tsx
@@ -2,7 +2,7 @@ import { assertIsPost, error, success } from "@carbon/auth";
import { requirePermissions } from "@carbon/auth/auth.server";
import { flash } from "@carbon/auth/session.server";
import type { Json } from "@carbon/database";
-import { requirePlan } from "@carbon/ee/plan.server";
+import { requireFeature } from "@carbon/ee/plan.server";
import { validationError, validator } from "@carbon/form";
import { CURRENT_DEFINITION_FORMAT_VERSION } from "@carbon/workflows";
import type { ActionFunctionArgs } from "react-router";
@@ -20,7 +20,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
const { client, companyId, userId } = await requirePermissions(request, {
create: "workflows"
});
- await requirePlan({
+ await requireFeature({
request,
client,
companyId,
diff --git a/apps/erp/app/routes/x+/workflows+/$id.rename.tsx b/apps/erp/app/routes/x+/workflows+/$id.rename.tsx
index e44c3bac4d..f108f05e24 100644
--- a/apps/erp/app/routes/x+/workflows+/$id.rename.tsx
+++ b/apps/erp/app/routes/x+/workflows+/$id.rename.tsx
@@ -1,7 +1,7 @@
import { assertIsPost, error, success } from "@carbon/auth";
import { requirePermissions } from "@carbon/auth/auth.server";
import { flash } from "@carbon/auth/session.server";
-import { requirePlan } from "@carbon/ee/plan.server";
+import { requireFeature } from "@carbon/ee/plan.server";
import { validationError, validator } from "@carbon/form";
import type { ActionFunctionArgs } from "react-router";
import { data, redirect } from "react-router";
@@ -15,7 +15,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
const { client, companyId, userId } = await requirePermissions(request, {
update: "workflows"
});
- await requirePlan({
+ await requireFeature({
request,
client,
companyId,
diff --git a/apps/erp/app/routes/x+/workflows+/delete.$id.tsx b/apps/erp/app/routes/x+/workflows+/delete.$id.tsx
index 7417e95211..476c7c88be 100644
--- a/apps/erp/app/routes/x+/workflows+/delete.$id.tsx
+++ b/apps/erp/app/routes/x+/workflows+/delete.$id.tsx
@@ -1,7 +1,7 @@
import { error, success } from "@carbon/auth";
import { requirePermissions } from "@carbon/auth/auth.server";
import { flash } from "@carbon/auth/session.server";
-import { requirePlan } from "@carbon/ee/plan.server";
+import { requireFeature } from "@carbon/ee/plan.server";
import type { ActionFunctionArgs } from "react-router";
import { data, redirect } from "react-router";
import { deleteWorkflow } from "~/modules/workflows";
@@ -12,7 +12,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
const { client, companyId } = await requirePermissions(request, {
delete: "workflows"
});
- await requirePlan({
+ await requireFeature({
request,
client,
companyId,
diff --git a/apps/erp/app/routes/x+/workflows+/new.tsx b/apps/erp/app/routes/x+/workflows+/new.tsx
index 6583c9cd92..710817a75d 100644
--- a/apps/erp/app/routes/x+/workflows+/new.tsx
+++ b/apps/erp/app/routes/x+/workflows+/new.tsx
@@ -2,7 +2,7 @@ import { assertIsPost, error } from "@carbon/auth";
import { requirePermissions } from "@carbon/auth/auth.server";
import { flash } from "@carbon/auth/session.server";
import type { Json } from "@carbon/database";
-import { requirePlan } from "@carbon/ee/plan.server";
+import { requireFeature } from "@carbon/ee/plan.server";
import { validationError, validator } from "@carbon/form";
import { CURRENT_DEFINITION_FORMAT_VERSION } from "@carbon/workflows";
import type { ActionFunctionArgs } from "react-router";
@@ -23,7 +23,7 @@ export async function action({ request }: ActionFunctionArgs) {
const { client, companyId, userId } = await requirePermissions(request, {
create: "workflows"
});
- await requirePlan({
+ await requireFeature({
request,
client,
companyId,
diff --git a/apps/erp/app/routes/x+/workflows+/runs.$runId.tsx b/apps/erp/app/routes/x+/workflows+/runs.$runId.tsx
index 2a39d80be9..0d4e7e2ab3 100644
--- a/apps/erp/app/routes/x+/workflows+/runs.$runId.tsx
+++ b/apps/erp/app/routes/x+/workflows+/runs.$runId.tsx
@@ -1,5 +1,5 @@
import { requirePermissions } from "@carbon/auth/auth.server";
-import { requirePlan } from "@carbon/ee/plan.server";
+import { requireFeature } from "@carbon/ee/plan.server";
import {
Drawer,
DrawerBody,
@@ -26,7 +26,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
view: "workflows",
role: "employee"
});
- await requirePlan({
+ await requireFeature({
request,
client,
companyId,
diff --git a/apps/erp/app/routes/x+/workflows+/runs.tsx b/apps/erp/app/routes/x+/workflows+/runs.tsx
index a3061537cb..7ab550e6cf 100644
--- a/apps/erp/app/routes/x+/workflows+/runs.tsx
+++ b/apps/erp/app/routes/x+/workflows+/runs.tsx
@@ -1,5 +1,5 @@
import { requirePermissions } from "@carbon/auth/auth.server";
-import { requirePlan } from "@carbon/ee/plan.server";
+import { requireFeature } from "@carbon/ee/plan.server";
import { VStack } from "@carbon/react";
import type { LoaderFunctionArgs } from "react-router";
import { Outlet, useLoaderData } from "react-router";
@@ -13,7 +13,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
view: "workflows",
role: "employee"
});
- await requirePlan({
+ await requireFeature({
request,
client,
companyId,
diff --git a/docs/content/docs/reference/configurator.mdx b/docs/content/docs/reference/configurator.mdx
index 2a23642bf3..180ea1eca8 100644
--- a/docs/content/docs/reference/configurator.mdx
+++ b/docs/content/docs/reference/configurator.mdx
@@ -30,7 +30,7 @@ A **rule** binds a *field* of the method to a snippet of code (`configurationRul
Rules attach per-field right on the embedded [method](/docs/reference/methods) editors. On the bill of materials each component exposes configurable fields — `itemId` (swap the component), `quantity`, `unitOfMeasureCode`, and `methodType` (`BillOfMaterial.tsx:841,866,890,1043`); on the bill of process, operation fields like the work center, process, and setup/labor/machine times. A field with a rule shows a "configured" marker instead of a static value.
-You author the code in a **Monaco editor** (`ConfigurationEditor.ee.tsx`) that generates the function skeleton and type definitions for you from the parameters, with a **Run** button to test the output before saving. The code is the body of a `configure(params)` function; `params` holds your parameters by key, and you `return` the value for that field:
+You author the code in a **Monaco editor** (`ConfigurationEditor.tsx`) that generates the function skeleton and type definitions for you from the parameters, with a **Run** button to test the output before saving. The code is the body of a `configure(params)` function; `params` holds your parameters by key, and you `return` the value for that field:
```typescript
function configure(params: Params): number {
diff --git a/packages/checks/src/conformance/baseline.json b/packages/checks/src/conformance/baseline.json
index e310288225..003c94d41b 100644
--- a/packages/checks/src/conformance/baseline.json
+++ b/packages/checks/src/conformance/baseline.json
@@ -165,7 +165,7 @@
"no-legacy-rls::20260430000001_tax-status.sql::has_company_permission(",
"no-legacy-rls::20260817030612_remove-global-permission-wildcard.sql::has_company_permission(",
"no-legacy-rls::20260817040245_fix-is-claims-admin-permission-key.sql::has_company_permission(",
- "no-local-timezone::apps/erp/app/modules/accounting/accounting.ee.service.ts::new Date().toISOString().split(\"T\")[0]",
+ "no-local-timezone::apps/erp/app/modules/accounting/accounting.service.ts::new Date().toISOString().split(\"T\")[0]",
"no-local-timezone::apps/erp/app/modules/items/items.service.ts::new Date().toISOString().split(\"T\")[0]",
"no-local-timezone::apps/erp/app/modules/sales/sales.service.ts::new Date().toISOString().split(\"T\")[0]",
"no-local-timezone::packages/database/supabase/functions/get-method/index.ts::new Date().toISOString().slice(0, 10)",
@@ -302,7 +302,7 @@
"no-raw-rounding::apps/erp/app/components/TimeCardWarning.tsx::const hoursElapsed = Math.floor(",
"no-raw-rounding::apps/erp/app/hooks/useScrollPosition.tsx::Math.ceil(el.scrollLeft + el.clientWidth) < el.scrollWidth",
"no-raw-rounding::apps/erp/app/hooks/useScrollPosition.tsx::setCanScrollRight(Math.ceil(scrollLeft + clientWidth) < scrollWidth);",
- "no-raw-rounding::apps/erp/app/modules/accounting/accounting.ee.service.ts::const year = firstYear + Math.floor((startMonth - 1 + (p - 1)) / 12);",
+ "no-raw-rounding::apps/erp/app/modules/accounting/accounting.service.ts::const year = firstYear + Math.floor((startMonth - 1 + (p - 1)) / 12);",
"no-raw-rounding::apps/erp/app/modules/accounting/accounting.utils.ts::const quarterPlaced = Math.ceil((startDate.getMonth() + 1) / 3);",
"no-raw-rounding::apps/erp/app/modules/accounting/ui/FixedAssets/AssetClassesTable.tsx::const years = life ? Math.round((life / 12) * 10) / 10 : null;",
"no-raw-rounding::apps/erp/app/modules/agent/ui/greetings.ts::return GREETINGS[Math.floor(Math.random() * GREETINGS.length)]();",
diff --git a/packages/checks/src/conformance/module-shape.test.ts b/packages/checks/src/conformance/module-shape.test.ts
index 3762e73400..cc025af66c 100644
--- a/packages/checks/src/conformance/module-shape.test.ts
+++ b/packages/checks/src/conformance/module-shape.test.ts
@@ -44,13 +44,13 @@ describe("moduleShape", () => {
it("accepts the .ee-licensed service/server variant as the primary file", () => {
const v = moduleShape.inspect(
- mod("accounting", [
- "accounting.ee.service.ts",
- "accounting.models.ts",
+ mod("widget", [
+ "widget.ee.service.ts",
+ "widget.models.ts",
"types.ts",
"ui",
"index.ts",
- "accounting.ee.server.ts"
+ "widget.ee.server.ts"
])
);
expect(v).toHaveLength(0);
@@ -58,9 +58,9 @@ describe("moduleShape", () => {
it("still flags a second service file alongside the .ee variant", () => {
const v = moduleShape.inspect(
- mod("accounting", [
- "accounting.ee.service.ts",
- "accounting.models.ts",
+ mod("widget", [
+ "widget.ee.service.ts",
+ "widget.models.ts",
"types.ts",
"ui",
"index.ts",
diff --git a/packages/database/supabase/functions/lib/seed.data.ts b/packages/database/supabase/functions/lib/seed.data.ts
index ab138a4688..e8876405ee 100644
--- a/packages/database/supabase/functions/lib/seed.data.ts
+++ b/packages/database/supabase/functions/lib/seed.data.ts
@@ -916,7 +916,7 @@ export const fiscalYearSettings = {
* Default period-close checklist (NetSuite-style). Seeded per company as system
* task definitions; getPeriodCloseChecklist instantiates a periodCloseTask per
* period from the active definitions. `autoCheckKey` binds Auto tasks to a
- * readiness evaluator in accounting.ee.service.ts (computePeriodReadiness).
+ * readiness evaluator in accounting.service.ts (computePeriodReadiness).
*/
export const periodCloseTaskDefinitions = [
{
diff --git a/packages/database/supabase/functions/seed-company/index.ts b/packages/database/supabase/functions/seed-company/index.ts
index 6268f2d186..bcfaf7157e 100644
--- a/packages/database/supabase/functions/seed-company/index.ts
+++ b/packages/database/supabase/functions/seed-company/index.ts
@@ -332,7 +332,7 @@ serve(async (req: Request) => {
// period-close checklist definitions (system template rows). The table is
// new on this branch and not yet in the cloud-generated Kysely types, so
- // the insert goes through a cast (mirrors accounting.ee.service.ts).
+ // the insert goes through a cast (mirrors accounting.service.ts).
await (trx as any)
.insertInto("periodCloseTaskDefinition")
.values(
diff --git a/packages/ee/LICENSE b/packages/ee/LICENSE
index 80cdd4806d..15ffc956d9 100644
--- a/packages/ee/LICENSE
+++ b/packages/ee/LICENSE
@@ -21,7 +21,11 @@ described in the LICENSE file at the root of the repository.
License Agreement (CCLA), an Enterprise Subscription Agreement (ESA), a
partner agreement, or any other commercial agreement with Carbon,
whether signed, purchased online, or accepted by click-through. Your use
- must stay within what that agreement allows.
+ must stay within what that agreement allows. The execution of the
+ Enterprise files by Carbon's AGPLv3-licensed code solely for the purpose
+ of determining the existence or validity of a commercial license shall
+ not, by itself, constitute use of the Enterprise files under this
+ Section 2.
3. Your agreement controls. If this license and your commercial agreement
with Carbon conflict, your commercial agreement controls.
diff --git a/packages/ee/src/accounting/core/dimension-mapping.ts b/packages/ee/src/accounting/core/dimension-mapping.ts
index 3739d6dada..b34065eaa6 100644
--- a/packages/ee/src/accounting/core/dimension-mapping.ts
+++ b/packages/ee/src/accounting/core/dimension-mapping.ts
@@ -403,7 +403,7 @@ export function matchDimensionValuesByName(args: {
/**
* The source table + label column per dimension entityType. Mirrors
- * `getEntityValuesByIds` in apps/erp accounting.ee.service.ts and the
+ * `getEntityValuesByIds` in apps/erp accounting.service.ts and the
* DimensionSelector's client-store resolution (WorkCenter/Process). The
* Item label is the READABLE part id (readableIdWithRevision), never the
* internal id.
diff --git a/scripts/lib/service-metadata.ts b/scripts/lib/service-metadata.ts
index 09a31f4f07..2fa5b47947 100644
--- a/scripts/lib/service-metadata.ts
+++ b/scripts/lib/service-metadata.ts
@@ -1581,7 +1581,7 @@ export function buildAllToolMetadata(opts: BuildOptions = {}): ManifestEntry[] {
if (!fs.existsSync(serviceFile)) {
// Fall back to the `.ee`-licensed variant (see root LICENSE) when a
// module keeps its single service file under that name (e.g.
- // accounting.ee.service.ts).
+ // accounting.service.ts).
const eeServiceFile = path.join(MODULES_DIR, mod, `${mod}.ee.service.ts`);
if (!fs.existsSync(eeServiceFile)) {
console.warn(` ⚠ Service file not found: ${serviceFile}`);